opensource
/
fine-third
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #334 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 

* commit '4612b3cc13bb80ddd59475912a77f72817420ec5':
  rt
  KERNEL-1335 fine-third支持JDK11，打包
research/10.0
zhouping 5 years ago
parent
52bff94165 4612b3cc13
commit
f1b34415b6
8 changed files with 278 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      build.third_step0.gradle
  2. 124
      build.third_step1.gradle
  3. 75
      build.third_step2.gradle
  4. 19
      build.third_step3.gradle
  5. 12
      build.third_step4.gradle
  6. 8
      build.third_step5.gradle
  7. 72
      build.third_step6.gradle
  8. 77
      build.third_step7.gradle

19
build.third_step0.gradle
Unescape View File

@ -55,8 +55,8 @@ configurations {
}
dependencies {
thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
sigar "com.fr.third:sigar:1.6.0"
// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// sigar "com.fr.third:sigar:1.6.0"
testCompile 'junit:junit:4.12'
}
@ -87,12 +87,12 @@ task unpack(type:Copy) {
delete classesDir
destinationDir=file(classesDir)
println(configurations.thirdjar.singleFile)
from {
zipTree(configurations.thirdjar.singleFile)
}
from {
zipTree(configurations.sigar.singleFile)
}
// from {
// zipTree(configurations.thirdjar.singleFile)
// }
// from {
// zipTree(configurations.sigar.singleFile)
// }
from {
zipTree("fine-quartz/lib/c3p0-0.9.1.1.jar")
}
@ -102,6 +102,9 @@ task unpack(type:Copy) {
from {
zipTree("fine-poi/lib/curvesapi-1.03.jar")
}
from {
zipTree("fine-freehep/lib/fine-font-10.0.jar")
}
fileTree(dir:"build/libs",include:"**/*.jar").each {
File file -> from {
zipTree(file)

124
build.third_step1.gradle
Unescape View File

@ -32,18 +32,56 @@ sourceSets{
main{
java{
srcDirs=[
"${srcDir}/fine-third-jdk11/src",
"${srcDir}/fine-objenesis/src",
"${srcDir}/fine-jetbrains/src",
"${srcDir}/fine-poi/src",
"${srcDir}/fine-quartz/src",
"${srcDir}/fine-asm/src",
"${srcDir}/fine-antlr4/src",
"${srcDir}/fine-aspectj/src",
"${srcDir}/fine-antlr-old/src/main/java",
"${srcDir}/fine-bouncycastle/src",
"${srcDir}/fine-classmate/src",
"${srcDir}/fine-commons-codec/src",
"${srcDir}/fine-commons-collections4/src",
"${srcDir}/fine-commons-io/src",
"${srcDir}/fine-commons-fileupload/src",
"${srcDir}/fine-commons-lang3/src",
"${srcDir}/fine-commons-collections4/src",
"${srcDir}/fine-commons-logging/src",
"${srcDir}/fine-commons-math3/src",
"${srcDir}/fine-commons-pool/src/main/java",
"${srcDir}/fine-cssparser/src",
"${srcDir}/fine-freehep/src/main/java",
"${srcDir}/fine-guava/src",
"${srcDir}/fine-hsqldb/src/main/java",
"${srcDir}/fine-icu4j/src",
"${srcDir}/fine-imageJ/src/main/java",
"${srcDir}/fine-j2v8/src",
"${srcDir}/fine-jackson/src",
"${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-jboss-transaction-api/src",
"${srcDir}/fine-jetbrains/src",
"${srcDir}/fine-jgit/src",
"${srcDir}/fine-jna/jna/src/main/java",
"${srcDir}/fine-jna/jna-platform/src/main/java",
"${srcDir}/fine-joda/src",
"${srcDir}/fine-j2v8/src"
"${srcDir}/fine-jodd/src",
"${srcDir}/fine-jpa/src",
//"${srcDir}/fine-lookandfeel/src",
"${srcDir}/fine-lucene/src",
"${srcDir}/fine-lz4/src",
"${srcDir}/fine-objenesis/src/main/java",
"${srcDir}/fine-org-dom4j/src/main/java",
"${srcDir}/fine-roaringbitmap/src",
"${srcDir}/fine-sense4/src",
"${srcDir}/fine-default/fine-javax-el/src/main/java",
"${srcDir}/fine-default/fine-mail/src/main/java",
"${srcDir}/fine-default/fine-javax-cdi/src/main/java",
"${srcDir}/fine-default/fine-javax-jms/src/main/java",
"${srcDir}/fine-default/fine-sun-misc/src/main/java",
"${srcDir}/fine-default/fine-javax-inject/src/main/java",
"${srcDir}/fine-default/fine-javax-interceptor/src/main/java",
"${srcDir}/fine-default/fine-zip-tools/src/main/java",
"${srcDir}/fine-default/fine-javax-transaction/src/main/java",
"${srcDir}/fine-default/fine-slf4j-api/src/main/java",
"${srcDir}/fine-default/fine-sjsxp/src/main/java",
"${srcDir}/fine-default/fine-stax/src/main/java",
"${srcDir}/fine-third-jdk8/xml-apis/src/main/java"
]
}
}
@ -64,12 +102,19 @@ def MVN_BRANCH = branchVariable.toUpperCase()
//指定依赖
dependencies{
compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-antlr4/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-commons-logging/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-css-parser/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-freehep/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-hsqldb/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
// @branch - 分支信息
compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}
@ -88,18 +133,57 @@ def dataContent ={def dir ->
task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-third-jdk11/src")
with dataContent.call("${srcDir}/fine-objenesis/src")
with dataContent.call("${srcDir}/fine-jetbrains/src")
with dataContent.call("${srcDir}/fine-poi/src")
with dataContent.call("${srcDir}/fine-quartz/src")
with dataContent.call("${srcDir}/fine-antlr4/src")
with dataContent.call("${srcDir}/fine-antlr-old/src/main/java")
with dataContent.call("${srcDir}/fine-asm/src")
with dataContent.call("${srcDir}/fine-aspectj/src")
with dataContent.call("${srcDir}/fine-bouncycastle/src")
with dataContent.call("${srcDir}/fine-classmate/src")
with dataContent.call("${srcDir}/fine-commons-codec/src")
with dataContent.call("${srcDir}/fine-commons-collections4/src")
with dataContent.call("${srcDir}/fine-commons-io/src")
with dataContent.call("${srcDir}/fine-commons-fileupload/src")
with dataContent.call("${srcDir}/fine-commons-lang3/src")
with dataContent.call("${srcDir}/fine-commons-collections4/src")
with dataContent.call("${srcDir}/fine-commons-logging/src/main/java")
with dataContent.call("${srcDir}/fine-commons-math3/src")
with dataContent.call("${srcDir}/fine-commons-math3/resources")
with dataContent.call("${srcDir}/fine-joda/src")
with dataContent.call("${srcDir}/fine-commons-pool/src/main/java")
with dataContent.call("${srcDir}/fine-cssparser/src")
with dataContent.call("${srcDir}/fine-freehep/src/main/java")
with dataContent.call("${srcDir}/fine-guava/src")
with dataContent.call("${srcDir}/fine-hsqldb/src/main/java")
with dataContent.call("${srcDir}/fine-icu4j/src")
with dataContent.call("${srcDir}/fine-imageJ/src/main/java")
with dataContent.call("${srcDir}/fine-j2v8/src")
with dataContent.call("${srcDir}/fine-jackson/src")
with dataContent.call("${srcDir}/fine-jai/src/main/java")
with dataContent.call("${srcDir}/fine-jboss-transaction-api/src")
with dataContent.call("${srcDir}/fine-jetbrains/src")
with dataContent.call("${srcDir}/fine-jgit/src")
with dataContent.call("${srcDir}/fine-jna/jna/src/main/resources")
with dataContent.call("${srcDir}/fine-jna/jna/src/main/java")
with dataContent.call("${srcDir}/fine-jna/jna-platform/src/main/java")
with dataContent.call("${srcDir}/fine-joda/src")
with dataContent.call("${srcDir}/fine-jodd/src")
with dataContent.call("${srcDir}/fine-jpa/src")
with dataContent.call("${srcDir}/fine-lucene/src")
with dataContent.call("${srcDir}/fine-lz4/src")
with dataContent.call("${srcDir}/fine-objenesis/src/main/java")
with dataContent.call("${srcDir}/fine-org-dom4j/src/main/java")
with dataContent.call("${srcDir}/fine-roaringbitmap/src")
with dataContent.call("${srcDir}/fine-sense4/src")
with dataContent.call("${srcDir}/fine-default/fine-javax-el/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-mail/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-javax-cdi/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-javax-jms/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-sun-misc/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-javax-inject/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-javax-interceptor/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-zip-tools/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-javax-transaction/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-slf4j-api/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-sjsxp/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-stax/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk8/xml-apis/src/main/java")
into "${classesDir}"
}
}

75
build.third_step2.gradle
Unescape View File

@ -24,12 +24,28 @@ sourceSets{
main{
java{
srcDirs=[
"${srcDir}/fine-aspectj/src",
"${srcDir}/fine-spring/src",
"${srcDir}/fine-antlr4/src",
"${srcDir}/fine-sense4/src",
"${srcDir}/fine-bouncycastle/src",
"${srcDir}/fine-spring/resources"
"${srcDir}/fine-bcprov-old/src/main/java",
"${srcDir}/fine-byte-buddy/src",
"${srcDir}/fine-cglib/src",
"${srcDir}/fine-commons-fileupload/src",
"${srcDir}/fine-httpcomponents/http-client/fluent-hc/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java-deprecated",
"${srcDir}/fine-httpcomponents/http-client/httpclient-win/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java-deprecated",
"${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java-deprecated",
"${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated",
"${srcDir}/fine-kryo/src",
"${srcDir}/fine-log4j/src",
"${srcDir}/fine-poi/src",
"${srcDir}/fine-poi-old/src/main/java",
"${srcDir}/fine-redisson/src",
"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java",
"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java"
]
}
}
@ -50,14 +66,19 @@ def MVN_BRANCH = branchVariable.toUpperCase()
//指定依赖
dependencies{
compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-antlr4/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/fine-byte-buddy/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-commons-fileupload/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-httpcomponents/http-client/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-httpcomponents/http-core/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/fine-poi/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/fine-poi-old/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/fine-redisson/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
// @branch - 分支信息
compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}
@ -76,11 +97,31 @@ def dataContent ={def dir ->
task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-spring/src")
with dataContent.call("${srcDir}/fine-spring/resources")
with dataContent.call("${srcDir}/fine-sense4/src")
with dataContent.call("${srcDir}/fine-bouncycastle/src")
with dataContent.call("${srcDir}/fine-antlr4/src")
with dataContent.call("${srcDir}/fine-bcprov-old/src/main/java")
with dataContent.call("${srcDir}/fine-byte-buddy/src")
with dataContent.call("${srcDir}/fine-cglib/src")
with dataContent.call("${srcDir}/fine-cglib/resources")
with dataContent.call("${srcDir}/fine-commons-fileupload/src")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/fluent-hc/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpclient-win/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-kryo/src")
with dataContent.call("${srcDir}/fine-log4j/src")
with dataContent.call("${srcDir}/fine-log4j/resources")
with dataContent.call("${srcDir}/fine-poi/src")
with dataContent.call("${srcDir}/fine-poi-old/src")
with dataContent.call("${srcDir}/fine-redisson/src")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/resources")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java")
into "${classesDir}"
}
}

19
build.third_step3.gradle
Unescape View File

@ -12,7 +12,6 @@ targetCompatibility=1.7
def jarname="fine-third-10.0.jar"
def classesDir='build/classes/3'
def ftpreport='E:/ftp/share/report/'
//解压lib下的jar到classes文件夹
jar{
baseName="fine-third_3-10.0"
@ -25,10 +24,10 @@ sourceSets{
main{
java{
srcDirs=[
"${srcDir}/fine-jpa/src",
"${srcDir}/fine-jboss-transaction-api/src",
"${srcDir}/fine-jboss-logging/src",
"${srcDir}/fine-classmate/src"
"${srcDir}/fine-itext/src",
"${srcDir}/fine-javassist/src/main/java",
"${srcDir}/fine-jedis/src",
"${srcDir}/fine-jboss-logging/src"
]
}
}
@ -52,8 +51,8 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
// @branch - 分支信息
compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}
@ -72,10 +71,10 @@ def dataContent ={def dir ->
task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-jpa/src")
with dataContent.call("${srcDir}/fine-jboss-transaction-api/src")
with dataContent.call("${srcDir}/fine-itext/src")
with dataContent.call("${srcDir}/fine-javassist/src/main/java")
with dataContent.call("${srcDir}/fine-jedis/src")
with dataContent.call("${srcDir}/fine-jboss-logging/src")
with dataContent.call("${srcDir}/fine-classmate/src")
into "${classesDir}"
}
}

12
build.third_step4.gradle
Unescape View File

@ -12,7 +12,6 @@ targetCompatibility=1.7
def jarname="fine-third-10.0.jar"
def classesDir='build/classes/4'
def ftpreport='E:/ftp/share/report/'
//解压lib下的jar到classes文件夹
jar{
baseName="fine-third_4-10.0"
@ -25,8 +24,9 @@ sourceSets{
main{
java{
srcDirs=[
"${srcDir}/fine-itext-old/src",
"${srcDir}/fine-hibernate/src",
"${srcDir}/fine-hibernate/resources"
"${srcDir}/fine-spring/src"
]
}
}
@ -49,10 +49,11 @@ def MVN_BRANCH = branchVariable.toUpperCase()
//指定依赖
dependencies{
compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
// @branch - 分支信息
compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}
@ -72,8 +73,11 @@ def dataContent ={def dir ->
task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-itext-old/src")
with dataContent.call("${srcDir}/fine-hibernate/src")
with dataContent.call("${srcDir}/fine-hibernate/resources")
with dataContent.call("${srcDir}/fine-spring/src")
with dataContent.call("${srcDir}/fine-spring/resources")
into "${classesDir}"
}
}

8
build.third_step5.gradle
Unescape View File

@ -12,7 +12,6 @@ targetCompatibility=1.7
def jarname="fine-third-10.0.jar"
def classesDir='build/classes/5'
def ftpreport='E:/ftp/share/report/'
//解压lib下的jar到classes文件夹
jar{
baseName="fine-third_5-10.0"
@ -26,6 +25,7 @@ sourceSets{
java{
srcDirs=[
"${srcDir}/fine-druid/src"
"${srcDir}/fine-socketio/src"
]
}
}
@ -48,10 +48,11 @@ def MVN_BRANCH = branchVariable.toUpperCase()
dependencies{
compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'ojdbc7-12.1.0.jar')
compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
// @branch - 分支信息
compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}
@ -71,6 +72,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-druid/src")
with dataContent.call("${srcDir}/fine-socketio/src")
into "${classesDir}"
}
}

72
build.third_step6.gradle
Unescape View File

@ -12,7 +12,7 @@ targetCompatibility=1.7
def jarname="fine-third-10.0.jar"
def classesDir='build/classes/6'
def ftpreport='E:/ftp/share/report/'
// def ftpreport='E:/ftp/share/report/'
//解压lib下的jar到classes文件夹
jar{
baseName="fine-third_6-10.0"
@ -25,33 +25,7 @@ sourceSets{
main{
java{
srcDirs=[
"${srcDir}/fine-third-default/src",
"${srcDir}/fine-commons-codec/src",
"${srcDir}/fine-icu4j/src",
"${srcDir}/fine-itext-old/src",
"${srcDir}/fine-jackson/src",
"${srcDir}/fine-jackson/resources",
"${srcDir}/fine-ehcache/src",
"${srcDir}/fine-ehcache/resources",
"${srcDir}/fine-guava/src",
"${srcDir}/fine-lucene/src",
"${srcDir}/fine-lucene/resources",
"${srcDir}/fine-asm/src",
"${srcDir}/fine-cglib/src",
"${srcDir}/fine-cglib/resources",
"${srcDir}/fine-jedis/src",
"${srcDir}/fine-jedis/resources",
"${srcDir}/fine-cssparser/src",
"${srcDir}/fine-byte-buddy/src",
"${srcDir}/fine-jodd/src",
"${srcDir}/fine-redisson/src",
"${srcDir}/fine-socketio/src",
"${srcDir}/fine-itext/src",
"${srcDir}/fine-kryo/src",
"${srcDir}/fine-lz4/src",
"${srcDir}/fine-log4j/src",
"${srcDir}/fine-jgit/src",
"${srcDir}/fine-roaringbitmap/src"
"${srcDir}/fine-quartz/src"
]
}
}
@ -72,20 +46,10 @@ def MVN_BRANCH = branchVariable.toUpperCase()
//指定依赖
dependencies{
compile fileTree(dir:"${srcDir}/fine-third-default/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-commons-codec/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-icu4j/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-jackson/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-cssparser/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-byte-buddy/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-redisson/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
// @branch - 分支信息
compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}
@ -104,31 +68,7 @@ def dataContent ={def dir ->
task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-third-default/src")
with dataContent.call("${srcDir}/fine-commons-codec/src")
with dataContent.call("${srcDir}/fine-icu4j/src")
with dataContent.call("${srcDir}/fine-icu4j/resources")
with dataContent.call("${srcDir}/fine-itext-old/src")
with dataContent.call("${srcDir}/fine-jackson/src")
with dataContent.call("${srcDir}/fine-jackson/resources")
with dataContent.call("${srcDir}/fine-ehcache/src")
with dataContent.call("${srcDir}/fine-ehcache/resources")
with dataContent.call("${srcDir}/fine-guava/src")
with dataContent.call("${srcDir}/fine-lucene/src")
with dataContent.call("${srcDir}/fine-lucene/resources")
with dataContent.call("${srcDir}/fine-cglib/src")
with dataContent.call("${srcDir}/fine-cglib/resources")
with dataContent.call("${srcDir}/fine-jedis/src")
with dataContent.call("${srcDir}/fine-jedis/resources")
with dataContent.call("${srcDir}/fine-cssparser/src")
with dataContent.call("${srcDir}/fine-kryo/src")
with dataContent.call("${srcDir}/fine-lz4/src")
with dataContent.call("${srcDir}/fine-lz4/resources")
with dataContent.call("${srcDir}/fine-log4j/src")
with dataContent.call("${srcDir}/fine-log4j/resources")
with dataContent.call("${srcDir}/fine-jgit/src")
with dataContent.call("${srcDir}/fine-jgit/resources")
with dataContent.call("${srcDir}/fine-roaringbitmap/src")
with dataContent.call("${srcDir}/fine-quartz/src")
into "${classesDir}"
}
}

77
build.third_step7.gradle
Unescape View File

@ -0,0 +1,77 @@
apply plugin: 'java'
tasks.withType(JavaCompile){
options.encoding = 'UTF-8'
destinationDir = file('build/classes/7')
}
//源码版本
sourceCompatibility=1.7
//构建的class版本
targetCompatibility=1.7
def jarname="fine-third-10.0.jar"
def classesDir='build/classes/7'
// def ftpreport='E:/ftp/share/report/'
//解压lib下的jar到classes文件夹
jar{
baseName="fine-third_7-10.0"
}
def srcDir="."
//设置源码路径
sourceSets{
main{
java{
srcDirs=[
"${srcDir}/fine-ehcache/src"
]
}
}
}
sourceSets.main.output.classesDir = file('build/classes/7')
repositories{
mavenCentral()
maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
}
//获取什么分支名
FileTree files =fileTree(dir:'./',include:'build*.gradle')
def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator))
def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1)
def MVN_BRANCH = branchVariable.toUpperCase()
//指定依赖
dependencies{
compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar')
// @branch - 分支信息
// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}
//指明无法编译文件所在路径
def dataContent ={def dir ->
copySpec{
from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
}
}
}
task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{
println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-ehcache/src")
with dataContent.call("${srcDir}/fine-ehcache/recources")
into "${classesDir}"
}
}
jar.dependsOn copyFiles
Write Preview
Loading…
Cancel
Save