OpenLayers OpenLayers

Changeset 1435

Show
Ignore:
Timestamp:
09/12/06 19:44:10 (2 years ago)
Author:
crschmidt
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/tools/mergejs.py

    r1434 r1435  
    122122                 if line != "\n"] # Skip blank lines 
    123123 
    124         self.forceFirst = \ 
    125                     lines[lines.index("[first]") + 1:lines.index("[last]")] 
    126  
    127         self.forceLast = \ 
    128                       lines[lines.index("[last]") + 1:lines.index("[exclude]")] 
     124        self.forceFirst = lines[lines.index("[first]") + 1:lines.index("[last]")] 
     125 
     126        self.forceLast = lines[lines.index("[last]") + 1:lines.index("[exclude]")] 
    129127         
    130128        self.exclude =  lines[lines.index("[exclude]") + 1:] 
    …… 
    164162 
    165163    ## Header inserted at the start of each file in the output 
    166     HEADER = "/* " + "=" * 70 + "\n"\ 
    167              "    %s\n" +\ 
    168              "   " + "=" * 70 + " */\n\n" 
     164    HEADER = "/* " + "=" * 70 + "    %s\n" + "   " + "=" * 70 + " */\n\n" 
    169165 
    170166    files = {} 
    …… 
    201197    if cfg: 
    202198        print "Re-ordering files...\n" 
    203         order = cfg.forceFirst + \ 
    204                     [item 
     199        order = cfg.forceFirst + [item 
    205200                     for item in order 
    206201                     if ((item not in cfg.forceFirst) and 
    207                          (item not in cfg.forceLast))] + \ 
    208                 cfg.forceLast 
     202                         (item not in cfg.forceLast))] + cfg.forceLast 
    209203 
    210204    ## Double check all dependencies have been met