diff --git a/build.third_step0.gradle b/build.third_step0.gradle index 9b7bcd2cb..15c38807b 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -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) diff --git a/build.third_step1.gradle b/build.third_step1.gradle index 739e02787..454669d7d 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -153,10 +153,10 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){ 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")//.so + 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-jedis/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") @@ -170,8 +170,20 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){ 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")//.h - with dataContent.call("${srcDir}/fine-third-fault/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}" } } diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 2a4e8a32d..fba4e0a2e 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -30,15 +30,19 @@ sourceSets{ "${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", + "${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" @@ -93,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}" } } diff --git a/build.third_step3.gradle b/build.third_step3.gradle index 702132f17..078f0af23 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -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}" } } diff --git a/build.third_step4.gradle b/build.third_step4.gradle index 650c69b0a..dd8aa6541 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -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}" } } diff --git a/build.third_step5.gradle b/build.third_step5.gradle index dd8d80fdd..5525e82c8 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -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}" } } diff --git a/build.third_step6.gradle b/build.third_step6.gradle index 8ef6d50ae..ce1f815dd 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -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}" } } diff --git a/build.third_step7.gradle b/build.third_step7.gradle new file mode 100644 index 000000000..0282e2a96 --- /dev/null +++ b/build.third_step7.gradle @@ -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