Merge pull request #2233 from yurydelendik/restartless

Moves restartless extension links out from the source files folder.

Gruntfile.js

@@ -264,15 +264,7 @@ module.exports = function(grunt) {
         cwd: "test/ats"
       },
       restartless: {
-        cmd: 'ln -fs ../../../examples/inspector/debug/pingpong.js chrome/pingpong.js;' +
-          'ln -fs ../../../src/gfx content/gfx;' +
-          'ln -fs ../../../build/playerglobal content/playerglobal;' +
-          'ln -fs ../../../build/libs content/libs;' +
-          'ln -fs ../../../build/bundles/shumway.gfx.js content/shumway.gfx.js;' +
-          'ln -fs ../../../build/bundles/shumway.player.js content/shumway.player.js;' +
-          'ln -fs ../../../build/version/version.txt content/version.txt;' +
-          'OUT=' + (grunt.option('profile') || '').replace(/ /g, '\\ ') + '/extensions/shumway@research.mozilla.org;' +
-          'rm -r "$OUT" 2>/dev/null; pwd > "$OUT"',
+        cmd: 'make restartless PROFILE="' + (grunt.option('profile') || '') + '"',
         cwd: "extension/firefox"
       }
     },

extension/firefox/Makefile

@@ -15,6 +15,8 @@
 UTILS_HOME = ../../utils
 CLOSURE ?= $(UTILS_HOME)/closure.jar
 BUILD_DIR = ../../build/firefox
+RESTARTLESS_DIR = ../../build/firefox-restartless
+PROFILE ?= $(error Specify Firefox profile in PROFILE)
 BUNDLES_DIR = ../../build/bundles-cc
 
 # Just builds a ff extension
@@ -53,5 +55,24 @@ ensureoutputdir: clean
 clean:
 	-rm -rf build
 	-rm -rf $(BUILD_DIR)
+	-rm -rf $(RESTARTLESS_DIR)
 
-PHONY: build clean ensureoutputdir
+restartless:
+	-rm -rf $(RESTARTLESS_DIR)
+	mkdir -p $(RESTARTLESS_DIR)
+	cd $(RESTARTLESS_DIR); find ../../extension/firefox -type f -maxdepth 1 -mindepth 1 -exec ln -s {} \;
+	mkdir -p $(RESTARTLESS_DIR)/chrome
+	cd $(RESTARTLESS_DIR)/chrome; find ../../../extension/firefox/chrome -maxdepth 1 -mindepth 1 -exec ln -s {} \;
+	mkdir -p $(RESTARTLESS_DIR)/content
+	cd $(RESTARTLESS_DIR)/content; find ../../../extension/firefox/content -maxdepth 1 -mindepth 1 -exec ln -s {} \;
+	ln -s ../../../examples/inspector/debug/pingpong.js $(RESTARTLESS_DIR)/chrome/pingpong.js
+	ln -s ../../../src/gfx $(RESTARTLESS_DIR)/content/gfx
+	ln -s ../../../build/playerglobal $(RESTARTLESS_DIR)/content/playerglobal
+	ln -s ../../../build/libs $(RESTARTLESS_DIR)/content/libs
+	ln -s ../../../build/bundles/shumway.gfx.js $(RESTARTLESS_DIR)/content/shumway.gfx.js
+	ln -s ../../../build/bundles/shumway.player.js $(RESTARTLESS_DIR)/content/shumway.player.js
+	ln -s ../../../build/version/version.txt $(RESTARTLESS_DIR)/content/version.txt
+	cd $(RESTARTLESS_DIR); pwd > "$(PROFILE)/extensions/shumway@research.mozilla.org"
+	grep "nglayout.debug.disable_xul_cache\", true" "$(PROFILE)/prefs.js" 1>/dev/null || echo "Set create 'nglayout.debug.disable_xul_cache' boolean preference to 'true'."
+
+PHONY: build clean ensureoutputdir restartless