Browse Source

打包和调试冲突问题

master
richie 5 years ago
parent
commit
6aac914306
  1. 23
      plugin-function/build.gradle
  2. 23
      plugin-function2/build.gradle

23
plugin-function/build.gradle

@ -27,10 +27,12 @@ group = 'com.fr.plugin'
version = '10.0' version = '10.0'
sourceCompatibility = '8' sourceCompatibility = '8'
sourceSets { if (!guard) {
main { sourceSets {
java.outputDir = file(outputPath) main {
output.resourcesDir = file(outputPath) java.outputDir = file(outputPath)
output.resourcesDir = file(outputPath)
}
} }
} }
@ -45,16 +47,19 @@ ant.references["compile.classpath"] = ant.path {
classes.dependsOn('clean') classes.dependsOn('clean')
task copyFiles(type: Copy,dependsOn: 'classes'){ task copyFiles(type: Copy,dependsOn: 'classes'){
// from "$buildDir/classes/java/main" if (guard) {
// from "$buildDir/resources/main" from "$buildDir/classes/java/main"
from outputPath from "$buildDir/resources/main"
} else {
from outputPath
}
into "$projectDir/classes" into "$projectDir/classes"
} }
task preJar(type:Copy,dependsOn: guard ? 'compile_encrypt_javas' : 'compile_plain_javas'){ task preJar(type:Copy,dependsOn: guard ? 'compile_encrypt_javas' : 'compile_plain_javas'){
from "$projectDir/classes" from "$projectDir/classes"
into "$buildDir/classes/java/main" into "$buildDir/classes/java/main"
include "**/*.class" include "**/*.*"
doLast(){ doLast(){
delete file("$projectDir/classes") delete file("$projectDir/classes")
} }
@ -62,7 +67,7 @@ task preJar(type:Copy,dependsOn: guard ? 'compile_encrypt_javas' : 'compile_plai
jar.dependsOn("preJar") jar.dependsOn("preJar")
task makeJar(type: Jar,dependsOn: preJar){ task makeJar(type: Jar,dependsOn: preJar){
from fileTree(dir:"$buildDir/classes/java/main") from fileTree(dir:guard ? "$buildDir/classes/java/main" : outputPath)
baseName pluginPre baseName pluginPre
appendix pluginName appendix pluginName
version pluginVersion version pluginVersion

23
plugin-function2/build.gradle

@ -27,10 +27,12 @@ group = 'com.fr.plugin'
version = '10.0' version = '10.0'
sourceCompatibility = '8' sourceCompatibility = '8'
sourceSets { if (!guard) {
main { sourceSets {
java.outputDir = file(outputPath) main {
output.resourcesDir = file(outputPath) java.outputDir = file(outputPath)
output.resourcesDir = file(outputPath)
}
} }
} }
@ -45,16 +47,19 @@ ant.references["compile.classpath"] = ant.path {
classes.dependsOn('clean') classes.dependsOn('clean')
task copyFiles(type: Copy,dependsOn: 'classes'){ task copyFiles(type: Copy,dependsOn: 'classes'){
// from "$buildDir/classes/java/main" if (guard) {
// from "$buildDir/resources/main" from "$buildDir/classes/java/main"
from outputPath from "$buildDir/resources/main"
} else {
from outputPath
}
into "$projectDir/classes" into "$projectDir/classes"
} }
task preJar(type:Copy,dependsOn: guard ? 'compile_encrypt_javas' : 'compile_plain_javas'){ task preJar(type:Copy,dependsOn: guard ? 'compile_encrypt_javas' : 'compile_plain_javas'){
from "$projectDir/classes" from "$projectDir/classes"
into "$buildDir/classes/java/main" into "$buildDir/classes/java/main"
include "**/*.class" include "**/*.*"
doLast(){ doLast(){
delete file("$projectDir/classes") delete file("$projectDir/classes")
} }
@ -62,7 +67,7 @@ task preJar(type:Copy,dependsOn: guard ? 'compile_encrypt_javas' : 'compile_plai
jar.dependsOn("preJar") jar.dependsOn("preJar")
task makeJar(type: Jar,dependsOn: preJar){ task makeJar(type: Jar,dependsOn: preJar){
from fileTree(dir:"$buildDir/classes/java/main") from fileTree(dir:guard ? "$buildDir/classes/java/main" : outputPath)
baseName pluginPre baseName pluginPre
appendix pluginName appendix pluginName
version pluginVersion version pluginVersion

Loading…
Cancel
Save