Changeset 1594
- Timestamp:
- 10/05/06 11:53:41 (2 years ago)
- Files:
-
- trunk/openlayers/build/build.sh (modified) (1 diff)
- trunk/openlayers/build/library.cfg (modified) (1 diff)
- trunk/openlayers/build/lite.cfg (added)
- trunk/openlayers/tools/mergejs.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openlayers/build/build.sh
r1424 r1594 10 10 TOOLS_DIR=../tools 11 11 12 CFG_FILENAME=library.cfg 12 if [ "$1" != "" ]; then 13 CFG_FILENAME="$1.cfg" 14 else 15 CFG_FILENAME=library.cfg 16 fi 13 17 14 18 SRC_DIR=../lib trunk/openlayers/build/library.cfg
r1436 r1594 1 1 [first] 2 Prototype.js3 Rico/Corner.js4 2 OpenLayers/SingleFile.js 5 3 OpenLayers.js 4 OpenLayers/BaseTypes.js 5 Rico/Corner.js 6 6 7 7 [last] 8 9 [include] 8 10 9 11 [exclude] trunk/openlayers/tools/mergejs.py
r1435 r1594 124 124 self.forceFirst = lines[lines.index("[first]") + 1:lines.index("[last]")] 125 125 126 self.forceLast = lines[lines.index("[last]") + 1:lines.index("[ exclude]")]127 126 self.forceLast = lines[lines.index("[last]") + 1:lines.index("[include]")] 127 self.include = lines[lines.index("[include]") + 1:lines.index("[exclude]")] 128 128 self.exclude = lines[lines.index("[exclude]") + 1:] 129 129 … … 151 151 cfg = Config(filename) 152 152 153 print cfg.include 153 154 allFiles = [] 154 155 … … 158 159 if filename.endswith(SUFFIX_JAVASCRIPT) and not filename.startswith("."): 159 160 filepath = os.path.join(root, filename)[len(sourceDirectory)+1:] 160 if (not cfg) or (filepath not in cfg.exclude): 161 if cfg and cfg.include: 162 if filepath in cfg.include or filepath in cfg.forceFirst: 163 allFiles.append(filepath) 164 elif (not cfg) or (filepath not in cfg.exclude): 161 165 allFiles.append(filepath) 162 166
