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

Consistent nomenclature

Browse Source
This commit is contained in:
Tom Payne
2012-09-29 14:42:12 +02:00
parent 1a5375fa51
commit c7c93ce099
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -4
View File
@@ -33,17 +33,17 @@ build-all: build/ol-all.js
build/ol-all.js: $(PLOVR_JAR) $(SRC) $(INTERNAL_SRC) base.json build/ol-all.json build/ol-all.js: $(PLOVR_JAR) $(SRC) $(INTERNAL_SRC) base.json build/ol-all.json
java -jar $(PLOVR_JAR) build build/ol-all.json >$@ || ( rm -f $@ ; false ) java -jar $(PLOVR_JAR) build build/ol-all.json >$@ || ( rm -f $@ ; false )
build/src/external/externs/types.js: bin/generate-src src/ol/literals.txt build/src/external/externs/types.js: bin/generate-types src/ol/types.txt
mkdir -p $(dir $@) mkdir -p $(dir $@)
bin/generate-src --externs src/ol/literals.txt >$@ bin/generate-types --externs src/ol/types.txt >$@
build/src/internal/src/requireall.js: bin/generate-requireall $(SRC) build/src/internal/src/requireall.js: bin/generate-requireall $(SRC)
mkdir -p $(dir $@) mkdir -p $(dir $@)
bin/generate-requireall --require=goog.dom src/ol >$@ bin/generate-requireall --require=goog.dom src/ol >$@
build/src/internal/src/types.js: bin/generate-src src/ol/literals.txt build/src/internal/src/types.js: bin/generate-types src/ol/types.txt
mkdir -p $(dir $@) mkdir -p $(dir $@)
bin/generate-src --typedef src/ol/literals.txt >$@ bin/generate-types --typedef src/ol/types.txt >$@
.PHONY: build-examples .PHONY: build-examples
build-examples: examples $(subst .html,.combined.js,$(EXAMPLES)) build-examples: examples $(subst .html,.combined.js,$(EXAMPLES))
bin/generate-src → bin/generate-types
+1 -1
View File
@@ -60,7 +60,7 @@ def main(argv):
line = line.strip() line = line.strip()
if not line: if not line:
continue continue
m = re.match('@externtype\s*(?P<name>\S+)\Z', line) m = re.match('@exportType\s*(?P<name>\S+)\Z', line)
if m: if m:
type = Type(m.group('name')) type = Type(m.group('name'))
types.append(type) types.append(type)
src/ol/literals.txt → src/ol/types.txt
+1 -1
View File
@@ -1,4 +1,4 @@
@externtype olx.MapOptions @exportType olx.MapOptions
center: ol.Coordinate|undefined center: ol.Coordinate|undefined
controls: ol.Collection|undefined controls: ol.Collection|undefined
doubleClickZoom: boolean|undefined doubleClickZoom: boolean|undefined