From d6788f0f0a0cbadeed83d5588df5a42b4673c3ba Mon Sep 17 00:00:00 2001
From: sunmondong <sunmondong@finereport.com>
Date: Mon, 29 Aug 2016 17:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E4=BE=9D=E8=B5=96=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/build.gradle      |  2 +-
 designer_base/build.gradle.bak  |  4 ++--
 designer_chart/build.gradle     |  2 +-
 designer_chart/build.gradle.bak |  4 ++--
 designer_form/build.gradle      |  2 +-
 designer_form/build.gradle.bak  | 20 ++++++++++----------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/designer_base/build.gradle b/designer_base/build.gradle
index cbaf1a695..285295c56 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/${branchName}/**/*.jar")
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
diff --git a/designer_base/build.gradle.bak b/designer_base/build.gradle.bak
index bd5f62e8e..e7c5a8e1f 100644
--- a/designer_base/build.gradle.bak
+++ b/designer_base/build.gradle.bak
@@ -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/${branchName}/**/*.jar")
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
@@ -56,7 +56,7 @@ task compressJS{
 			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'){
+	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')
diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle
index 946649195..ec39e786a 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}/*/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
diff --git a/designer_chart/build.gradle.bak b/designer_chart/build.gradle.bak
index 2a9777371..92f055162 100644
--- a/designer_chart/build.gradle.bak
+++ b/designer_chart/build.gradle.bak
@@ -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}/**/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
@@ -54,7 +54,7 @@ task compressJS{
 			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'){
+	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')
diff --git a/designer_form/build.gradle b/designer_form/build.gradle
index ca89333a4..6c0df949c 100644
--- a/designer_form/build.gradle
+++ b/designer_form/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/${branchName}/**/build/libs/*.jar")//,exclude:"finereport-design-stable/${branchName}/build/libs/*.jar")
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/*/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
diff --git a/designer_form/build.gradle.bak b/designer_form/build.gradle.bak
index f6c634dd1..4204c2415 100644
--- a/designer_form/build.gradle.bak
+++ b/designer_form/build.gradle.bak
@@ -3,19 +3,19 @@ apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
-//ָ��������jdk�汾
+//指定构建的jdk版本
 sourceCompatibility=1.8
-//ָ�����ɵ�jar���汾
+//指定生成的jar包版本
 version='8.0'
 
 def srcDir="."
 
 
-//ָ������jar��������
+//指明生成jar包的名字
 jar{
 	baseName='fr-designer-report'
 }
-//Դ������λ��
+//源码所在位置
 sourceSets{
 		main{
 			java{
@@ -25,20 +25,20 @@ sourceSets{
 		}
 }
 
-//��ȡʲô��֧��
+//获取什么分支名
 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")//,exclude:"finereport-design-stable/${branchName}/build/libs/*.jar")
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
 
-//ָ���޷������ļ�����·��
+//指明无法编译文件所在路径
 def dataContent ={def dir ->
 		copySpec{
 			from ("${dir}"){
@@ -47,7 +47,7 @@ def dataContent ={def dir ->
 		}
 }
 
-//����.java�ļ����Ƶ�classes�ļ����� ������
+//将非.java文件复制到classes文件夹下 参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
 		with dataContent.call("${srcDir}/src") 
@@ -58,7 +58,7 @@ task copyFile(type:Copy,dependsOn:compileJava){
 }
 
 
-//ѹ����Ŀ�е�js�ļ�
+//压缩项目中的js文件
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {