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') } }