X-Git-Url: https://git.yukkurigames.com/?p=pwl6.git;a=blobdiff_plain;f=Makefile;h=f2d469729ce04d7fa14be347c78bafffb14a1bbc;hp=3753998346de5de24fd88bcf82b7a7a5ed1cd291;hb=2854030a3f699188676f19ba16a5400c4976f23c;hpb=8354e48119b6dbc7d242eb6b94593b8f72250cdc

diff --git a/Makefile b/Makefile
index 3753998..f2d4697 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,15 @@
 #!/usr/bin/make -f
 
-node-webkit-version := 0.10.4
+nwjs-version := 0.12.0
+all:
+print-%: ; @echo $*=$($*)
 
 .DELETE_ON_ERROR:
 include rules/programs.mk
 include rules/javascript.mk
 include rules/icons.mk
 include rules/git.mk
-include rules/node-webkit.mk
+include rules/nwjs.mk
 include rules/pngcrush.mk
 
 .PHONY: all check distclean lint test dist clean serve
@@ -15,7 +17,7 @@ include rules/pngcrush.mk
 APPLICATION := pwl6
 DISTDIR := build/dist
 VERSION := $(call git-describe)
-DISTROOT := $(DISTDIR)/$(APPLICATION)-$(VERSION)
+DISTROOT := $(DISTDIR)/$(APPLICATION)_$(VERSION)
 
 FIND_FILES := -type f ! -name '.*'
 FIND_JS := -type f -name '*.js'
@@ -69,7 +71,7 @@ clean:
 
 distclean: clean
 	$(RM) -r node_modules
-	$(RM) $(node-webkit-archives)
+	$(RM) $(nwjs-archives)
 
 $(DISTROOT)-src.zip $(DISTROOT)-src.tar.gz: | .git
 	mkdir -p $(@D)
@@ -91,11 +93,11 @@ $(DISTROOT).bare.zip: | .git
 	tools/generate-appcache $@.tmp
 	mv $@.tmp $@
 
-# Python's zipfile module generates zipfiles that node-webkit cannot
-# read, so delegate to a real zip tool.
+# Python's zipfile module generates zipfiles that NW.js cannot read,
+# so delegate to a real zip tool.
 %.nw: %.bare.zip tools/generate-nw
 	$(RM) -r $@ $@.tmp
 	$(UNZIP) -d $@.tmp $<
-	tools/generate-nw $@.tmp
+	tools/generate-nw $@.tmp `echo $(*F) | sed -E 's/.+_[^0-9]+//'`
 	cd $@.tmp && $(ZIP) -r ../$(@F) .
 	$(RM) -r $@.tmp