X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=Makefile;h=4132e9652cea38de0140aa220721beea3ad5a035;hp=ee69598e27ca527d25bc723cced9f081bd6500c7;hb=f8b6dc7aef51ccc82d163f015612c7640f0be365;hpb=7df3bbda08d2305fc9149db3adc007bfd1d4bbf5

diff --git a/Makefile b/Makefile
index ee69598..4132e96 100644
--- a/Makefile
+++ b/Makefile
@@ -3,40 +3,92 @@ DEPLOY_DIR=/srv/lmno.games/www
 DO_NOT_DEPLOY=Makefile deps *.jsx .babelrc .gitignore README
 DO_NOT_DELETE=flempires
 
-DEPS=deps/react.development.js \
-deps/react-dom.development.js \
-deps/react.production.min.js \
-deps/react-dom.production.min.js
+REACT_DEPS=react.js react-dom.js
+REACT_DOWNLOADS=\
+  deps/react.development.js \
+  deps/react-dom.development.js \
+  deps/react.production.min.js \
+  deps/react-dom.production.min.js
 
-checksums:
-	sha512sum --strict -c checksums.sha512
+JSX_SOURCE=$(wildcard */*.jsx)
+JS_TARGETS=$(JSX_SOURCE:.jsx=.js)
 
-deps: $(DEPS) checksums
+all: $(JS_TARGETS) $(REACT_DEPS)
 
-dev: deps
-	cp deps/react.development.js react.js
-	cp deps/react-dom.development.js react-dom.js
+# Execute either of the following to build things:
+#
+#    For a development build:
+#
+#	make
+#
+#    For a production build:
+#
+#	make LMNO_BUILD=production
+#
+# Note: To switch between these two, either issue a "make clean"
+#       or otherwise start in a clean source tree (such as a
+#       after a fresh "git clone" or use "git clean -f -x -d).
+#
+CP=cp
+BABEL=babeljs
+ifeq ($(LMNO_BUILD),production)
+react.js: deps/react.production.min.js
+	$(call quiet,CP) $^ $@
 
-prod: deps
-	cp deps/react.production.min.js react.js
-	cp deps/react-dom.production.min.js react-dom.js
+react-dom.js: deps/react-dom.production.min.js
+	$(call quiet,CP) $^ $@
 
-deps/react.development.js:
-	wget -nv -nc -P deps https://unpkg.com/react@16/umd/react.development.js
+export BABEL_ENV=production
+%.js: %.jsx
+	$(call quiet,BABEL) $^ --out-file $@
+else
+react.js: deps/react.development.js
+	$(call quiet,CP) $^ $@
 
-deps/react-dom.development.js:
-	wget -nv -nc -P deps https://unpkg.com/react-dom@16/umd/react-dom.development.js
+react-dom.js: deps/react-dom.development.js
+	$(call quiet,CP) $^ $@
 
-deps/react.production.min.js:
-	wget -nv -nc -P deps https://unpkg.com/react@16/umd/react.production.min.js
+export BABEL_ENV=development
+%.js: %.jsx
+	$(call quiet,BABEL) $^ --out-file $@
+endif
 
-deps/react-dom.production.min.js:
-	wget -nv -nc -P deps https://unpkg.com/react-dom@16/umd/react-dom.production.min.js
+# The user has not set any verbosity, default to quiet mode and inform the
+# user how to enable verbose compiles.
+ifeq ($(V),)
+quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
+quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$(1) $(or $(2),$@)\n"; $($(word 1, $(1)))
+WGET_VERBOSE_FLAGS=--quiet
+endif
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @printf "$(1) $(or $(2),$@)\n"; $($(word 1, $(1)))
+WGET_VERBOSE_FLAGS=--quiet
+endif
+# Otherwise, print the full command line.
+quiet ?= $($(word 1, $(1)))
+WGET_VERBOSE_FLAGS ?= --no-verbose
+
+SHA512=sha512sum --strict -c
+.PHONY: deps
+deps: $(REACT_DOWNLOADS)
+	$(call quiet,SHA512) deps/*.sha512
+
+DOWNLOAD=wget $(WGET_VERBOSE_FLAGS) -nc -P deps
+deps/react.%.js:
+	$(call quiet,DOWNLOAD) https://unpkg.com/react@16/umd/$(@:deps/%=%)
+	$(call quiet,SHA512) $(@:%=%.sha512)
+
+deps/react-dom.%.js:
+	$(call quiet,DOWNLOAD) https://unpkg.com/react-dom@16/umd/$(@:deps/%=%)
+	$(call quiet,SHA512) $(@:%=%.sha512)
 
 deploy:
 	rm -rf .deploy-source
 	git clone . .deploy-source
-	make -C .deploy-source prod
+	cp deps/*.js .deploy-source/deps
+	make -C .deploy-source deps
+	make -C .deploy-source LMNO_BUILD=production
 	rm -rf .deploy-source/.git
 	(cd .deploy-source; rsync -avz \
 		$(DO_NOT_DEPLOY:%=--exclude=%) \
@@ -45,3 +97,8 @@ deploy:
 		--delete-after \
 		./ $(DEPLOY_HOST):$(DEPLOY_DIR) )
 	rm -rf .deploy-source
+
+clean:
+	rm -f $(JS_TARGETS)
+	rm -f $(REACT_DEPS)
+	rm -f deps/*.js