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

Don't build demos with simple optimizations

Browse Source
This commit is contained in:
Tom Payne
2012-09-26 10:28:03 +02:00
parent 7a6acb670f
commit 0eeae68ee9
3 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -6,4 +6,3 @@
/demos/*/advanced-optimizations.*
/demos/*/build.html
/demos/*/index.html
/demos/*/simple-optimizations.*

45
Makefile
View File

@@ -2,7 +2,7 @@ JSDOC = jsdoc
PHANTOMJS = phantomjs
PLOVR_JAR = bin/plovr-b254c26318c5.jar
SRC = $(shell find exports externs src/ol -name \*.js)
TARGETS = $(shell find demos -name advanced-optimizations.js -o -name simple-optimizations.js)
TARGETS = $(shell find demos -name advanced-optimizations.js)
comma := ,
empty :=
space := $(empty) $(empty)
@@ -43,9 +43,7 @@ demos/proj4js/index.html: demos/proj4js/template.html.in
demos/full-screen: \
demos/full-screen/advanced-optimizations.html \
demos/full-screen/advanced-optimizations.js \
demos/full-screen/index.html \
demos/full-screen/simple-optimizations.html \
demos/full-screen/simple-optimizations.js
demos/full-screen/index.html
demos/full-screen/advanced-optimizations.html: demos/full-screen/template.html.in
sed -e 's|@SRC@|advanced-optimizations.js|' $< > $@
@@ -59,24 +57,12 @@ demos/full-screen/advanced-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
demos/full-screen/index.html: demos/full-screen/template.html.in
sed -e 's|@SRC@|../loader.js?id=demo-full-screen|' $< > $@
demos/full-screen/simple-optimizations.html: demos/full-screen/template.html.in
sed -e 's|@SRC@|simple-optimizations.js|' $< > $@
# FIXME invoke plovr directly, rather than assuming that the server is running
demos/full-screen/simple-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
demos/full-screen/full-screen.json demos/full-screen/full-screen.js
curl 'http://localhost:9810/compile?id=demo-full-screen&mode=SIMPLE' > $@
@echo $@ "uncompressed:" $$(wc -c <$@) bytes
@echo $@ " compressed:" $$(gzip -9 -c <$@ | wc -c) bytes
.PHONY: demos/side-by-side
demos/side-by-side: \
demos/side-by-side/advanced-optimizations.html \
demos/side-by-side/advanced-optimizations.js \
demos/side-by-side/index.html \
demos/side-by-side/simple-optimizations.html \
demos/side-by-side/simple-optimizations.js
demos/side-by-side/index.html
demos/side-by-side/advanced-optimizations.html: demos/side-by-side/template.html.in
sed -e 's|@SRC@|advanced-optimizations.js|' $< > $@
@@ -90,23 +76,11 @@ demos/side-by-side/advanced-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
demos/side-by-side/index.html: demos/side-by-side/template.html.in
sed -e 's|@SRC@|../loader.js?id=demo-side-by-side|' $< > $@
demos/side-by-side/simple-optimizations.html: demos/side-by-side/template.html.in
sed -e 's|@SRC@|simple-optimizations.js|' $< > $@
# FIXME invoke plovr directly, rather than assuming that the server is running
demos/side-by-side/simple-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
demos/side-by-side/side-by-side.json demos/side-by-side/side-by-side.js
curl 'http://localhost:9810/compile?id=demo-side-by-side&mode=SIMPLE' > $@
@echo $@ "uncompressed:" $$(wc -c <$@) bytes
@echo $@ " compressed:" $$(gzip -9 -c <$@ | wc -c) bytes
.PHONY: demos/two-layers
demos/two-layers: \
demos/two-layers/advanced-optimizations.html \
demos/two-layers/advanced-optimizations.js \
demos/two-layers/index.html \
demos/two-layers/simple-optimizations.html \
demos/two-layers/simple-optimizations.js
demos/two-layers/index.html
demos/two-layers/advanced-optimizations.html: demos/two-layers/template.html.in
sed -e 's|@SRC@|advanced-optimizations.js|' $< > $@
@@ -120,16 +94,6 @@ demos/two-layers/advanced-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
demos/two-layers/index.html: demos/two-layers/template.html.in
sed -e 's|@SRC@|../loader.js?id=demo-two-layers|' $< > $@
demos/two-layers/simple-optimizations.html: demos/two-layers/template.html.in
sed -e 's|@SRC@|simple-optimizations.js|' $< > $@
# FIXME invoke plovr directly, rather than assuming that the server is running
demos/two-layers/simple-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
demos/two-layers/two-layers.json demos/two-layers/two-layers.js
curl 'http://localhost:9810/compile?id=demo-two-layers&mode=SIMPLE' > $@
@echo $@ "uncompressed:" $$(wc -c <$@) bytes
@echo $@ " compressed:" $$(gzip -9 -c <$@ | wc -c) bytes
.PHONY: serve
serve: $(PLOVR_JAR) build/ol-all.js
java -jar $(PLOVR_JAR) serve build/ol.json demos/*/*.json
@@ -158,7 +122,6 @@ clean:
rm -f build/ol-all.js
rm -f demos/*/*.html
rm -f demos/*/advanced-optimizations.*
rm -f demos/*/simple-optimizations.*
rm -rf build/apidoc
reallyclean: clean

1
demos/side-by-side/template.html.in
View File

@@ -67,7 +67,6 @@
</tr>
</table>
<p><b>Notes:</b> The two maps share the same center, resolution, rotation and layers. Currently the DOM map does not support rotation.</p>
<p><b>Console tips:</b> If you want to play around with the API in the console, first make sure that you're using the <a href="simple-optimizations.html">simple optimizations version</a> of this demo, then open a console and experiment with the <code>domMap</code>, <code>webglMap</code> and <code>layer</code> variables in the console. The source code is in <a href="side-by-side.js">side-by-side.js</a>.</p>
<script src="@SRC@" type="text/javascript"></script>
</body>
</html>