summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile29
-rw-r--r--elm/battlemap/Makefile11
-rw-r--r--src/battlemap/Makefile16
-rw-r--r--src/battlemap/elm-package.json (renamed from elm/battlemap/elm-package.json)4
-rw-r--r--src/battlemap/src/Battlemap.elm (renamed from elm/battlemap/src/Battlemap.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Direction.elm (renamed from elm/battlemap/src/Battlemap/Direction.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Location.elm (renamed from elm/battlemap/src/Battlemap/Location.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Marker.elm (renamed from elm/battlemap/src/Battlemap/Marker.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Navigator.elm (renamed from elm/battlemap/src/Battlemap/Navigator.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Navigator/Move.elm (renamed from elm/battlemap/src/Battlemap/Navigator/Move.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Navigator/Path.elm (renamed from elm/battlemap/src/Battlemap/Navigator/Path.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Navigator/RangeIndicator.elm (renamed from elm/battlemap/src/Battlemap/Navigator/RangeIndicator.elm)0
-rw-r--r--src/battlemap/src/Battlemap/Tile.elm (renamed from elm/battlemap/src/Battlemap/Tile.elm)0
-rw-r--r--src/battlemap/src/Character.elm (renamed from elm/battlemap/src/Character.elm)0
-rw-r--r--src/battlemap/src/Error.elm (renamed from elm/battlemap/src/Error.elm)0
-rw-r--r--src/battlemap/src/Event.elm (renamed from elm/battlemap/src/Event.elm)0
-rw-r--r--src/battlemap/src/Init.elm (renamed from elm/battlemap/src/Init.elm)0
-rw-r--r--src/battlemap/src/Main.elm (renamed from elm/battlemap/src/Main.elm)0
-rw-r--r--src/battlemap/src/Model.elm (renamed from elm/battlemap/src/Model.elm)0
-rw-r--r--src/battlemap/src/Model/EndTurn.elm (renamed from elm/battlemap/src/Model/EndTurn.elm)0
-rw-r--r--src/battlemap/src/Model/RequestDirection.elm (renamed from elm/battlemap/src/Model/RequestDirection.elm)0
-rw-r--r--src/battlemap/src/Model/SelectCharacter.elm (renamed from elm/battlemap/src/Model/SelectCharacter.elm)0
-rw-r--r--src/battlemap/src/Model/SelectTile.elm (renamed from elm/battlemap/src/Model/SelectTile.elm)0
-rw-r--r--src/battlemap/src/Shim/Battlemap.elm (renamed from elm/battlemap/src/Shim/Battlemap.elm)0
-rw-r--r--src/battlemap/src/Shim/Battlemap/Tile.elm (renamed from elm/battlemap/src/Shim/Battlemap/Tile.elm)0
-rw-r--r--src/battlemap/src/Shim/Model.elm (renamed from elm/battlemap/src/Shim/Model.elm)0
-rw-r--r--src/battlemap/src/Subscriptions.elm (renamed from elm/battlemap/src/Subscriptions.elm)0
-rw-r--r--src/battlemap/src/Update.elm (renamed from elm/battlemap/src/Update.elm)0
-rw-r--r--src/battlemap/src/Util/Array.elm (renamed from elm/battlemap/src/Util/Array.elm)0
-rw-r--r--src/battlemap/src/Util/List.elm (renamed from elm/battlemap/src/Util/List.elm)0
-rw-r--r--src/battlemap/src/View.elm (renamed from elm/battlemap/src/View.elm)0
-rw-r--r--src/battlemap/src/View/Battlemap.elm (renamed from elm/battlemap/src/View/Battlemap.elm)0
-rw-r--r--src/battlemap/src/View/Battlemap/Navigator.elm (renamed from elm/battlemap/src/View/Battlemap/Navigator.elm)0
-rw-r--r--src/battlemap/src/View/Battlemap/Tile.elm (renamed from elm/battlemap/src/View/Battlemap/Tile.elm)0
-rw-r--r--src/battlemap/src/View/Controls.elm (renamed from elm/battlemap/src/View/Controls.elm)0
-rw-r--r--src/battlemap/src/View/Status.elm (renamed from elm/battlemap/src/View/Status.elm)0
-rw-r--r--src/battlemap/www/index.html9
37 files changed, 47 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index f315542..f290bd1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,24 @@
-TARGETS = battlemap
-PAGES = $(addsuffix .html,$(TARGETS))
+MODULES = battlemap
+SRC_DIR = ${CURDIR}/src
+WWW_DIR = ${CURDIR}/www
-all: $(TARGETS) $(PAGES)
+MODULES_SRC = $(addprefix $(SRC_DIR)/,$(MODULES))
+MODULES_WWW = $(addprefix $(WWW_DIR)/,$(MODULES))
-upload_demo: $(PAGES) LICENSE
- scp -r $^ dreamhost:~/tacticians.online/
+all: build $(MODULES_WWW)
-$(TARGETS):
- $(MAKE) -C elm/$@ index.html
+build:
+ for module in $(MODULES_SRC) ; do \
+ $(MAKE) -C $$module build ; \
+ done
-%.html: elm/%/index.html
- cp $< $@
+clean:
+ for module in $(MODULES_SRC) ; do \
+ $(MAKE) -C $$module clean ; \
+ done
+
+$(MODULES_WWW): %: $(WWW_DIR)
+ ln -s $(SRC_DIR)/$(notdir $<)/www $@
+
+$(WWW_DIR):
+ mkdir -p $@
diff --git a/elm/battlemap/Makefile b/elm/battlemap/Makefile
deleted file mode 100644
index 97d7b0b..0000000
--- a/elm/battlemap/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-ELM_CC = elm-make --warn
-SRC_DIR = src
-
-MAIN_MODULE = $(SRC_DIR)/Main.elm
-SUB_MODULES = $(shell find $(SRC_DIR) -type f | grep "elm$$")
-
-index.html: $(MAIN_MODULE) $(SUB_MODULES)
- $(ELM_CC) $(MAIN_MODULE)
-
-clean:
- rm -f index.html
diff --git a/src/battlemap/Makefile b/src/battlemap/Makefile
new file mode 100644
index 0000000..02cae24
--- /dev/null
+++ b/src/battlemap/Makefile
@@ -0,0 +1,16 @@
+ELM_CC = elm-make --warn
+
+SRC_DIR = src
+WWW_DIR = www
+WWW_SCRIPT_DIR = $(WWW_DIR)/script
+
+MAIN_MODULE = $(SRC_DIR)/Main.elm
+SUB_MODULES = $(shell find $(SRC_DIR) -type f | grep "elm$$")
+
+$(WWW_SCRIPT_DIR)/main.js: $(MAIN_MODULE) $(SUB_MODULES)
+ $(ELM_CC) $(MAIN_MODULE) --output $@
+
+build: $(WWW_SCRIPT_DIR)/main.js
+
+clean:
+ rm -f $(WWW_SCRIPT_DIR)/main.js
diff --git a/elm/battlemap/elm-package.json b/src/battlemap/elm-package.json
index bcb6f4a..7c1672e 100644
--- a/elm/battlemap/elm-package.json
+++ b/src/battlemap/elm-package.json
@@ -1,8 +1,8 @@
{
"version": "1.0.0",
"summary": "helpful summary of your project, less than 80 characters",
- "repository": "https://github.com/user/project.git",
- "license": "BSD3",
+ "repository": "https://github.com/nsensfel/tacticians-client.git",
+ "license": "Apache 2.0",
"source-directories": [
"src"
],
diff --git a/elm/battlemap/src/Battlemap.elm b/src/battlemap/src/Battlemap.elm
index d2e4523..d2e4523 100644
--- a/elm/battlemap/src/Battlemap.elm
+++ b/src/battlemap/src/Battlemap.elm
diff --git a/elm/battlemap/src/Battlemap/Direction.elm b/src/battlemap/src/Battlemap/Direction.elm
index 5aad141..5aad141 100644
--- a/elm/battlemap/src/Battlemap/Direction.elm
+++ b/src/battlemap/src/Battlemap/Direction.elm
diff --git a/elm/battlemap/src/Battlemap/Location.elm b/src/battlemap/src/Battlemap/Location.elm
index 36f0c4d..36f0c4d 100644
--- a/elm/battlemap/src/Battlemap/Location.elm
+++ b/src/battlemap/src/Battlemap/Location.elm
diff --git a/elm/battlemap/src/Battlemap/Marker.elm b/src/battlemap/src/Battlemap/Marker.elm
index ebefce6..ebefce6 100644
--- a/elm/battlemap/src/Battlemap/Marker.elm
+++ b/src/battlemap/src/Battlemap/Marker.elm
diff --git a/elm/battlemap/src/Battlemap/Navigator.elm b/src/battlemap/src/Battlemap/Navigator.elm
index 6687b18..6687b18 100644
--- a/elm/battlemap/src/Battlemap/Navigator.elm
+++ b/src/battlemap/src/Battlemap/Navigator.elm
diff --git a/elm/battlemap/src/Battlemap/Navigator/Move.elm b/src/battlemap/src/Battlemap/Navigator/Move.elm
index 9d7a17b..9d7a17b 100644
--- a/elm/battlemap/src/Battlemap/Navigator/Move.elm
+++ b/src/battlemap/src/Battlemap/Navigator/Move.elm
diff --git a/elm/battlemap/src/Battlemap/Navigator/Path.elm b/src/battlemap/src/Battlemap/Navigator/Path.elm
index 53e12c0..53e12c0 100644
--- a/elm/battlemap/src/Battlemap/Navigator/Path.elm
+++ b/src/battlemap/src/Battlemap/Navigator/Path.elm
diff --git a/elm/battlemap/src/Battlemap/Navigator/RangeIndicator.elm b/src/battlemap/src/Battlemap/Navigator/RangeIndicator.elm
index a8cac8e..a8cac8e 100644
--- a/elm/battlemap/src/Battlemap/Navigator/RangeIndicator.elm
+++ b/src/battlemap/src/Battlemap/Navigator/RangeIndicator.elm
diff --git a/elm/battlemap/src/Battlemap/Tile.elm b/src/battlemap/src/Battlemap/Tile.elm
index 255310a..255310a 100644
--- a/elm/battlemap/src/Battlemap/Tile.elm
+++ b/src/battlemap/src/Battlemap/Tile.elm
diff --git a/elm/battlemap/src/Character.elm b/src/battlemap/src/Character.elm
index 1b4d1a1..1b4d1a1 100644
--- a/elm/battlemap/src/Character.elm
+++ b/src/battlemap/src/Character.elm
diff --git a/elm/battlemap/src/Error.elm b/src/battlemap/src/Error.elm
index 581bb24..581bb24 100644
--- a/elm/battlemap/src/Error.elm
+++ b/src/battlemap/src/Error.elm
diff --git a/elm/battlemap/src/Event.elm b/src/battlemap/src/Event.elm
index 5debff1..5debff1 100644
--- a/elm/battlemap/src/Event.elm
+++ b/src/battlemap/src/Event.elm
diff --git a/elm/battlemap/src/Init.elm b/src/battlemap/src/Init.elm
index 25509d1..25509d1 100644
--- a/elm/battlemap/src/Init.elm
+++ b/src/battlemap/src/Init.elm
diff --git a/elm/battlemap/src/Main.elm b/src/battlemap/src/Main.elm
index 5a9d843..5a9d843 100644
--- a/elm/battlemap/src/Main.elm
+++ b/src/battlemap/src/Main.elm
diff --git a/elm/battlemap/src/Model.elm b/src/battlemap/src/Model.elm
index ed067d3..ed067d3 100644
--- a/elm/battlemap/src/Model.elm
+++ b/src/battlemap/src/Model.elm
diff --git a/elm/battlemap/src/Model/EndTurn.elm b/src/battlemap/src/Model/EndTurn.elm
index 441f3b7..441f3b7 100644
--- a/elm/battlemap/src/Model/EndTurn.elm
+++ b/src/battlemap/src/Model/EndTurn.elm
diff --git a/elm/battlemap/src/Model/RequestDirection.elm b/src/battlemap/src/Model/RequestDirection.elm
index cf600e6..cf600e6 100644
--- a/elm/battlemap/src/Model/RequestDirection.elm
+++ b/src/battlemap/src/Model/RequestDirection.elm
diff --git a/elm/battlemap/src/Model/SelectCharacter.elm b/src/battlemap/src/Model/SelectCharacter.elm
index 7cc2102..7cc2102 100644
--- a/elm/battlemap/src/Model/SelectCharacter.elm
+++ b/src/battlemap/src/Model/SelectCharacter.elm
diff --git a/elm/battlemap/src/Model/SelectTile.elm b/src/battlemap/src/Model/SelectTile.elm
index 0fe30fa..0fe30fa 100644
--- a/elm/battlemap/src/Model/SelectTile.elm
+++ b/src/battlemap/src/Model/SelectTile.elm
diff --git a/elm/battlemap/src/Shim/Battlemap.elm b/src/battlemap/src/Shim/Battlemap.elm
index 5a2e29b..5a2e29b 100644
--- a/elm/battlemap/src/Shim/Battlemap.elm
+++ b/src/battlemap/src/Shim/Battlemap.elm
diff --git a/elm/battlemap/src/Shim/Battlemap/Tile.elm b/src/battlemap/src/Shim/Battlemap/Tile.elm
index 1e11cb5..1e11cb5 100644
--- a/elm/battlemap/src/Shim/Battlemap/Tile.elm
+++ b/src/battlemap/src/Shim/Battlemap/Tile.elm
diff --git a/elm/battlemap/src/Shim/Model.elm b/src/battlemap/src/Shim/Model.elm
index f82a0d3..f82a0d3 100644
--- a/elm/battlemap/src/Shim/Model.elm
+++ b/src/battlemap/src/Shim/Model.elm
diff --git a/elm/battlemap/src/Subscriptions.elm b/src/battlemap/src/Subscriptions.elm
index 83df587..83df587 100644
--- a/elm/battlemap/src/Subscriptions.elm
+++ b/src/battlemap/src/Subscriptions.elm
diff --git a/elm/battlemap/src/Update.elm b/src/battlemap/src/Update.elm
index 7ee61a3..7ee61a3 100644
--- a/elm/battlemap/src/Update.elm
+++ b/src/battlemap/src/Update.elm
diff --git a/elm/battlemap/src/Util/Array.elm b/src/battlemap/src/Util/Array.elm
index 69d329c..69d329c 100644
--- a/elm/battlemap/src/Util/Array.elm
+++ b/src/battlemap/src/Util/Array.elm
diff --git a/elm/battlemap/src/Util/List.elm b/src/battlemap/src/Util/List.elm
index c4db397..c4db397 100644
--- a/elm/battlemap/src/Util/List.elm
+++ b/src/battlemap/src/Util/List.elm
diff --git a/elm/battlemap/src/View.elm b/src/battlemap/src/View.elm
index 8a956d1..8a956d1 100644
--- a/elm/battlemap/src/View.elm
+++ b/src/battlemap/src/View.elm
diff --git a/elm/battlemap/src/View/Battlemap.elm b/src/battlemap/src/View/Battlemap.elm
index efe4d1e..efe4d1e 100644
--- a/elm/battlemap/src/View/Battlemap.elm
+++ b/src/battlemap/src/View/Battlemap.elm
diff --git a/elm/battlemap/src/View/Battlemap/Navigator.elm b/src/battlemap/src/View/Battlemap/Navigator.elm
index 4180e6d..4180e6d 100644
--- a/elm/battlemap/src/View/Battlemap/Navigator.elm
+++ b/src/battlemap/src/View/Battlemap/Navigator.elm
diff --git a/elm/battlemap/src/View/Battlemap/Tile.elm b/src/battlemap/src/View/Battlemap/Tile.elm
index d38d84e..d38d84e 100644
--- a/elm/battlemap/src/View/Battlemap/Tile.elm
+++ b/src/battlemap/src/View/Battlemap/Tile.elm
diff --git a/elm/battlemap/src/View/Controls.elm b/src/battlemap/src/View/Controls.elm
index f5851a9..f5851a9 100644
--- a/elm/battlemap/src/View/Controls.elm
+++ b/src/battlemap/src/View/Controls.elm
diff --git a/elm/battlemap/src/View/Status.elm b/src/battlemap/src/View/Status.elm
index de2a167..de2a167 100644
--- a/elm/battlemap/src/View/Status.elm
+++ b/src/battlemap/src/View/Status.elm
diff --git a/src/battlemap/www/index.html b/src/battlemap/www/index.html
new file mode 100644
index 0000000..f630b80
--- /dev/null
+++ b/src/battlemap/www/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ </head>
+ <body>
+ <script src="script/main.js"></script>
+ <script>Elm.Main.fullscreen();</script>
+ </body>
+</html>