From 4a0f2aa5e4f101889c7626155f43dc02c486534a Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 19 Mar 2013 23:43:15 +0000 Subject: [PATCH] added a build settings file, and build script uses it ignored compiled python .pyc files --- .gitignore | 1 + build.py | 26 +++++++++++++++++--------- buildsettings.py | 20 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 buildsettings.py diff --git a/.gitignore b/.gitignore index 82fbbec4..e859f5df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ mobile/IngressIntelTC/bin build +*.pyc diff --git a/build.py b/build.py index e655be84..bce18835 100755 --- a/build.py +++ b/build.py @@ -4,6 +4,7 @@ import glob import time import re import io +import sys import os import shutil @@ -34,12 +35,19 @@ def extractUserScriptMeta(var): utcTime = time.gmtime() buildDate = time.strftime('%Y-%m-%d-%H%M%S',utcTime) +# userscripts have specific specifications for version numbers - the above date format doesn't match dateTimeVersion = time.strftime('%Y%m%d.%H%M%S',utcTime) -# TODO: some kind of settings files for these -resourceUrlBase = 'http://iitc.jonatkins.com/dist' -distUrlBase = 'http://iitc.jonatkins.com/dist' -buildName = 'jonatkins' +# build name from command line +buildName = sys.argv[1] + +# load settings file +from buildsettings import buildSettings +settings = buildSettings[buildName] + +# extract required values from the named settings entry +resourceUrlBase = settings['resourceUrlBase'] +distUrlBase = settings['distUrlBase'] @@ -70,7 +78,7 @@ def saveScriptAndMeta(script,fn,metafn): f.write(meta) -outDir = 'build/jonatkins-dist' +outDir = os.path.join('build', buildName) # create the build output @@ -85,14 +93,14 @@ shutil.copytree('dist', outDir) -# load main.js, parse, and create main total-conversion.user.js +# load main.js, parse, and create main total-conversion-build.user.js main = readfile('main.js') -downloadUrl = distUrlBase + '/total-conversion.user.js' -updateUrl = distUrlBase + '/total-conversion.meta.js' +downloadUrl = distUrlBase + '/total-conversion-build.user.js' +updateUrl = distUrlBase + '/total-conversion-build.meta.js' main = doReplacements(main,downloadUrl=downloadUrl,updateUrl=updateUrl) -saveScriptAndMeta(main, os.path.join(outDir,'total-conversion.user.js'), os.path.join(outDir,'total-conversion.meta.js')) +saveScriptAndMeta(main, os.path.join(outDir,'total-conversion-build.user.js'), os.path.join(outDir,'total-conversion-build.meta.js')) # for each plugin, load, parse, and save output diff --git a/buildsettings.py b/buildsettings.py new file mode 100644 index 00000000..3b37bb29 --- /dev/null +++ b/buildsettings.py @@ -0,0 +1,20 @@ +# settings file for builds. + +buildSettings = { + 'jonatkins': { + 'resourceUrlBase': 'http://iitc.jonatkins.com/dist', + 'distUrlBase': 'http://iitc.jonatkins.com/dist', + }, + + 'jonatkins-dev': { + 'resourceUrlBase': 'http://iitc.jonatkins.com/dev', + 'distUrlBase': 'http://iitc.jonatkins.com/dev', + }, + + + 'local8000': { + 'resourceUrlBase': 'http://0.0.0.0:8000/dist', + 'distUrlBase': 'http://nohost.invalid/nopath', + }, + +}