build improvements

- add optional localbuildsettings.py
- remove the 'jonatkins' and 'jonatkins-dev' from buildsettings.py - some devs were using them and it'll give them unexpected update behaviour
- add a 'local' build - uses the public release for external resources (rather than a local web server as for local8000), but no distUrlBase. perfect for code-only changes
- distUrlBase can now be None - no more wacky invalid URLs

(the resourceUrlBase will become redundant once all resources are embedded, but that's still pending)
This commit is contained in:
Jon Atkins
2013-03-21 03:36:12 +00:00
parent 8e7681427e
commit 06778b2a6a
3 changed files with 32 additions and 14 deletions

View File

@ -12,6 +12,13 @@ import shutil
# load settings file
from buildsettings import buildSettings
# load option local settings file
try:
from localbuildsettings import buildSettings as localBuildSettings
buildSettings.update(localBuildSettings)
except ImportError:
pass
# build name from command line
if len(sys.argv) != 2: # argv[0] = program, argv[1] = buildname, len=2
@ -103,8 +110,8 @@ shutil.copytree('dist', outDir)
# load main.js, parse, and create main total-conversion-build.user.js
main = readfile('main.js')
downloadUrl = distUrlBase + '/total-conversion-build.user.js'
updateUrl = distUrlBase + '/total-conversion-build.meta.js'
downloadUrl = distUrlBase and distUrlBase + '/total-conversion-build.user.js' or 'none'
updateUrl = distUrlBase and distUrlBase + '/total-conversion-build.meta.js' or 'none'
main = doReplacements(main,downloadUrl=downloadUrl,updateUrl=updateUrl)
saveScriptAndMeta(main, os.path.join(outDir,'total-conversion-build.user.js'), os.path.join(outDir,'total-conversion-build.meta.js'))
@ -116,8 +123,8 @@ os.mkdir(os.path.join(outDir,'plugins'))
for fn in glob.glob("plugins/*.user.js"):
script = readfile(fn)
downloadUrl = distUrlBase + '/' + fn.replace("\\","/")
updateUrl = downloadUrl.replace('.user.js', '.meta.js')
downloadUrl = distUrlBase and distUrlBase + '/' + fn.replace("\\","/") or 'none'
updateUrl = distUrlBase and downloadUrl.replace('.user.js', '.meta.js') or 'none'
script = doReplacements(script, downloadUrl=downloadUrl, updateUrl=updateUrl)
metafn = fn.replace('.user.js', '.meta.js')