Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6727 from shujunqiao/pull-build-trigger 

[ci skip], modify v3!=v2 about config.json.
This commit is contained in:
James Chen 2014-05-14 11:23:59 +08:00
parent 7bc0eea7f0 1341970b40
commit 77d330da77
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/jenkins-scripts/pull-request-builder.py
View File

@ -29,11 +29,13 @@ def set_description(desc, url):
except:
traceback.print_exc()
def check_current_3rd_libs():
def check_current_3rd_libs(branch):
#get current_libs config
backup_files = range(2)
current_files = range(2)
config_file_paths = ['external/config.json','templates/lua-template-runtime/runtime/config.json']
if (branch == 'v2'):
config_file_paths = ['external/config.json']
for i, config_file_path in enumerate(config_file_paths):
if not os.path.isfile(config_file_path):
raise Exception("Could not find 'external/config.json'")
@ -133,7 +135,7 @@ def main():
return(2)
#copy check_current_3rd_libs
check_current_3rd_libs()
check_current_3rd_libs(branch)
# Generate binding glue codes
if(branch == 'v3'):