From 55f01ce3978f12eafe7e726ee52133169c84b2bc Mon Sep 17 00:00:00 2001 From: nsensfel Date: Thu, 27 Sep 2018 16:25:14 +0200 Subject: ... --- src/background/Makefile | 9 ++++----- src/background/elm-package.json | 3 ++- src/background/src/Action/Ports.elm | 4 ---- src/background/src/ElmModule/View.elm | 1 + 4 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 src/background/src/Action/Ports.elm (limited to 'src/background') diff --git a/src/background/Makefile b/src/background/Makefile index 3b58a08..0bd7c27 100644 --- a/src/background/Makefile +++ b/src/background/Makefile @@ -2,8 +2,7 @@ ## CONFIG ###################################################################### ################################################################################ SRC_DIR ?= src -WWW_DIR ?= www -WWW_SCRIPT_DIR ?= $(WWW_DIR)/script +TARGET_FILE ?= $(WWW_DIR)/script/main_background.js ELM_CC ?= elm-make --warn @@ -21,10 +20,10 @@ SUB_MODULES = $(shell find $(SRC_DIR) -type f | grep "elm$$") ################################################################################ ## TARGET RULES ################################################################ ################################################################################ -build: $(WWW_SCRIPT_DIR)/main.js +build: $(TARGET_FILE) clean: - rm -f $(WWW_SCRIPT_DIR)/main.js + rm -f $(TARGET_FILE) reset: rm -rf elm-stuff @@ -32,5 +31,5 @@ reset: ################################################################################ ## INTERNAL RULES ############################################################## ################################################################################ -$(WWW_SCRIPT_DIR)/main.js: $(MAIN_MODULE) $(SUB_MODULES) +$(TARGET_FILE): $(MAIN_MODULE) $(SUB_MODULES) $(ELM_CC) $(MAIN_MODULE) --output $@ diff --git a/src/background/elm-package.json b/src/background/elm-package.json index a8b8580..14dedf1 100644 --- a/src/background/elm-package.json +++ b/src/background/elm-package.json @@ -4,7 +4,8 @@ "repository": "https://github.com/nsensfel/tacticians-extension.git", "license": "Apache 2.0", "source-directories": [ - "src" + "src", + "../shared" ], "exposed-modules": [], "dependencies": { diff --git a/src/background/src/Action/Ports.elm b/src/background/src/Action/Ports.elm deleted file mode 100644 index 9222b08..0000000 --- a/src/background/src/Action/Ports.elm +++ /dev/null @@ -1,4 +0,0 @@ -port module Action.Ports exposing (..) - -port read_params : () -> (Cmd msg) -port store_results : (String) -> (Cmd msg) diff --git a/src/background/src/ElmModule/View.elm b/src/background/src/ElmModule/View.elm index 32a139f..64f7188 100644 --- a/src/background/src/ElmModule/View.elm +++ b/src/background/src/ElmModule/View.elm @@ -1,6 +1,7 @@ module ElmModule.View exposing (view) -- Elm ------------------------------------------------------------------------- +import Html -- Extension ------------------------------------------------------------------- import Util.Html -- cgit v1.2.3-70-g09d2