From 67f353aeb1cba7169ab4bfb45fa203ab9b0c7c4f Mon Sep 17 00:00:00 2001 From: sunmondong Date: Wed, 7 Dec 2016 22:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.performance.gradle | 2 +- designer_base/build.performance.gradle.bak | 8 +-- designer_chart/build.performance.gradle | 2 +- designer_chart/build.performance.gradle.bak | 69 +++++++++++++++++++++ designer_form/build.performance.gradle | 2 +- designer_form/build.performance.gradle.bak | 2 +- 6 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 designer_chart/build.performance.gradle.bak diff --git a/designer_base/build.performance.gradle b/designer_base/build.performance.gradle index 225b0e48d..af0dc75f0 100644 --- a/designer_base/build.performance.gradle +++ b/designer_base/build.performance.gradle @@ -52,7 +52,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../${baseDir}/lib4build',includes:'**/*.jar') + fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_base/build.performance.gradle.bak b/designer_base/build.performance.gradle.bak index c263e5c17..225b0e48d 100644 --- a/designer_base/build.performance.gradle.bak +++ b/designer_base/build.performance.gradle.bak @@ -32,10 +32,8 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ - -compile fileTree(dir:"../${baseDir}/lib",include:'**/*.jar') -compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar") - + compile fileTree(dir:"../${baseDir}/lib",include:'**/*.jar') + compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar") testCompile 'junit:junit:4.12' } //复制非.java文件到classes文件夹下参与打包 @@ -54,7 +52,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') + fileset(dir:'../${baseDir}/lib4build',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.performance.gradle b/designer_chart/build.performance.gradle index 7a57794c4..c8f7e2ac3 100644 --- a/designer_chart/build.performance.gradle +++ b/designer_chart/build.performance.gradle @@ -52,7 +52,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../${baseDir}/lib4build',includes:'**/*.jar') + fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.performance.gradle.bak b/designer_chart/build.performance.gradle.bak new file mode 100644 index 000000000..7a57794c4 --- /dev/null +++ b/designer_chart/build.performance.gradle.bak @@ -0,0 +1,69 @@ + +apply plugin: 'java' +tasks.withType(JavaCompile){ + options.encoding = 'UTF-8' +} +//指定构建的jdk版本 +sourceCompatibility=1.7 +//指定生成jar包版本 +version='8.0' +//生成jar包重命名 +jar{ + baseName='fr-designer-chart' +} + + +def srcDir="." +def baseDir=".." + +//指定源码路径 +sourceSets{ + main{ + java{ + srcDirs=["${srcDir}/src"] + } + } +} +//获取什么分支名 +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:"../${baseDir}/lib",include:'**/*.jar') + compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar") + testCompile 'junit:junit:4.12' +} +//复制非.java文件到classes文件夹下参与打包 +task copyFile(type:Copy,dependsOn:compileJava){ + copy{ + from ("${srcDir}/src"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + into 'build/classes/main' + } + +} + + +//压缩项目中的js文件 +task compressJS{ + ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ + classpath { + fileset(dir:'../${baseDir}/lib4build',includes:'**/*.jar') + } + } + 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') + } + + } +} +jar.dependsOn compressJS + + + diff --git a/designer_form/build.performance.gradle b/designer_form/build.performance.gradle index 63aaf0cf0..8d1c70877 100644 --- a/designer_form/build.performance.gradle +++ b/designer_form/build.performance.gradle @@ -52,7 +52,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../${baseDir}/lib4build',includes:'**/*.jar') + fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.performance.gradle.bak b/designer_form/build.performance.gradle.bak index 7a57794c4..63aaf0cf0 100644 --- a/designer_form/build.performance.gradle.bak +++ b/designer_form/build.performance.gradle.bak @@ -9,7 +9,7 @@ sourceCompatibility=1.7 version='8.0' //生成jar包重命名 jar{ - baseName='fr-designer-chart' + baseName='fr-designer-report' }