phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build.py updates taken from new dev branch

Browse Source
This commit is contained in:
Jon Atkins 2013-08-29 04:57:51 +01:00
parent 8d08e5bc29
commit 0e0fdfa202
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.py
View File

@ -59,7 +59,7 @@ dateTimeVersion = time.strftime('%Y%m%d.',utcTime) + time.strftime('%H%M%S',utcT
resourceUrlBase = settings.get('resourceUrlBase') resourceUrlBase = settings.get('resourceUrlBase')
distUrlBase = settings.get('distUrlBase') distUrlBase = settings.get('distUrlBase')
buildMobile = settings.get('buildMobile') buildMobile = settings.get('buildMobile')
antOptions = settings.get('antOptions','')
# plugin wrapper code snippets. handled as macros, to ensure that # plugin wrapper code snippets. handled as macros, to ensure that
# 1. indentation caused by the "function wrapper()" doesn't apply to the plugin code body # 1. indentation caused by the "function wrapper()" doesn't apply to the plugin code body
@ -132,7 +132,7 @@ def loaderImage(var):
return 'data:image/png;base64,{0}'.format(base64.encodestring(open(fn, 'rb').read()).decode('utf8').replace('\n', '')) return 'data:image/png;base64,{0}'.format(base64.encodestring(open(fn, 'rb').read()).decode('utf8').replace('\n', ''))
def loadCode(ignore): def loadCode(ignore):
return '\n\n'.join(map(readfile, glob.glob('code/*.js'))) return '\n\n'.join(map(readfile, sorted(glob.glob('code/*.js'))))
def extractUserScriptMeta(var): def extractUserScriptMeta(var):
@ -263,7 +263,7 @@ if buildMobile:
if buildMobile != 'copyonly': if buildMobile != 'copyonly':
# now launch 'ant' to build the mobile project # now launch 'ant' to build the mobile project
retcode = os.system("ant -buildfile mobile/build.xml %s" % buildMobile) retcode = os.system("ant %s -buildfile mobile/build.xml %s" % (antOptions, buildMobile))
if retcode != 0: if retcode != 0:
print ("Error: mobile app failed to build. ant returned %d" % retcode) print ("Error: mobile app failed to build. ant returned %d" % retcode)