Changeset 2098

Timestamp:

12/22/06 15:04:48 (2 years ago)

Author:

sderle

Message:

Merged in r1747 from source:/sandbox/tschaub/wc/tools/mergejs.py.

Files:

• trunk/openlayers/tools/mergejs.py (modified) (1 diff)

trunk/openlayers/tools/mergejs.py

@@ -141 +141 @@
-            if filename.endswith(SUFFIX_JAVASCRIPT) and not filename.startswith("."):
-                filepath = os.path.join(root, filename)[len(sourceDirectory)+1:]
+                filepath = filepath.replace("\\", "/")
-                if cfg and cfg.include:
-                    if filepath in cfg.include or filepath in cfg.forceFirst: