diff --git a/scripts/pub.py b/scripts/pub.py index 58d8696..9eccc85 100644 --- a/scripts/pub.py +++ b/scripts/pub.py @@ -1,148 +1,142 @@ import sys import os -# friend_rankserver_z2_test -# friend_imserver_z2_test -# friend_masterserver_z2_test -# friend_wsproxy_z2_test -# statserver_z2_test -# mail_z2_test -# loginserver_z2_test -# cloud_z2_test -# gamelog_z2_test -# service_z2_test -# web3service_z2_test -# game2006_wsproxy_z2_test -# game2006_masterverver_z2_test -# game2006_gameserver_z2_test +# friend_rankserver_z$id_test +# friend_imserver_z$id_test +# friend_masterserver_z$id_test +# friend_wsproxy_z$id_test +# statserver_z$id_test +# mail_z$id_test +# loginserver_z$id_test +# cloud_z$id_test +# gamelog_z$id_test +# service_z$id_test +# web3service_z$id_test +# game2006_wsproxy_z$id_test +# game2006_masterverver_z$id_test +# game2006_gameserver_z$id_test projects = [ { 'name': 'friend_rankserver', - 'git': 'git@git.kingsome.cn:publish/friend_rankserver_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/friend_rankserver_z$id_test.git', - 'conf': 'prod/friend/friend_rankserver_z2_test', + 'git': 'friend_rankserver_z$id_test', + 'conf': 'prod/friend/friend_rankserver_z$id_test', 'targetConf': 'prod/friend/friend_rankserver_z$id_test', - 'res': 'prod/friend/friend_rankserver_z2_test', + 'res': 'prod/friend/friend_rankserver_z$id_test', 'targetRes': 'prod/friend/friend_rankserver_z$id_test', }, { 'name': 'friend_imserver', - 'git': 'git@git.kingsome.cn:publish/friend_imserver_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/friend_imserver_z$id_test.git', - 'conf': 'prod/friend/friend_imserver_z2_test', + 'git': 'friend_imserver_z$id_test', + 'conf': 'prod/friend/friend_imserver_z$id_test', 'targetConf': 'prod/friend/friend_imserver_z$id_test', - 'res': 'prod/friend/friend_imserver_z2_test', + 'res': 'prod/friend/friend_imserver_z$id_test', 'targetRes': 'prod/friend/friend_imserver_z$id_test', }, { 'name': 'friend_masterserver', - 'git': 'git@git.kingsome.cn:publish/friend_masterserver_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/friend_masterserver_z$id_test.git', - 'conf': 'prod/friend/friend_masterserver_z2_test', + 'git': 'friend_masterserver_z$id_test', + 'conf': 'prod/friend/friend_masterserver_z$id_test', 'targetConf': 'prod/friend/friend_masterserver_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'friend_wsproxy', - 'git': 'git@git.kingsome.cn:publish/friend_wsproxy_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/friend_wsproxy_z$id_test.git', - 'conf': 'prod/friend/friend_wsproxy_z2_test', + 'git': 'friend_wsproxy_z$id_test', + 'conf': 'prod/friend/friend_wsproxy_z$id_test', 'targetConf': 'prod/friend/friend_wsproxy_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'mail', - 'git': 'git@git.kingsome.cn:publish/mail_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/mail_z$id_test.git', - 'conf': 'prod/global/mail_z2_test', + 'git': 'mail_z$id_test', + 'conf': 'prod/global/mail_z$id_test', 'targetConf': 'prod/global/mail_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'gamelog', - 'git': 'git@git.kingsome.cn:publish/gamelog_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/gamelog_z$id_test.git', - 'conf': 'prod/global/gamelog_z2_test', + 'git': 'gamelog_z$id_test', + 'conf': 'prod/global/gamelog_z$id_test', 'targetConf': 'prod/global/gamelog_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'loginserver', - 'git': 'git@git.kingsome.cn:publish/loginserver_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/loginserver_z$id_test.git', - 'conf': 'prod/global/loginserver_z2_test', + 'git': 'loginserver_z$id_test', + 'conf': 'prod/global/loginserver_z$id_test', 'targetConf': 'prod/global/loginserver_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'cloud', - 'git': 'git@git.kingsome.cn:publish/cloud_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/cloud_z$id_test.git', - 'conf': 'prod/global/cloud_z2_test', + 'git': 'cloud_z$id_test', + 'conf': 'prod/global/cloud_z$id_test', 'targetConf': 'prod/global/cloud_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'service', - 'git': 'git@git.kingsome.cn:publish/service_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/service_z$id_test.git', - 'conf': 'prod/global/service_z2_test', + 'git': 'service_z$id_test', + 'conf': 'prod/global/service_z$id_test', 'targetConf': 'prod/global/service_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'web3service', - 'git': 'git@git.kingsome.cn:publish/web3service_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/web3service_z$id_test.git', - 'conf': 'prod/global/web3service_z2_test', + 'git': 'web3service_z$id_test', + 'conf': 'prod/global/web3service_z$id_test', 'targetConf': 'prod/global/web3service_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'httpproxy', - 'git': 'git@git.kingsome.cn:publish/httpproxy_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/httpproxy_z$id_test.git', - 'conf': 'prod/global/httpproxy_z2_test', + 'git': 'httpproxy_z$id_test', + 'conf': 'prod/global/httpproxy_z$id_test', 'targetConf': 'prod/global/httpproxy_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'game2006_wsproxy', - 'git': 'git@git.kingsome.cn:publish/game2006_wsproxy_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/game2006_wsproxy_z$id_test.git', - 'conf': 'prod/game2006/wsproxy_z2_test', + 'git': 'game2006_wsproxy_z$id_test', + 'conf': 'prod/game2006/wsproxy_z$id_test', 'targetConf': 'prod/game2006/wsproxy_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'game2006_masterserver', - 'git': 'git@git.kingsome.cn:publish/game2006_masterserver_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/game2006_masterserver_z$id_test.git', - 'conf': 'prod/game2006/masterserver_z2_test', + 'git': 'game2006_masterserver_z$id_test', + 'conf': 'prod/game2006/masterserver_z$id_test', 'targetConf': 'prod/game2006/masterserver_z$id_test', 'res': '', 'targetRes': '', }, { 'name': 'game2006_gameserver', - 'git': 'git@git.kingsome.cn:publish/game2006_gameserver_z2_test.git', - 'targetGit': 'git@git.kingsome.cn:publish/game2006_gameserver_z$id_test.git', - 'conf': 'prod/game2006/gameserver_z2_test', + 'git': 'game2006_gameserver_z$id_test', + 'conf': 'prod/game2006/gameserver_z$id_test', 'targetConf': 'prod/game2006/gameserver_z$id_test', - 'res': 'prod/game2006/gameserver_z2_test', + 'res': 'prod/game2006/gameserver_z$id_test', 'targetRes': 'prod/game2006/gameserver_z$id_test', }, + { + 'name': 'game2006api', + 'git': 'game2006api_z$id_test', + 'conf': 'prod/game2006/game2006api_z$id_test', + 'targetConf': 'prod/game2006/game2006api_z$id_test', + 'res': 'prod/game2006/game2006api_z$id_test', + 'targetRes': 'prod/game2006/game2006api_z$id_test', + }, ] def pubOne(srcId, targetId): @@ -151,16 +145,23 @@ def pubOne(srcId, targetId): gitDir = '~/opensource/publish' + '/z' + targetId os.system('mkdir -p ' + gitDir) for proj in projects: - #cmd = 'cd ' + gitDir + ' && git clone ' + proj['git'] + srcProjName = proj['git'].replace('$id', srcId) + targetProjName = proj['git'].replace('$id', targetId) + cmd = 'cd ' + gitDir + ' && git clone git@git.kingsome.cn:publish/' + srcProjName + '.git\n' + cmd += 'cd ' + gitDir + '/' + srcProjName + ' && git remote set-url origin git@git.kingsome.cn:publish/' + targetProjName+ '.git\n' + cmd += 'cd ' + gitDir + '/' + srcProjName + ' && git push\n' + print(cmd) #os.system(cmd) if proj['conf']: + srcConf = proj['conf'].replace('$id', srcId) targetConf = proj['targetConf'].replace('$id', targetId) - cmd = 'cp -r ' + confDir + proj['conf'] + ' ' + confDir + targetConf + cmd = 'cp -r ' + confDir + srcConf + ' ' + confDir + targetConf print(cmd) #os.system(cmd) if proj['res']: + srcRes = proj['res'].replace('$id', srcId) targetRes = proj['targetRes'].replace('$id', targetId) - cmd = 'cp -r ' + resDir + proj['res'] + ' ' + resDir + targetRes + cmd = 'cp -r ' + resDir + srcRes + ' ' + resDir + targetRes print(cmd) #os.system(cmd)