patches/openlayers/0005-allow-running-build.py-from-any-directory.patch

   1 From 9c222d97bff8c4546b3a4947cc9bb79419307c5e Mon Sep 17 00:00:00 2001
   2 From: arno <arno@renevier.net>
   3 Date: Mon, 21 Mar 2011 21:12:42 +0100
   4 Subject: [PATCH 5/5] allow running build.py from any directory
   5
   6 ---
   7  openlayers/build/build.py             |   17 +++++++++++------
   8  openlayers/build/buildUncompressed.py |   16 ++++++++++------
   9  2 files changed, 21 insertions(+), 12 deletions(-)
  10
  11 diff --git a/openlayers/build/build.py b/openlayers/build/build.py
  12 index 9ca6a1c..4f08216 100755
  13 --- a/openlayers/build/build.py
  14 +++ b/openlayers/build/build.py
  15 @@ -1,7 +1,12 @@
  16  #!/usr/bin/env python
  17
  18 -import sys
  19 -sys.path.append("../tools")
  20 +import sys, os.path
  21 +
  22 +scriptdir = os.path.dirname(sys.argv[0])
  23 +normpath = lambda p: os.path.normpath(os.path.join(scriptdir, p))
  24 +
  25 +sys.path.append(normpath("../tools"))
  26 +
  27  import mergejs
  28  import optparse
  29
  30 @@ -33,9 +38,9 @@ def build(config_file = None, output_file = None, options = None):
  31      if options.compressor and options.compressor in have_compressor:
  32          use_compressor = options.compressor
  33
  34 -    sourceDirectory = "../lib"
  35 -    configFilename = "full.cfg"
  36 -    outputFilename = "OpenLayers.js"
  37 +    sourceDirectory = normpath("../lib")
  38 +    configFilename = normpath("full.cfg")
  39 +    outputFilename = normpath("OpenLayers.js")
  40
  41      if config_file:
  42          configFilename = config_file
  43 @@ -61,7 +66,7 @@ def build(config_file = None, output_file = None, options = None):
  44      else: # fallback
  45          minimized = merged
  46      print "Adding license file."
  47 -    minimized = file("license.txt").read() + minimized
  48 +    minimized = file(normpath("license.txt")).read() + minimized
  49
  50      print "Writing to %s." % outputFilename
  51      file(outputFilename, "w").write(minimized)
  52 diff --git a/openlayers/build/buildUncompressed.py b/openlayers/build/buildUncompressed.py
  53 index fd38aa7..8d59e95 100755
  54 --- a/openlayers/build/buildUncompressed.py
  55 +++ b/openlayers/build/buildUncompressed.py
  56 @@ -1,13 +1,17 @@
  57  #!/usr/bin/env python
  58
  59 -import sys
  60 -sys.path.append("../tools")
  61 +import sys, os.path
  62 +
  63 +scriptdir = os.path.dirname(sys.argv[0])
  64 +normpath = lambda p: os.path.normpath(os.path.join(scriptdir, p))
  65 +
  66 +sys.path.append(normpath("../tools"))
  67
  68  import jsmin, mergejs
  69
  70 -sourceDirectory = "../lib"
  71 -configFilename = "full.cfg"
  72 -outputFilename = "OpenLayers.js"
  73 +sourceDirectory = normpath("../lib")
  74 +configFilename = normpath("full.cfg")
  75 +outputFilename = normpath("OpenLayers.js")
  76
  77  if len(sys.argv) > 1:
  78      configFilename = sys.argv[1] + ".cfg"
  79 @@ -17,7 +21,7 @@ if len(sys.argv) > 2:
  80  print "Merging libraries."
  81  merged = mergejs.run(sourceDirectory, None, configFilename)
  82  print "Adding license file."
  83 -merged = file("license.txt").read() + merged
  84 +merged = file(normpath("license.txt")).read() + merged
  85
  86  print "Writing to %s." % outputFilename
  87  file(outputFilename, "w").write(merged)
  88 --
  89 1.7.4.1
  90