diff --git a/designer_base/build.9.0.gradle b/designer_base/build.9.0.gradle index b3a829481..e2fdfbe11 100644 --- a/designer_base/build.9.0.gradle +++ b/designer_base/build.9.0.gradle @@ -27,7 +27,7 @@ apply plugin: 'aspectj' //指定构建的jdk版本 sourceCompatibility=1.7 //指定生成jar包版本 -version='8.0' +version='9.0' //生成jar包重命名 jar{ baseName='fr-designer-core' diff --git a/designer_base/build.9.0.gradle.bak b/designer_base/build.9.0.gradle.bak index fce3a7f8d..b3a829481 100644 --- a/designer_base/build.9.0.gradle.bak +++ b/designer_base/build.9.0.gradle.bak @@ -44,13 +44,13 @@ ant{ } } //指定源码路径 -sourceSets{ - main{ - java{ - srcDirs=["${srcDir}/src"] - } - } -} +//sourceSets{ +// main{ +// java{ +// srcDirs=["${srcDir}/src"] +// } +// } +//} //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) diff --git a/designer_chart/build.9.0.gradle b/designer_chart/build.9.0.gradle index 6b1b588e9..8f80b35cf 100644 --- a/designer_chart/build.9.0.gradle +++ b/designer_chart/build.9.0.gradle @@ -27,7 +27,7 @@ apply plugin: 'aspectj' //指定构建的jdk版本 sourceCompatibility=1.7 //指定生成jar包版本 -version='8.0' +version='9.0' //生成jar包重命名 jar{ baseName='fr-designer-chart' diff --git a/designer_chart/build.9.0.gradle.bak b/designer_chart/build.9.0.gradle.bak index 76d8822b2..6b1b588e9 100644 --- a/designer_chart/build.9.0.gradle.bak +++ b/designer_chart/build.9.0.gradle.bak @@ -66,7 +66,7 @@ dependencies{ //复制非.java文件到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ copy{ - from ("${srcDir}/src"){ + from ("${srcDir}/src/main/java"){ exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' } into 'build/classes/main' @@ -83,7 +83,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"){ + fileset (dir:"${srcDir}/src/main/java"){ include (name:'**/*.js') include (name:'**/*.css') } diff --git a/designer_form/build.9.0.gradle b/designer_form/build.9.0.gradle index b7da0345f..d24b79650 100644 --- a/designer_form/build.9.0.gradle +++ b/designer_form/build.9.0.gradle @@ -27,7 +27,7 @@ apply plugin: 'aspectj' //指定构建的jdk版本 sourceCompatibility=1.7 //指定生成jar包版本 -version='8.0' +version='9.0' //生成jar包重命名 jar{ baseName='fr-designer-report' diff --git a/designer_form/build.9.0.gradle.bak b/designer_form/build.9.0.gradle.bak index a38769eeb..b7da0345f 100644 --- a/designer_form/build.9.0.gradle.bak +++ b/designer_form/build.9.0.gradle.bak @@ -78,8 +78,8 @@ def dataContent ={def dir -> task copyFile(type:Copy,dependsOn:compileJava){ copy{ - with dataContent.call("${srcDir}/src") - with dataContent.call("${srcDir}/../designer/src") + with dataContent.call("${srcDir}/src/main/java") + // with dataContent.call("${srcDir}/../designer/src") into 'build/classes/main' }