From 3dc93670c37ecb31a9d0e8a61e14a41647cafedd Mon Sep 17 00:00:00 2001
From: fangdong sun <fangdong sun>
Date: Wed, 10 Aug 2016 09:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=88=86=E6=94=AF=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95--01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                | 100 ++++++++++++++++++------------------
 designer_base/build.gradle  |   2 +-
 designer_chart/build.gradle |   2 +-
 designer_form/build.gradle  |   2 +-
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3ab04c1e27..4cfb0fc7a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,71 +1,71 @@
-apply plugin: 'java'
+apply plugin: "java"
 tasks.withType(JavaCompile){
-	options.encoding = 'UTF-8'
+	options.encoding = "UTF-8"
 }
 
-def basicDir='../../'
-def libDir='${basicDir}/finereport-lib-stable'
+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(build.DirlastIndexOf ('\\')+1)
+FileTree files =fileTree(dir:"./",include:"build.gradle")
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\"))
+def branchName=buildDir.substring(build.DirlastIndexOf ("\\")+1)
 
 task appletJar<<{
 	
 	ant{
-		mkdir(dir:'${libDir}/tmp')
-		mkdir(dir:'build/classes/')
-		copy(todir:'build/classes/'){
-			fileset(dir:'${basicDir}/finereport-core-stable/${branchName}/build/classes/main')
+		mkdir(dir:"${libDir}/tmp")
+		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-chart-stable/${branchName}/build/classes/main")
 							
-			fileset(dir:'${basicDir}/finereport-report-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-platform-stable/${branchName}/build/classes/main")
 						
-			fileset(dir:'${basicDir}/finereport-performance-stable/${branchName}/build/classes/main')
+			fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main")
 
 		}
-		unjar(src:"${libDir}/3rd.jar',dest:'${libDir}/tmp')
-		unjar(src:'${libDir}/servlet-api.jar',dest:'${libDir}/tmp')
-		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/**')
+		unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp")
+		unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp")
+		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'){
-				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:"${libDir}/tmp"){
+				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')
+			fileset(dir:"build/classes"){
+				include(name:"com/fr/web/*.class")
+				include(name:"com/fr/web/attr/*.class")
 			}
 		}
-		delete(dir:'${libDir}/tmp')
-		def jdk6home=	'D:/FineReport/develop/java/jdk1.6u35'
-		def keystore='frapplet.store'
-		def keycert='fr.cert'
-		def keypassword='123456'
-		def keyalias='fr'
+		delete(dir:"${libDir}/tmp")
+		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}")
@@ -79,7 +79,7 @@ task appletJar<<{
 		}
 		delete(file:"${keystore}")
 		delete(file:"${keycert}")
-		delete(dir:'build/classes')
+		delete(dir:"build/classes")
 	
 	}
 
diff --git a/designer_base/build.gradle b/designer_base/build.gradle
index 731deebe3f..b57b6f5695 100644
--- a/designer_base/build.gradle
+++ b/designer_base/build.gradle
@@ -33,7 +33,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 dependencies{
 
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
-compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle
index 92e221f194..2c836c3514 100644
--- a/designer_chart/build.gradle
+++ b/designer_chart/build.gradle
@@ -31,7 +31,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 //指定外部依赖
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
-compile fileTree(dir:'../../../',include:'finereport-*-stable/${branchName}/**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
diff --git a/designer_form/build.gradle b/designer_form/build.gradle
index 118215fc8a..ade1e3efc5 100644
--- a/designer_form/build.gradle
+++ b/designer_form/build.gradle
@@ -34,7 +34,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 //声明外部依赖
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
-compile fileTree(dir:'../../../',include:'finereport-*-stable/**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }