diff --git a/build.third_step0.gradle b/build.third_step0.gradle index dee7c0b29..dcb6d2a8f 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -1,5 +1,3 @@ - - apply plugin: 'java' tasks.withType(JavaCompile){ options.encoding = 'UTF-8' @@ -35,37 +33,40 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.s def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) def srcDir="." +configurations { + thirdjar +} + dependencies { - compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" + thirdjar "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" testCompile 'junit:junit:4.12' } -task unJar{ - ant{ - mkdir(dir:"build/classes/main") - println "------------------------------------------------unjar" - unjar(dest:"build/classes/main"){ - fileset(dir: configurations.compile.asPath){ - include(name:'fine-third*.jar') - } - fileset(dir:"../../finereport-lib-other/${branchName}"){ - include(name:"batik-all-1.9.jar") - } - fileset(dir:"${srcDir}/fine-poi/lib"){ - include(name:'**/*.jar') - } - fileset(dir:"${srcDir}/fine-quartz/lib"){ - include(name:'c3p0-0.9.1.1.jar') - } - fileset(dir:"${srcDir}/fine-spring/lib"){ - include(name:'aopalliance-1.0.jar') - } - fileset(dir:"${srcDir}/build/libs"){ - include(name:"*.jar") - } +task unpack(type:Copy) { + delete classesDir + destinationDir=file(classesDir) + println(configurations.thirdjar.singleFile) + from { + zipTree(configurations.thirdjar.singleFile) + } + from { + zipTree("fine-quartz/lib/c3p0-0.9.1.1.jar") + } + + from { + zipTree("fine-spring/lib/aopalliance-1.0.jar") + } + from { + zipTree("fine-poi/lib/curvesapi-1.03.jar") + } + fileTree(dir:"build/libs",include:"**/*.jar").each { + File file -> from { + zipTree(file) } } + } +jar.dependsOn unpack