Commit 377c17be authored by wentao.suo's avatar wentao.suo

fix

parent 9f3be484
...@@ -271,23 +271,23 @@ def ext_npm_intall(){ ...@@ -271,23 +271,23 @@ def ext_npm_intall(){
return 0 return 0
} }
def build(buildType,systemName, contextDir){ def build(buildType,systemName, branchName,contextDir){
_utils().beautyEcho("Build +++ type:${buildType} systemName:${systemName}", "info") _utils().beautyEcho("Build +++ type:${buildType} systemName:${systemName}", "info")
switch(buildType){ switch(buildType){
case "java": case "java":
build_java(systemName, contextDir) build_java(systemName, branchName,contextDir)
break break
case "nodejs": case "nodejs":
sh "which node" sh "which node"
build_nodejs( systemName, contextDir) build_nodejs( systemName, branchName,contextDir)
break break
case "python": case "python":
build_python( systemName, contextDir) build_python( systemName, branchName,contextDir)
break break
case "lua-ui": case "lua-ui":
sh "which node" sh "which node"
build_luaui( systemName, contextDir) build_luaui( systemName, branchName,contextDir)
break break
default: default:
echo "未知的buildType: ${buildType}" echo "未知的buildType: ${buildType}"
...@@ -297,7 +297,7 @@ def build(buildType,systemName, contextDir){ ...@@ -297,7 +297,7 @@ def build(buildType,systemName, contextDir){
} }
def build_java(systemName, contextDir) { def build_java(systemName, branchName,contextDir) {
def projectAttr = project_attr(systemName) def projectAttr = project_attr(systemName)
buildCmd = projectAttr["buildCmd"] buildCmd = projectAttr["buildCmd"]
...@@ -307,7 +307,7 @@ def build_java(systemName, contextDir) { ...@@ -307,7 +307,7 @@ def build_java(systemName, contextDir) {
sh "cp ${jarFilePath}/*.jar ${contextDir}/app.jar" sh "cp ${jarFilePath}/*.jar ${contextDir}/app.jar"
} }
def build_nodejs( systemName, contextDir) { def build_nodejs( systemName, branchName,contextDir) {
def projectAttr = project_attr(systemName) def projectAttr = project_attr(systemName)
configPath = projectAttr["configPath"] configPath = projectAttr["configPath"]
...@@ -319,7 +319,7 @@ def build_nodejs( systemName, contextDir) { ...@@ -319,7 +319,7 @@ def build_nodejs( systemName, contextDir) {
} }
def build_python( systemName, contextDir) { def build_python( systemName, branchName,contextDir) {
sh "cp -rf ${contextDir}/config.ini server/config/release/config.ini" sh "cp -rf ${contextDir}/config.ini server/config/release/config.ini"
sh "cp -rf ${contextDir}/config.ini server/config/beta/config.ini" sh "cp -rf ${contextDir}/config.ini server/config/beta/config.ini"
sh "tar zcf ${contextDir}/dist.tgz server/" sh "tar zcf ${contextDir}/dist.tgz server/"
...@@ -328,7 +328,7 @@ def build_python( systemName, contextDir) { ...@@ -328,7 +328,7 @@ def build_python( systemName, contextDir) {
} }
def build_luaui( systemName, contextDir) { def build_luaui( systemName, branchName,contextDir) {
def projectAttr = project_attr(systemName) def projectAttr = project_attr(systemName)
configPath = projectAttr["configPath"] configPath = projectAttr["configPath"]
...@@ -524,7 +524,7 @@ def cpb(buildType,systemName,branchName,contextDir){ ...@@ -524,7 +524,7 @@ def cpb(buildType,systemName,branchName,contextDir){
} }
/*build*/ /*build*/
stage('Build'){ stage('Build'){
build(buildType, systemName, contextDir) build(buildType, systemName, branchName,contextDir)
} }
return branchHashCode return branchHashCode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment