Refactored mergejs.py to make it possible to call from other Python scripts.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@2097 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

build/build.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append("../tools")
+
+import jsmin, mergejs
+
+sourceDirectory = "../lib"
+configFilename = "library.cfg"
+outputFilename = "OpenLayers.js"
+
+if len(sys.argv) > 1:
+    configFilename = sys.argv[1] + ".cfg"
+if len(sys.argv) > 2:
+    outputFilename = sys.argv[2]
+
+print "Adding license file."
+merged = file("license.txt").read()
+print "Merging libraries."
+merged += mergejs.run(sourceDirectory, None, configFilename)
+print "Compressing."
+minimized = jsmin.jsmin(merged)
+
+print "Writing to %s." % outputFilename
+file(outputFilename, "w").write(minimized)
+
+print "Done."

build/build.sh

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-#
-# Script to build compressed single file version of OpenLayers library
-#
-
-OUTPUT_FILENAME=OpenLayers.js
-TMP_OUTPUT_FILENAME=tmp.${OUTPUT_FILENAME}
-
-TOOLS_DIR=../tools
-
-if [ "$1" != "" ]; then
-  CFG_FILENAME="$1.cfg"
-else
-  CFG_FILENAME=library.cfg
-fi
-
-SRC_DIR=../lib
-
-CMD_MERGE_JS=${TOOLS_DIR}/mergejs.py
-
-CMD_SHRINKSAFE=${TOOLS_DIR}/shrinksafe.py
-CMD_JSMIN=${TOOLS_DIR}/jsmin.py
-
-LICENSE_HEADER_FILENAME=license.txt
-
-
-## Generate "fat" single file library version
-${CMD_MERGE_JS} -c ${CFG_FILENAME} ${TMP_OUTPUT_FILENAME} ${SRC_DIR}
-
-
-## Compress ("shrink") the single file library version
-
-echo
-echo Shrinking and post-processing...
-# (We also append the license header here.)
-cat ${LICENSE_HEADER_FILENAME} > ${OUTPUT_FILENAME}
-${CMD_JSMIN} <${TMP_OUTPUT_FILENAME} >> ${OUTPUT_FILENAME}
-
-echo Cleaning up...
-rm $TMP_OUTPUT_FILENAME
-
-echo
-echo Done.