From a8e91a0d98f65371e3d54bc5f5e7de6465d15984 Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Tue, 3 Apr 2018 15:08:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-7517=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.design-i18n.gradle | 66 ++++++++++++++++++++++++++++++++++++++++
 build.design.gradle      | 41 +++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 build.design-i18n.gradle
 create mode 100644 build.design.gradle

diff --git a/build.design-i18n.gradle b/build.design-i18n.gradle
new file mode 100644
index 0000000..3bc7cb2
--- /dev/null
+++ b/build.design-i18n.gradle
@@ -0,0 +1,66 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+		options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.6
+
+//jar包版本
+version='10.0'
+//jar包名称
+jar{
+	baseName='fr-design-i18n'
+}
+//工程路径
+def srcDir="."
+def baseDir=".."
+//源码所在位置
+	sourceSets{   
+		main{
+			java{
+				srcDirs=["${srcDir}/i18-design/src"]
+			}
+		}		
+	
+	}
+//获取什么分支名
+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)
+
+//指明无法编译文件所在路径
+def dataContent ={def dir ->
+		copySpec{
+			from ("${dir}"){
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+			}
+		}
+}
+
+//copy无法编译的文件参与jar任务
+task copyFiles(type:Copy,dependsOn:compileJava){
+	copy{
+println "${srcDir}"
+		with dataContent.call("${srcDir}/i18n-design/src") 
+		into 'build/classes/main'
+	}
+}
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../lib4build',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}/i18n-design/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+	}
+}
+jar.dependsOn compressJS
+
+
+
diff --git a/build.design.gradle b/build.design.gradle
new file mode 100644
index 0000000..761ca22
--- /dev/null
+++ b/build.design.gradle
@@ -0,0 +1,41 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+		options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.6
+
+//jar包版本
+version='10.0'
+//jar包名称
+jar{
+	baseName='fine-report-designer'
+}
+
+def srcDir="."
+def baseDir=".."
+
+//获取什么分支名
+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)
+
+//输出jar名称
+FileTree f=fileTree(dir:"${baseDir}/chart/build/libs",include:"**/*.jar");
+f.each{File file->
+	println "----------${file.path}"
+}
+task unjars {
+ ant{
+   delete(dir:"build/classes")
+   unjar(dest:"build/classes/main"){
+
+   fileset(dir:"${baseDir}/design/build/libs"){
+    include(name:'fr-*.jar')
+   } 
+  }
+
+ }
+}
+jar.dependsOn unjars
\ No newline at end of file

From abfc4c69082e21eba8eeb3b2fbdddff7ee312207 Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Tue, 3 Apr 2018 15:10:15 +0800
Subject: [PATCH 2/2] 1

---
 ...d.design.gradle => build.report-designer.gradle | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
 rename build.design.gradle => build.report-designer.gradle (61%)

diff --git a/build.design.gradle b/build.report-designer.gradle
similarity index 61%
rename from build.design.gradle
rename to build.report-designer.gradle
index 761ca22..96d9d9c 100644
--- a/build.design.gradle
+++ b/build.report-designer.gradle
@@ -4,7 +4,7 @@ tasks.withType(JavaCompile){
 		options.encoding = 'UTF-8'
 }
 //指定构建的jdk版本
-sourceCompatibility=1.6
+sourceCompatibility=1.8
 
 //jar包版本
 version='10.0'
@@ -22,16 +22,20 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 
 //输出jar名称
-FileTree f=fileTree(dir:"${baseDir}/chart/build/libs",include:"**/*.jar");
+FileTree f=fileTree(dir:"${baseDir}/design/designer_base/build/libs",include:"**/*.jar");
 f.each{File file->
 	println "----------${file.path}"
 }
 task unjars {
  ant{
-   delete(dir:"build/classes")
    unjar(dest:"build/classes/main"){
-
-   fileset(dir:"${baseDir}/design/build/libs"){
+   fileset(dir:"${baseDir}/design/designer_base/build/libs"){
+    include(name:'fr-*.jar')
+   }
+   fileset(dir:"${baseDir}/design/designer_chart/build/libs"){
+    include(name:'fr-*.jar')
+   }
+   fileset(dir:"${baseDir}/design/designer_form/build/libs"){
     include(name:'fr-*.jar')
    } 
   }