From ae2be01c8aecfd492322cad484fb3341fca5452e Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Wed, 24 Jan 2018 06:38:01 +0300 Subject: [PATCH] fixed nw build package.json, still have some dependency issues/bugs... Signed-off-by: Alex A. Naanou --- ui (gen4)/Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index d398ea15..90eb817f 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -591,13 +591,13 @@ $(DIST_DIR)/$(APP_NAME)-%.zip: $(BUILD_DIR)/$(APP_NAME)-%.$(BUILD_MODE).zip # NW.js... # NOTE: this needs a clean app dir... -# XXX this needs either a correct package.json or a universal way to start -# compatible with electron... -# XXX stuff to remove: -# ??? $(BUILD_DIR)/package.nw: INCLUDE_NODE_MODULES += $(INCLUDE_NW_NODE_MODULES) -$(BUILD_DIR)/package.nw: PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME)/ $(call includeNodeModules,$(INCLUDE_NODE_MODULES)) +$(BUILD_DIR)/package.nw: PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME)/ \ + $(call includeNodeModules,$(INCLUDE_NODE_MODULES)) $(BUILD_DIR)/package.nw: $$(PACK_MINIMAL) + # update package.json... + cd "$<" ; \ + cat package.json | sed 's/"e.js"/"index.html"/g' > package.json $(call zipFrom,$<,$@,*) @@ -608,6 +608,13 @@ $(BUILD_DIR)/package.nw: $$(PACK_MINIMAL) +#---------------------------------------------------------------------- +# cli... + +# XXX + + + #---------------------------------------------------------------------- # Desktop installer (WiX)...