From 0b414379c010223d04277148efae89ee058baaad Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 26 Dec 2017 14:37:57 +0800 Subject: [PATCH] build --- build.third.gradle | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/build.third.gradle b/build.third.gradle index dc87bfd19..28752637a 100644 --- a/build.third.gradle +++ b/build.third.gradle @@ -21,7 +21,9 @@ sourceSets{ java{ srcDirs=["${srcDir}/fine-druid/src", "${srcDir}/fine-poi/src", - "${srcDir}/fine-quartz/src"] + "${srcDir}/fine-quartz/src", + "${srcDir}/fine-spring/src" + "${srcDir}/fine-spring/resources"] } } @@ -32,8 +34,8 @@ repositories{ //获取什么分支名 FileTree files =fileTree(dir:'./',include:'build.*.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) -def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('/')) +def branchName=buildDir.substring(buildDir.lastIndexOf ('/')+1) //指定依赖 dependencies{ @@ -41,6 +43,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') compile fileTree(dir:"../../finereport-lib-base/${branchName}",include:'**/*.jar') compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' @@ -65,6 +68,10 @@ task unJar{ fileset(dir:"${srcDir}/fine-poi/lib"){ include(name:'**/*.jar') } + fileset(dir:"${srcDir}/fine-spring/lib"){ + include(name:'aopalliance-1.0.jar') + include(name:'aspectjweaver-1.8.4.jar') + } } } } @@ -84,6 +91,8 @@ task copyFiles(type:Copy,dependsOn:'unJar'){ with dataContent.call("${srcDir}/fine-druid/src") with dataContent.call("${srcDir}/fine-poi/src") with dataContent.call("${srcDir}/fine-quartz/src") + with dataContent.call("${srcDir}/fine-spring/src") + with dataContent.call("${srcDir}/fine-spring/resources") into "${classesDir}" } } @@ -94,6 +103,7 @@ task deleteSrc(dependsOn:'build') { delete(dir:"${srcDir}/fine-druid") delete(dir:"${srcDir}/fine-poi") delete(dir:"${srcDir}/fine-quartz") + delete(dir:"${srcDir}/fine-spring") }