Changeset 2097

Timestamp:

12/22/06 14:52:56 (2 years ago)

Author:

sderle

Message:

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

Files:

• trunk/openlayers/build/build.py (added)
• trunk/openlayers/build/build.sh (deleted)
• trunk/openlayers/tools/mergejs.py (modified) (2 diffs)

trunk/openlayers/tools/mergejs.py

@@ -127 +127 @@
-        self.include =  lines[lines.index("[include]") + 1:lines.index("[exclude]")]
-        self.exclude =  lines[lines.index("[exclude]") + 1:]
+
+def run (sourceDirectory, outputFilename = None, configFile = None):
+    cfg = None
+    if configFile:
+        cfg = Config(configFile)
+
+    print cfg.include
+    allFiles = []
+
+    ## Find all the Javascript source files
+    for root, dirs, files in os.walk(sourceDirectory):
+        for filename in files:
+            if filename.endswith(SUFFIX_JAVASCRIPT) and not filename.startswith("."):
+                filepath = os.path.join(root, filename)[len(sourceDirectory)+1:]
+                if cfg and cfg.include:
+                    if filepath in cfg.include or filepath in cfg.forceFirst:
+                        allFiles.append(filepath)
+                elif (not cfg) or (filepath not in cfg.exclude):
+                    allFiles.append(filepath)
+
+    ## Header inserted at the start of each file in the output
+    HEADER = "/* " + "=" * 70 + "    %s\n" + "   " + "=" * 70 + " */\n\n"
+
+    files = {}
+
+    order = [] # List of filepaths to output, in a dependency satisfying order 
+
+    ## Import file source code
+    ## TODO: Do import when we walk the directories above?
+    for filepath in allFiles:
+        print "Importing: %s" % filepath
+        fullpath = os.path.join(sourceDirectory, filepath)
+        content = open(fullpath, "U").read() # TODO: Ensure end of line @ EOF?
+        files[filepath] = SourceFile(filepath, content) # TODO: Chop path?
+
+    ## Resolve the dependencies
+    print "\nResolving dependencies...\n"
+
+    from toposort import toposort
+
+    nodes = []
+    routes = []
+
+    for filepath, info in files.items():
+        nodes.append(filepath)
+        for neededFilePath in info.requires:
+            routes.append((neededFilePath, filepath))
+
+    for dependencyLevel in toposort(nodes, routes):
+        for filepath in dependencyLevel:
+            order.append(filepath)
+
+
+    ## Move forced first and last files to the required position
+    if cfg:
+        print "Re-ordering files...\n"
+        order = cfg.forceFirst + [item
+                     for item in order
+                     if ((item not in cfg.forceFirst) and
+                         (item not in cfg.forceLast))] + cfg.forceLast
+
+    ## Double check all dependencies have been met
+    for fp in order:
+        if max([order.index(rfp) for rfp in files[fp].requires] +
+               [order.index(fp)]) != order.index(fp):
+            print "Inconsistent!"
+            raise SystemExit
+
+
+    ## Output the files in the determined order
+    result = []
+
+    for fp in order:
+        f = files[fp]
+        print "Exporting: ", f.filepath
+        result.append(HEADER % f.filepath)
+        source = f.source
+        result.append(source)
+        if not source.endswith("\n"):
+            result.append("\n")
+
+    print "\nTotal files merged: %d " % len(allFiles)
+
+    if outputFilename:
+        print "\nGenerating: %s" % (outputFilename)
+        open(outputFilename, "w").write("".join(result))
+    return "".join(result)
-
-if __name__ == "__main__":
@@ -144 +231 @@
-            raise SystemExit
-
-fg
+onfigFile
-    if options and options[0][0] == "-c":
-filenam
+configFil
-        print "Parsing configuration file: %s" % filename
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+