Merge pull request #101 from cxw42/v01e

v0.1.14 deployment

Makefile

@@ -0,0 +1,49 @@
+# Makefile for tabfern, by cxw
+
+# Handmade bundles.
+# NOTE: keep these in sync with the lists in conf/require-config.js
+# For src/view/main and src/view/tree
+TO_BUNDLE_1 = \
+	   tabfern/js/jquery.js \
+	   tabfern/js/loglevel.js
+DEST_BUNDLE_1 = tabfern/src/view/bundle_common.js
+
+# For src/view/tree
+TO_BUNDLE_2= \
+	   tabfern/js/jstree.js \
+	   tabfern/js/jstree-actions.js \
+	   tabfern/js/jstree-flagnode.js \
+	   tabfern/js/jstree-because.js \
+	   tabfern/js/jstree-multitype.js \
+	   tabfern/js/jstree-redraw-event.js \
+	   tabfern/js/multidex.js \
+	   tabfern/js/justhtmlescape.js \
+	   tabfern/js/signals.js \
+	   tabfern/js/asynquence.js \
+	   tabfern/js/asynquence-contrib.js \
+	   tabfern/js/asq-helpers.js \
+	   tabfern/js/rmodal.js \
+	   tabfern/js/tinycolor.js \
+	   tabfern/js/keypress.js \
+	   tabfern/js/hamburger.js \
+	   tabfern/js/import-file.js \
+	   tabfern/js/export-file.js
+
+DEST_BUNDLE_2 = tabfern/src/view/bundle_tree.js
+
+.PHONY: all bundle clean
+
+all: bundle
+	./check-webstore.sh
+
+bundle: $(DEST_BUNDLE_1) $(DEST_BUNDLE_2)
+
+$(DEST_BUNDLE_1): $(TO_BUNDLE_1)
+	./bundle.sh $@ $^
+
+$(DEST_BUNDLE_2): $(TO_BUNDLE_2)
+	./bundle.sh $@ $^
+
+clean:
+	-rm $(DEST_BUNDLE_1) $(DEST_BUNDLE_2)
+

README.md

@@ -70,7 +70,7 @@ affiliated with Vladyslav or his (excellent!) work.
 
 # Legal
 
-Copyright (c) 2017 Chris White, Jasmine Hegman.  CC-BY-SA 4.0 International
+Copyright (c) 2017 Chris White, Jasmine Hegman.  CC-BY-SA 4.0 International.
 See [LICENSE.md](LICENSE.md) for details, which are controlling in case of any
 difference between that file and this section.
 

bundle.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# bundle.sh: bundle some JS files.
+# By github @cxw42, 2017.  CC-BY 3.0.
+
+dest="$1"
+shift
+
+rm -f "$dest"
+touch "$dest"
+
+for f in "$@" ; do
+    cat >> "$dest" <<EOF
+// Begin bundled file ///////////////////////////////////////////////////
+// $f
+
+EOF
+    cat "$f" >> "$dest"
+done
+

check-webstore.sh

@@ -19,19 +19,13 @@ find webstore -name \*.swp -o -wholename webstore/LICENSE.md -o \
     done
 
 echo === Files in tabfern/ but not in webstore/ ===
-find tabfern \( -wholename tabfern/assets/icons -prune -o -name \*.swp -prune -o \
+find tabfern \( -prune -o -name \*.swp -prune -o \
             -wholename tabfern/webstore -prune -o -name .git\* -prune -o \
             -wholename tabfern/scraps -prune -o -wholename tabfern/webstore.js -prune -o \
             -wholename tabfern/webstore.zip -prune -o -wholename tabfern/test -prune -o \
             -wholename tabfern/node_modules -prune \) \
     -o \( -type f \( -exec dash -c 'f="webstore/${0#tabfern/}" ; [ -f "$f" ]' {} \; -o -print \) \)
 
-cat <<EOF
-
-Reminder: I didn't check assets/icons, so if you pulled any of those, you'll
-need to copy them manually.
-EOF
-
 if [[ $1 = '-z' ]]; then
     rm -f ./webstore.zip
     pushd webstore