From b87f8d3c122dc14b8db846d28fe50b242897d6c3 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Sat, 30 Jul 2016 21:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20build.gradle=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=BA=90=E7=A0=81=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 6 +++--- designer_chart/build.gradle | 6 +++--- designer_form/build.gradle | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 4277b09c9..0cb85a86b 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -16,7 +16,7 @@ def srcDir="." sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_base/src"] + srcDirs=["${srcDir}/src"] } } } @@ -32,7 +32,7 @@ compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_base/src"){ + from ("${srcDir}/src"){ exclude '**/*.java' } into 'build/classes/main' @@ -49,7 +49,7 @@ task compressJS{ } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer_base/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index bd9fb7bac..cec293c5d 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -17,7 +17,7 @@ jar{ sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer_chart/src"] + srcDirs=["${srcDir}/src"] } } } @@ -30,7 +30,7 @@ compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer_chart/src"){ + from ("${srcDir}/src"){ exclude '**/*.java' } into 'build/classes/main' @@ -46,7 +46,7 @@ task compressJS{ } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer_chart/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 2b610a67e..eda33def0 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -17,8 +17,8 @@ jar{ sourceSets{ main{ java{ - srcDirs=["${srcDir}/designer/src", -"${srcDir}/designer_form/src"] + srcDirs=["${srcDir}/src", +"${srcDir}_form/src"] } } } @@ -32,10 +32,10 @@ compile fileTree(dir:'../../',include:'fr-*-8.0-gradle/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/designer/src"){ + from ("${srcDir}/src"){ exclude '**/*.java' } - from ("${srcDir}/designer_form/src") + from ("${srcDir}_form/src") into ('build/classes/main') } @@ -50,11 +50,11 @@ task compressJS{ } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ - fileset (dir:"${srcDir}/designer/src"){ + fileset (dir:"${srcDir}/src"){ include (name:'**/*.js') } - fileset (dir:"${srcDir}/designer_form/src"){ + fileset (dir:"${srcDir}_form/src"){ include (name:'**/*.js') }