diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 36753c97c..d44d269d5 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -36,7 +36,7 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ - exclude '**/*.java' + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' } into 'build/classes/main' } @@ -54,7 +54,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}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 5daf8d856..288077655 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -34,7 +34,8 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') task copyFile(type:Copy,dependsOn:compileJava){ copy{ from ("${srcDir}/src"){ - exclude '**/*.java' + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } into 'build/classes/main' } @@ -51,7 +52,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}/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } } diff --git a/designer_form/build.gradle b/designer_form/build.gradle index c17cb4cf6..b7a91f113 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -32,15 +32,20 @@ compile fileTree(dir:'../../',include:'finereport-*-stable/**/*.jar') testCompile 'junit:junit:4.12' } +//指明无法编译文件所在路径 +def dataContent ={def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} + //将非.java文件复制到classes文件夹下 参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/src"){ - exclude '**/*.java' - } - from ("${srcDir}/../designer/src"){ - exclude '**/*.java' - } + with dataContent.call("${srcDir}/src") + with dataContent.call("${srcDir}/../designer/src") into ('build/classes/main') } @@ -54,14 +59,15 @@ task compressJS{ fileset(dir:'../../finereport-build-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') } fileset (dir:"${srcDir}/../designer/src"){ include (name:'**/*.js') - + include (name:'**/*.css') } }