From 7441cfccbfa21cca99a65dd0139dc01162419d88 Mon Sep 17 00:00:00 2001 From: sunmondong Date: Tue, 11 Oct 2016 22:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.bak | 86 ------------------- build.gradle => build.master.gradle | 2 +- designer_base/build.gradle.bak | 70 --------------- .../{build.gradle => build.master.gradle} | 2 +- designer_chart/build.gradle.bak | 66 -------------- .../{build.gradle => build.master.gradle} | 2 +- designer_form/build.gradle.bak | 83 ------------------ .../{build.gradle => build.master.gradle} | 2 +- 8 files changed, 4 insertions(+), 309 deletions(-) delete mode 100644 build.gradle.bak rename build.gradle => build.master.gradle (97%) delete mode 100644 designer_base/build.gradle.bak rename designer_base/{build.gradle => build.master.gradle} (96%) delete mode 100644 designer_chart/build.gradle.bak rename designer_chart/{build.gradle => build.master.gradle} (96%) delete mode 100644 designer_form/build.gradle.bak rename designer_form/{build.gradle => build.master.gradle} (97%) diff --git a/build.gradle.bak b/build.gradle.bak deleted file mode 100644 index 633739a74..000000000 --- a/build.gradle.bak +++ /dev/null @@ -1,86 +0,0 @@ -apply plugin: "java" -tasks.withType(JavaCompile){ - options.encoding = "UTF-8" -} - -def basicDir="../../" -def libDir="${basicDir}/finereport-lib-stable" -//获取什么分支名 -FileTree files =fileTree(dir:"./",include:"build.gradle") -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) -def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) - -task appletJar<<{ - - ant{ - mkdir(dir:"${libDir}/tmp-${branchName}") - mkdir(dir:"build/classes/") - copy(todir:"build/classes/"){ - fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main") - - fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main") - - } - unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}") - unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}") - jar(jarfile:"build/libs/fr-applet-8.0.jar"){ - fileset(dir:"build/classes"){ - exclude(name:"*.*") - exclude(name:"bin/*.*") - exclude(name:"classes/**") - exclude(name:"com/fr/schedule/**") - exclude(name:"com/fr/cell/**") - exclude(name:"com/fr/dialog/**") - exclude(name:"com/fr/view/**") - exclude(name:"com/fr/web/**") - exclude(name:"com/fr/fs/**") - exclude(name:"com/fr/design/**") - exclude(name:"com/fr/start/**") - exclude(name:"com/fr/process/**") - } - fileset(dir:"${libDir}/tmp-${branchName}"){ - include(name:"javax/mail/**") - include(name:"javax/servlet/**") - include(name:"org/freehep/**") - include(name:"com/fr/third/JAI/**") - include(name:"com/fr/third/antlr/**") - include(name:"com/fr/third/javax/**") - include(name:"com/sun/xml/**") - include(name:"javax/xml/**") - - } - fileset(dir:"build/classes"){ - include(name:"com/fr/web/*.class") - include(name:"com/fr/web/attr/*.class") - } - } - delete(dir:"${libDir}/tmp-${branchName}") - def jdk6home= "D:/FineReport/develop/java/jdk1.6u35" - def keystore="frapplet.store" - def keycert="fr.cert" - def keypassword="123456" - def keyalias="fr" - - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-genkey -dname "CN=FineReport L=NanJing C=China" -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}") - } - exec(executable:"${jdk6home}/bin/keytool"){ - arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}") - } - - exec(executable:"${jdk6home}/bin/jarsigner"){ - arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}") - } - delete(file:"${keystore}") - delete(file:"${keycert}") - delete(dir:"build/classes") - - } - -} \ No newline at end of file diff --git a/build.gradle b/build.master.gradle similarity index 97% rename from build.gradle rename to build.master.gradle index 659130f9e..cc3bea232 100644 --- a/build.gradle +++ b/build.master.gradle @@ -6,7 +6,7 @@ tasks.withType(JavaCompile){ def basicDir="../../" def libDir="${basicDir}/finereport-lib-stable" //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:"./",include:"build.gradle") +FileTree files =fileTree(dir:"./",include:"build.*.gradle") def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\")) def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1) diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak deleted file mode 100644 index afbfce790..000000000 --- a/designer_base/build.gradle.bak +++ /dev/null @@ -1,70 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.7 -//鎸囧畾鐢熸垚jar鍖呯増鏈 -version='8.0' -//鐢熸垚jar鍖呴噸鍛藉悕 -jar{ - baseName='fr-designer-core' -} - - -def srcDir="." - -//鎸囧畾婧愮爜璺緞 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -//鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) -def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) - -//澹版槑澶栭儴渚濊禆 -dependencies{ - -compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//澶嶅埗闈.java鏂囦欢鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - into 'build/classes/main' - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - - - diff --git a/designer_base/build.gradle b/designer_base/build.master.gradle similarity index 96% rename from designer_base/build.gradle rename to designer_base/build.master.gradle index 09e6e7b1e..b02f751e7 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.master.gradle @@ -24,7 +24,7 @@ sourceSets{ } } //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') +FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak deleted file mode 100644 index 7df817eab..000000000 --- a/designer_chart/build.gradle.bak +++ /dev/null @@ -1,66 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.7 -//鎸囧畾鐢熸垚jar鍖呯殑鐗堟湰 -version='8.0' - -def srcDir="." - -//瀵圭敓鎴愮殑jar鍖呰繘琛岄噸鍛藉悕 - -jar{ - baseName='fr-designer-chart' -} - -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} -FileTree files =fileTree(dir:'./',include:'build.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) -def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) - -//鎸囧畾澶栭儴渚濊禆 -dependencies{ -compile fileTree(dir:'../../../finereport-lib-stable/${branchName},include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} -//灏嗛潪.java 鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - from ("${srcDir}/src"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - - } - into 'build/classes/main' - } - -} - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - diff --git a/designer_chart/build.gradle b/designer_chart/build.master.gradle similarity index 96% rename from designer_chart/build.gradle rename to designer_chart/build.master.gradle index dc00470f2..ba6df992b 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.master.gradle @@ -23,7 +23,7 @@ sourceSets{ } } } -FileTree files =fileTree(dir:'./',include:'build.gradle') +FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak deleted file mode 100644 index 5a52b09f0..000000000 --- a/designer_form/build.gradle.bak +++ /dev/null @@ -1,83 +0,0 @@ - -apply plugin: 'java' -tasks.withType(JavaCompile){ - options.encoding = 'UTF-8' -} -//鎸囧畾鏋勫缓鐨刯dk鐗堟湰 -sourceCompatibility=1.7 -//鎸囧畾鐢熸垚鐨刯ar鍖呯増鏈 -version='8.0' - -def srcDir="." - - -//鎸囨槑鐢熸垚jar鍖呯殑鍚嶅瓧 -jar{ - baseName='fr-designer-report' -} -//婧愮爜鎵鍦ㄤ綅缃 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src", -"${srcDir}/../designer/src"] - } - } -} - -//鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) -def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) - -//澹版槑澶栭儴渚濊禆 -dependencies{ -compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - - testCompile 'junit:junit:4.12' -} - -//鎸囨槑鏃犳硶缂栬瘧鏂囦欢鎵鍦ㄨ矾寰 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -//灏嗛潪.java鏂囦欢澶嶅埗鍒癱lasses鏂囦欢澶逛笅 鍙備笌鎵撳寘 -task copyFile(type:Copy,dependsOn:compileJava){ - copy{ - with dataContent.call("${srcDir}/src") - with dataContent.call("${srcDir}/../designer/src") - into ('build/classes/main') - } - -} - - -//鍘嬬缉椤圭洰涓殑js鏂囦欢 -task compressJS{ - ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ - classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') - } - } - ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - - } - fileset (dir:"${srcDir}/../designer/src"){ - include (name:'**/*.js') - include (name:'**/*.css') - } - - } -} -jar.dependsOn compressJS - diff --git a/designer_form/build.gradle b/designer_form/build.master.gradle similarity index 97% rename from designer_form/build.gradle rename to designer_form/build.master.gradle index 6694a7992..9c9764727 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.master.gradle @@ -26,7 +26,7 @@ sourceSets{ } //鑾峰彇浠涔堝垎鏀悕 -FileTree files =fileTree(dir:'./',include:'build.gradle') +FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)