Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup missed references to matrix sourceSet

This commit is contained in:
Steve Ebersole 2012-06-08 07:59:54 -05:00
parent b0bdda1141
commit bd7b54a4ea
2 changed files with 4 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hibernate-entitymanager/hibernate-entitymanager.gradle
View File

@ -18,25 +18,11 @@ dependencies {
testRuntime( libraries.validator ) testRuntime( libraries.validator )
} }
sourceSets {
matrix {
java {
srcDir 'src/matrix/java'
}
resources {
srcDir 'src/matrix/resources'
}
}
}
//////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////
// JPA model-gen set up // JPA model-gen set up
//////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////
aptDumpDir = file( "${buildDir}/tmp/apt" ) aptDumpDir = file( "${buildDir}/tmp/apt" )
////////////////////////////////////////////////////////////////////////////////////////////////////////
// 'test' sourceSet specific JPA model-gen set up
////////////////////////////////////////////////////////////////////////////////////////////////////////
sourceSets.test { sourceSets.test {
originalJavaSrcDirs = java.srcDirs originalJavaSrcDirs = java.srcDirs
generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" ) generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" )
@ -63,36 +49,11 @@ generateTestJpaMetamodelClasses.logging.captureStandardError(LogLevel.INFO)
compileTestJava.dependsOn generateTestJpaMetamodelClasses compileTestJava.dependsOn generateTestJpaMetamodelClasses
compileTestJava.options.define(compilerArgs: ["-proc:none"]) compileTestJava.options.define(compilerArgs: ["-proc:none"])
////////////////////////////////////////////////////////////////////////////////////////////////////////
// 'matrix' sourceSet specific JPA model-gen set up
////////////////////////////////////////////////////////////////////////////////////////////////////////
sourceSets.matrix {
originalJavaSrcDirs = java.srcDirs
generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" )
java.srcDir generatedJpaMetamodelSrcDir
}
task generateMatrixJpaMetamodelClasses(type: Compile) {
classpath = compileMatrixJava.classpath + configurations.hibernateJpaModelGenTool
source = sourceSets.matrix.java
destinationDir = aptDumpDir
options.define(
compilerArgs: [
"-proc:only",
"-processor", "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor",
"-s", "$sourceSets.matrix.generatedJpaMetamodelSrcDir.absolutePath"
]
);
outputs.dir sourceSets.matrix.generatedJpaMetamodelSrcDir;
doFirst {
sourceSets.matrix.generatedJpaMetamodelSrcDir.mkdirs()
}
}
// for the time being eat the annoying output from running the annotation processors
generateMatrixJpaMetamodelClasses.logging.captureStandardError(LogLevel.INFO)
compileMatrixJava.dependsOn generateMatrixJpaMetamodelClasses
compileMatrixJava.options.define(compilerArgs: ["-proc:none", "-encoding", "UTF-8"])
////////////////////////////////////////////////////////////////////////////////////////////////////////
// Process 'bundle resources' for the packaging tests
////////////////////////////////////////////////////////////////////////////////////////////////////////
processTestResources.dependsOn copyBundleResources
bundlesTargetDir = file( "${buildDir}/bundles" ) bundlesTargetDir = file( "${buildDir}/bundles" )
task copyBundleResources (type: Copy) { task copyBundleResources (type: Copy) {
@ -111,12 +72,3 @@ task copyBundleResources (type: Copy) {
} }
} }
// make sure that the bundles for the packaged test (PackagingTestCase) are copied as well
processTestResources.dependsOn copyBundleResources
idea {
module {
testSourceDirs += file( 'src/matrix/java')
testSourceDirs += file( 'src/matrix/resources')
}
}

16
hibernate-envers/hibernate-envers.gradle
View File

@ -16,15 +16,6 @@ dependencies {
} }
sourceSets { sourceSets {
matrix {
java {
srcDir 'src/matrix/java'
}
resources {
srcDir 'src/matrix/resources'
srcDir 'src/matrix/java'
}
}
main { main {
generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" ) generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" )
java { java {
@ -32,7 +23,6 @@ sourceSets {
} }
} }
} }
compileMatrixJava.options.define(compilerArgs: ["-proc:none", "-encoding", "UTF-8"])
// Generate JPA2 static metamodel for default revision entities // Generate JPA2 static metamodel for default revision entities
task generateJpaMetamodelClasses(type: Compile) { task generateJpaMetamodelClasses(type: Compile) {
@ -53,9 +43,3 @@ task generateJpaMetamodelClasses(type: Compile) {
} }
compileJava.dependsOn generateJpaMetamodelClasses compileJava.dependsOn generateJpaMetamodelClasses
idea {
module {
testSourceDirs += file( 'src/matrix/java')
testSourceDirs += file( 'src/matrix/resources')
}
}