From a518e638488f180532be5bd60cb0112c128f0673 Mon Sep 17 00:00:00 2001
From: fangdong sun <fangdong sun>
Date: Wed, 10 Aug 2016 10:10:18 +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--04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0dc1b07b16..633739a745 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1)
 task appletJar<<{
 	
 	ant{
-		mkdir(dir:"${libDir}/tmp")
+		mkdir(dir:"${libDir}/tmp-${branchName}")
 		mkdir(dir:"build/classes/")
 		copy(todir:"build/classes/"){
 			fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main")
@@ -27,8 +27,8 @@ task appletJar<<{
 			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")
+		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:"*.*")
@@ -44,7 +44,7 @@ task appletJar<<{
 				exclude(name:"com/fr/start/**")
 				exclude(name:"com/fr/process/**")
 			}
-			fileset(dir:"${libDir}/tmp"){
+			fileset(dir:"${libDir}/tmp-${branchName}"){
 				include(name:"javax/mail/**")
 				include(name:"javax/servlet/**")
 				include(name:"org/freehep/**")
@@ -60,7 +60,7 @@ task appletJar<<{
 				include(name:"com/fr/web/attr/*.class")
 			}
 		}
-		delete(dir:"${libDir}/tmp")
+		delete(dir:"${libDir}/tmp-${branchName}")
 		def jdk6home=	"D:/FineReport/develop/java/jdk1.6u35"
 		def keystore="frapplet.store"
 		def keycert="fr.cert"