Skip to content

Commit

Permalink
remove all the javascript stuff, now that that's been split into a se…
Browse files Browse the repository at this point in the history
…parate directory
  • Loading branch information
EffinMaggie committed Jan 8, 2017
1 parent 9e0743d commit 02eb0e5
Show file tree
Hide file tree
Showing 15 changed files with 1 addition and 1,147 deletions.
16 changes: 0 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,18 @@
*.svg
topologic
!include/topologic
topologic.js
topologic-glut
topologic-json.js
!topologic-json.svg
documentation/html
documentation/xml
topologic-glut.html
topologic-sdl.js
topologic-sdl.html
!topologic-icon.svg
*.xcuser*
*.xccheckout
documentation/*.tag
*.user
build-*
documentation.xml
topologic-web.js
topologic-web.js.xml
topologic-web.html
.downloads
topologic-web.css
topologic-web.css.xml
*.gz
src/chrome/topologic.html
src/chrome/jquery*.js
chrome-app.zip
dependencies.mk
topologic.tag
doxyfile
*.db
*.out
48 changes: 1 addition & 47 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,60 +1,14 @@
-include ef.gy/base.mk include/ef.gy/base.mk

NAME:=topologic
VERSION:=8
VERSION:=11

LIBRARIES:=libxml-2.0
FRAMEWORKS:=

JQUERY:=https://code.jquery.com/jquery-2.1.1.js
JQUERYMOBILE:=https://code.jquery.com/mobile/1.4.4/jquery.mobile-1.4.4.js
JQUERYMOBILECSS:=https://code.jquery.com/mobile/1.4.4/jquery.mobile-1.4.4.min.css

ifeq ($(UNAME),Darwin)
PCCFLAGS:=-I/usr/include/libxml2
PCLDFLAGS:=-lxml2 $(addprefix -framework ,$(FRAMEWORKS))
endif
CXXFLAGS:=$(CFLAGS) -fno-exceptions
EMCFLAGS:=--pre-js src/web/setup.js --post-js src/web/glue.js -O3 --llvm-lto 3 -fno-exceptions --memory-init-file 0 -s NO_FILESYSTEM=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s OUTLINING_LIMIT=20480 -DNOVAO -DWEBGL -s ASSERTIONS=0 -s NO_EXIT_RUNTIME=1 -s ALLOW_MEMORY_GROWTH=1 -s DISABLE_EXCEPTION_CATCHING=1 -s PRECISE_I64_MATH=0 -s USE_CLOSURE_COMPILER=1
EMXXFLAGS:=$(EMCFLAGS)

JSFUNCTIONS:=['_main','_interpretDrag','_setActiveDimension','_forceRedraw','_setFlameColouring','_resetColourMap','_setViewportSize','_getJSON','_getSVG','_getArgs','_parseJSON','_parseArgs','_getModels','_initialiseGL']

BINARIES:=$(filter-out %-sdl,$(basename $(notdir $(wildcard src/*.cpp)))) $(addprefix test-case-,$(notdir $(wildcard src/test-case/*.cpp)))

%.html: src/%.cpp include/*/*.h
$(EMXX) -std=c++0x -Iinclude/ -D NOLIBRARIES $(EMXXFLAGS) $< $(LDFLAGS) -o $@

$(DOWNLOADS)/jquery.js: $(DOWNLOADS)/.volatile
$(CURL) '$(JQUERY)' -o $@

$(DOWNLOADS)/jquery.mobile.js: $(DOWNLOADS)/.volatile
$(CURL) '$(JQUERYMOBILE)' -o $@

$(DOWNLOADS)/jquery.mobile.css: $(DOWNLOADS)/.volatile
$(CURL) '$(JQUERYMOBILECSS)' -o $@

topologic-web.css: $(DOWNLOADS)/jquery.mobile.css src/web/topologic.css
cat $^ | $(CSSMIN) > $@

topologic-web.html: src/web/topologic.xhtml xslt/web-prepare.xslt topologic-web.js topologic-web.css
$(XSLTPROC) -o "$@" xslt/web-prepare.xslt $<

src/chrome/topologic.js: topologic-web.js $(DOWNLOADS)/jquery.js $(DOWNLOADS)/jquery.mobile.js
closure-compiler --js $(DOWNLOADS)/jquery.js --js $(DOWNLOADS)/jquery.mobile.js --js topologic-web.js >$@

src/chrome/topologic.html: src/web/topologic.xhtml xslt/chrome-prepare.xslt src/chrome/topologic.js src/chrome/topologic-web.css
$(XSLTPROC) -o "$@" xslt/chrome-prepare.xslt $<

src/chrome/topologic-web.css: topologic-web.css
cp $^ $@

src/chrome/topologic-128.png: $(ICON)
rsvg -w 128 -a $^ $@ || true

src/chrome/topologic-16.png: $(ICON)
rsvg -w 16 -a $^ $@ || true

chrome-app.zip: src/chrome/manifest.json src/chrome/topologic.html src/chrome/topologic.js src/chrome/topologic-web.css src/chrome/background.js src/chrome/topologic-128.png src/chrome/topologic-16.png
zip -9jo $@ $^

8 changes: 0 additions & 8 deletions src/chrome/background.js

This file was deleted.

21 changes: 0 additions & 21 deletions src/chrome/manifest.json

This file was deleted.

Binary file removed src/chrome/topologic-128.png
Binary file not shown.
Binary file removed src/chrome/topologic-16.png
Binary file not shown.
Loading

0 comments on commit 02eb0e5

Please sign in to comment.