ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Let's try to fix this again... still having problems with Windows building.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1435 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2006-09-12 23:44:10 +00:00
parent 9d0c94d915
commit 84a677f910
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/mergejs.py
View File

@@ -121,11 +121,9 @@ class Config:
for line in open(filename) for line in open(filename)
if line != "\n"] # Skip blank lines if line != "\n"] # Skip blank lines
self.forceFirst = \ self.forceFirst = lines[lines.index("[first]") + 1:lines.index("[last]")]
lines[lines.index("[first]") + 1:lines.index("[last]")]
self.forceLast = \ self.forceLast = lines[lines.index("[last]") + 1:lines.index("[exclude]")]
lines[lines.index("[last]") + 1:lines.index("[exclude]")]
self.exclude = lines[lines.index("[exclude]") + 1:] self.exclude = lines[lines.index("[exclude]") + 1:]
@@ -163,9 +161,7 @@ if __name__ == "__main__":
allFiles.append(filepath) allFiles.append(filepath)
## Header inserted at the start of each file in the output ## Header inserted at the start of each file in the output
HEADER = "/* " + "=" * 70 + "\n"\ HEADER = "/* " + "=" * 70 + " %s\n" + " " + "=" * 70 + " */\n\n"
" %s\n" +\
" " + "=" * 70 + " */\n\n"
files = {} files = {}
@@ -200,12 +196,10 @@ if __name__ == "__main__":
## Move forced first and last files to the required position ## Move forced first and last files to the required position
if cfg: if cfg:
print "Re-ordering files...\n" print "Re-ordering files...\n"
order = cfg.forceFirst + \ order = cfg.forceFirst + [item
[item
for item in order for item in order
if ((item not in cfg.forceFirst) and if ((item not in cfg.forceFirst) and
(item not in cfg.forceLast))] + \ (item not in cfg.forceLast))] + cfg.forceLast
cfg.forceLast
## Double check all dependencies have been met ## Double check all dependencies have been met
for fp in order: for fp in order: