From 5e0f82fee2d8d9ae985e2431a6b403bf650b5e91 Mon Sep 17 00:00:00 2001
From: sunmondong <sunmondong@finereport.com>
Date: Tue, 11 Oct 2016 22:30:43 +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 => build.dev.gradle              |  2 +-
 build.gradle.bak                              | 86 -------------------
 .../{build.gradle => build.dev.gradle}        |  2 +-
 designer_base/build.gradle.bak                | 70 ---------------
 .../{build.gradle => build.dev.gradle}        |  2 +-
 designer_chart/build.gradle.bak               | 66 --------------
 .../{build.gradle => build.dev.gradle}        |  2 +-
 designer_form/build.gradle.bak                | 83 ------------------
 8 files changed, 4 insertions(+), 309 deletions(-)
 rename build.gradle => build.dev.gradle (97%)
 delete mode 100644 build.gradle.bak
 rename designer_base/{build.gradle => build.dev.gradle} (96%)
 delete mode 100644 designer_base/build.gradle.bak
 rename designer_chart/{build.gradle => build.dev.gradle} (96%)
 delete mode 100644 designer_chart/build.gradle.bak
 rename designer_form/{build.gradle => build.dev.gradle} (97%)
 delete mode 100644 designer_form/build.gradle.bak

diff --git a/build.gradle b/build.dev.gradle
similarity index 97%
rename from build.gradle
rename to build.dev.gradle
index abc9815956..507d77e9f5 100644
--- a/build.gradle
+++ b/build.dev.gradle
@@ -5,7 +5,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/build.gradle.bak b/build.gradle.bak
deleted file mode 100644
index 67a8a0e70f..0000000000
--- a/build.gradle.bak
+++ /dev/null
@@ -1,86 +0,0 @@
-apply plugin: "java"
-tasks.withType(JavaCompile){
-	options.encoding = "UTF-8"
-}
-sourceCompatibility=1.7
-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 &quot;CN=FineReport L=NanJing C=China&quot; -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/designer_base/build.gradle b/designer_base/build.dev.gradle
similarity index 96%
rename from designer_base/build.gradle
rename to designer_base/build.dev.gradle
index f8cfe57ba4..7b3bea2ba9 100644
--- a/designer_base/build.gradle
+++ b/designer_base/build.dev.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_base/build.gradle.bak b/designer_base/build.gradle.bak
deleted file mode 100644
index e7c5a8e1ff..0000000000
--- a/designer_base/build.gradle.bak
+++ /dev/null
@@ -1,70 +0,0 @@
-
-apply plugin: 'java'
-tasks.withType(JavaCompile){
-	options.encoding = 'UTF-8'
-}
-//指定构建的jdk版本
-sourceCompatibility=1.8
-//指定生成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文件到classes文件夹下参与打包
-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.dev.gradle
similarity index 96%
rename from designer_chart/build.gradle
rename to designer_chart/build.dev.gradle
index cc22b7b34b..f980fa135a 100644
--- a/designer_chart/build.gradle
+++ b/designer_chart/build.dev.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_chart/build.gradle.bak b/designer_chart/build.gradle.bak
deleted file mode 100644
index 92f0551624..0000000000
--- a/designer_chart/build.gradle.bak
+++ /dev/null
@@ -1,66 +0,0 @@
-
-apply plugin: 'java'
-tasks.withType(JavaCompile){
-	options.encoding = 'UTF-8'
-}
-//指定构建的jdk版本
-sourceCompatibility=1.8
-//指定生成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',include:'**/*.jar')
-compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
-
- 	testCompile 'junit:junit:4.12'
-}
-//将非.java 文件复制到classes文件夹下参与打包
-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_form/build.gradle b/designer_form/build.dev.gradle
similarity index 97%
rename from designer_form/build.gradle
rename to designer_form/build.dev.gradle
index b06cabd306..57ebd74c2c 100644
--- a/designer_form/build.gradle
+++ b/designer_form/build.dev.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)
diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak
deleted file mode 100644
index 474d4aca95..0000000000
--- a/designer_form/build.gradle.bak
+++ /dev/null
@@ -1,83 +0,0 @@
-
-apply plugin: 'java'
-tasks.withType(JavaCompile){
-	options.encoding = 'UTF-8'
-}
-//指定构建的jdk版本
-sourceCompatibility=1.8
-//指定生成的jar包版本
-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${branchName}",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文件复制到classes文件夹下 参与打包
-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
-