From 0eeae68ee9998b561cb590bf6de8d90980c4b537 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Wed, 26 Sep 2012 10:28:03 +0200 Subject: [PATCH] Don't build demos with simple optimizations --- .gitignore | 1 - Makefile | 45 +++-------------------------- demos/side-by-side/template.html.in | 1 - 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index b5d1c0352d..5de532838f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ /demos/*/advanced-optimizations.* /demos/*/build.html /demos/*/index.html -/demos/*/simple-optimizations.* diff --git a/Makefile b/Makefile index 597731c5bb..f66c38b9c7 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/demos/side-by-side/template.html.in b/demos/side-by-side/template.html.in index 161dca194d..9d9a167928 100644 --- a/demos/side-by-side/template.html.in +++ b/demos/side-by-side/template.html.in @@ -67,7 +67,6 @@

Notes: The two maps share the same center, resolution, rotation and layers. Currently the DOM map does not support rotation.

-

Console tips: If you want to play around with the API in the console, first make sure that you're using the simple optimizations version of this demo, then open a console and experiment with the domMap, webglMap and layer variables in the console. The source code is in side-by-side.js.