From 1f04d500487a7e489ee4490b01bbdce109e660f8 Mon Sep 17 00:00:00 2001
From: fangdong sun <fangdong sun>
Date: Mon, 8 Aug 2016 11:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95=EF=BC=88ap?=
 =?UTF-8?q?plet=EF=BC=89--04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 60adc1a3b..daa7ab1b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,19 +65,25 @@ task appletJar{
 			}
 		}
 		delete(dir:'../finereport-lib-stable/tmp')
-		property(name:'jdk1.6.home',value:'D:/FineReport/develop/java/jdk1.6u35')
-		property(name:'keystore',value:'frapplet.store')
-		property(name:'keycert',value:'fr.cert')
-		property(name:'keypasssword',value:'123456')
-		property(name:'keyalias',value:'fr')
-		exec(executable:"${jdk1.6.home}/bin/keytool"){
+		def jdk6home=	'D:/FineReport/develop/java/jdk1.6u35'
+		def keystore='frapplet.store'
+		def keycert='fr.cert'
+		def keypassword='123456'
+		def keyalias='fr'
+//property(name:'jdk1.6.home',value:'D:/FineReport/develop/java/jdk1.6u35')
+		//property(name:'keystore',value:'frapplet.store')
+		//property(name:'keycert',value:'fr.cert')
+		//property(name:'keypasssword',value:'123456')
+		//property(name:'keyalias',value:'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:"${jdk1.6.home}/bin/keytool"){
+		exec(executable:"${jdk6home}/bin/keytool"){
 			arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}")
 		}
 
-		exec(executable:"${jdk1.6.home}/bin/jarsigner"){
+		exec(executable:"${jdk6home}/bin/jarsigner"){
 			arg(line:"-keystore ${keystore} -storepass ${keypassword} ${applet_jar} ${keyalias}")
 		}
 		delete(file:"${keystore}")