X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=scripts%2Frelease.py;h=3b5c9ea5ae99cb3e017185d897ff457737019e47;hp=a567d8539bc2d455cedc74d7f4ee63812113992a;hb=e0424f1a73703cc35801f8e9cd24d3a4340eca94;hpb=19ff9487d2670d5043eed539b7358b8d6f86d1fc diff --git a/scripts/release.py b/scripts/release.py index a567d85..3b5c9ea 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -30,7 +30,10 @@ def updateversion(): def compress(path): tmpout = tempfile.TemporaryFile() - subprocess.Popen(['yui-compressor', path], stdout=tmpout).communicate() + try: + subprocess.Popen(['yui-compressor', path], stdout=tmpout).communicate() + except OSError: + subprocess.Popen(['yuicompressor', path], stdout=tmpout).communicate() tmpout.seek(0) with open(path, 'w') as output: output.write(tmpout.read()) @@ -40,7 +43,17 @@ def genscripts(): # copy scripts OpenLayers.js for path in glob.glob('public/js/*.js'): - shutil.copy(path, tmpdir) + if os.path.islink(path): + shutil.copy(path, tmpdir) + else: + # remove "use strict"; directive + with open(path) as inp: + dest = pathjoin(tmpdir, os.path.basename(path)) + with open(dest, "w") as out: + for line in inp: + sline = line.strip() + if sline != '"use strict"' and sline != '"use strict";': + out.write(line) # build OpenLayers.js subprocess.call(['python', 'buildUncompressed.py', @@ -82,8 +95,12 @@ def install(source, target): shutil.copy(source, buildtarget) else: + hascontent = False for item in glob.glob(source): + hascontent = True install(item, target) + if not hascontent: # not a directory or a file or a list of files + raise Exception(("%s does not exist" % source)) def main(): if os.path.isdir(__BUILD__):