Browse Source

Merge pull request #1317 in CORE/base-third from feature/10.0 to research/10.0

* commit 'b379fd59a2df422b6bdcc77a9fdcf2a0fd78706a':
  KERNEL-6189 fix: 修复third打包脚本
  KERNEL-6189 chore: feature分支fine-third打包加入CBB
research/10.0
superman 4 years ago
parent
commit
a353f39f3d
  1. 14
      build.third_step0.gradle

14
build.third_step0.gradle

@ -49,9 +49,14 @@ def formattedDate = date.format('yyyy.MM.dd')
def srcDir="."
def maven_version_build = ""
def indexV = branchName.indexOf( "%2F");
// "FEATURE", "RELEASE"
String branchNameUpperCase = "RELEASE"
if(indexV != -1){
version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
maven_version_build = project.version +"-" + branchName.substring(0, indexV).toUpperCase() +"-SNAPSHOT"
branchNameUpperCase = branchName.substring(0, indexV).toUpperCase()
maven_version_build = project.version +"-" + branchNameUpperCase +"-SNAPSHOT"
} else {
version= branchName
maven_version_build = project.version +"-SNAPSHOT"
@ -67,9 +72,10 @@ configurations {
}
// third的feature对应essential和cbb的releasemaster
String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER'
dependencies {
essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
essential "com.fr.cbb:fine-universal-skeleton:1.0-${essentialBranch}-SNAPSHOT"
// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// sigar "com.fr.third:sigar:1.6.0"
testCompile 'junit:junit:4.12'
@ -162,6 +168,6 @@ task unpackEssential(type:Copy) {
into classesDir
}
jar.dependsOn unpackEssential
unpackEssential.dependsOn unpack
jar.dependsOn unpack
jar.dependsOn unpackEssential

Loading…
Cancel
Save