Merged in r1747 from source:/sandbox/tschaub/wc/tools/mergejs.py.
git-svn-id: http://svn.openlayers.org/trunk/openlayers@2098 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -140,6 +140,7 @@ def run (sourceDirectory, outputFilename = None, configFile = None):
|
|||||||
for filename in files:
|
for filename in files:
|
||||||
if filename.endswith(SUFFIX_JAVASCRIPT) and not filename.startswith("."):
|
if filename.endswith(SUFFIX_JAVASCRIPT) and not filename.startswith("."):
|
||||||
filepath = os.path.join(root, filename)[len(sourceDirectory)+1:]
|
filepath = os.path.join(root, filename)[len(sourceDirectory)+1:]
|
||||||
|
filepath = filepath.replace("\\", "/")
|
||||||
if cfg and cfg.include:
|
if cfg and cfg.include:
|
||||||
if filepath in cfg.include or filepath in cfg.forceFirst:
|
if filepath in cfg.include or filepath in cfg.forceFirst:
|
||||||
allFiles.append(filepath)
|
allFiles.append(filepath)
|
||||||
|
|||||||
Reference in New Issue
Block a user