Merge branch 'kazuho/experiments/diet-npm-package' (fix #309)

Author: kazuho

.npmignore

@@ -1,5 +1,4 @@
 # temporary files
-
 *~
 *.swp
 *.zip
@@ -11,29 +10,33 @@ bootstrap/
 .jsx
 tmp/
 
-# products
-
-try/
+# files in git but not from npm
+.npmignore
+.travis.yml
+.proverc
+complete/
 doc/
+example/
+extlib/
+gruntfile.js
+idl2jsx/
+Makefile
+release-engineering.md
+src/
+submodules/
+t/
+tool/
+try/
+web/
+xt/
 
 # npm-related files
-
 npm-debug.log
 package/
 jsx-*.tgz
 
 # no need to include node modules
-
 node_modules/
 
-# extlib stuff
-
-.packlist
-.meta
-darwin-*
-linux-*
-*:*
-
 # git stuff
-
 .git*

Makefile

@@ -46,7 +46,7 @@ test: all test-debug test-optimized-minified show-todo
 
 test-all: test test-optimized
 
-test-debug: test-core test-misc-core
+test-debug: test-core test-misc
 
 test-optimized:
 	JSX_OPTS="--optimize release,-no-log,-no-assert" $(MAKE) test-core
@@ -61,11 +61,21 @@ test-transformed-optimized:
 	JSX_OPTS="--enable-cps-transform --optimize release,-no-log,-no-assert" $(MAKE) test-core
 
 test-core:
-	$(PROVE) --jobs "$(JOBS)" t/run/*.jsx t/compile_error/*.jsx t/lib/*.jsx t/src/*.jsx t/web/*.jsx
+	$(PROVE) --jobs "$(JOBS)" t/run/*.jsx t/compile_error/*.jsx t/lib/*.jsx t/optimize/*.jsx t/complete/*.jsx
 
-test-misc-core:
-	$(PROVE) --jobs "$(JOBS)" t/*.t t/optimize/*.jsx t/complete/*.jsx
+test-misc:
+	$(PROVE) --jobs "$(JOBS)" t/*.t t/src/*.jsx t/web/*.jsx
 
+test-npm: all
+	perl -MFile::Temp=tempdir -e 'system("make _test-npm NPM_TEMPDIR=" . tempdir(CLEANUP => 1)) == 0 or exit 1'
+
+_test-npm:
+	PKG=$(shell npm pack)
+	PWD=$(shell pwd)
+	echo '{}' > $(NPM_TEMPDIR)/package.json
+	(cd $(NPM_TEMPDIR) && npm install $(PWD)/$(PKG))
+	JSX_COMPILER=$(NPM_TEMPDIR)/node_modules/.bin/jsx $(MAKE) test-core
+	rm -f $(PKG)
 
 test-bench:
 	$(PROVE) -v xt/optimize-bench/*.jsx
@@ -92,10 +102,12 @@ web.jsx:
 show-todo:
 	find t -name '*.todo.*' | grep -v '~'
 
-publish:
-	time $(MAKE) test-all COMPILER_COMPILE_OPTS="--release $(COMPILER_COMPILE_OPTS)"
+publish: publish-test
 	npm publish
 
+publish-test:
+	time $(MAKE) test-all test-npm COMPILER_COMPILE_OPTS="--release $(COMPILER_COMPILE_OPTS)"
+
 update-assets: update-bootstrap update-codemirror
 
 update-codemirror:
@@ -124,4 +136,4 @@ clean:
 	rm -rf bin/*
 	rm -rf jsx-*.tgz
 
-.PHONY: setup test test-debug test-release test-core test-misc-core web server doc meta instal-deps
+.PHONY: deps compiler compiler-core meta doc bootstrap-compiler test test-all test-debug test-optimized test-optimized-minified test-transformed test-transformed-optimized test-core test-misc test-npm _test-npm test-bench v8bench web server web.jsx show-todo publish publish-test update-assets update-codemirror update-bootstrap clean

src/doc/style.css etc/doc-template/style.csssrc/doc/style.css renamed to etc/doc-template/style.css

@@ -2995,7 +2995,7 @@ abstract class _BootstrapBuilder {
 	}
 
 	function addBootstrap(code : string) : string {
-		code += this._emitter._platform.load(this._emitter._platform.getRoot() + "/src/js/launcher.js");
+		code += this._emitter._platform.load(this._emitter._platform.getRoot() + "/lib/js/rt/launcher.js");
 
 		var args;
 		switch (this._executableFor) {
@@ -3022,7 +3022,7 @@ abstract class _BootstrapBuilder {
 	abstract function _getLauncher() : string;
 
 	function _wrapOnLoad(code : string) : string {
-		var wrapper = this._emitter._platform.load(this._emitter._platform.getRoot() + "/src/js/web-launcher.js");
+		var wrapper = this._emitter._platform.load(this._emitter._platform.getRoot() + "/lib/js/rt/web-launcher.js");
 		return wrapper.replace(/\/\/--CODE--\/\//, code);
 	}
 
@@ -3237,7 +3237,7 @@ class JavaScriptEmitter implements Emitter {
 		// headers
 		this._output += "// generatedy by JSX compiler " + Meta.IDENTIFIER + "\n";
 		this._output += this._fileHeader;
-		this._output += this._platform.load(this._platform.getRoot() + "/src/js/bootstrap.js");
+		this._output += this._platform.load(this._platform.getRoot() + "/lib/js/rt/bootstrap.js");
 
 		var stash = (this.getStash(_NoDebugCommand.IDENTIFIER) as _NoDebugCommand.Stash);
 		this._emit("JSX.DEBUG = "+(stash == null || stash.debugValue ? "true" : "false")+";\n", null);
@@ -3501,7 +3501,7 @@ class JavaScriptEmitter implements Emitter {
 		}
 		output += this._output + "\n";
 		if (this._enableProfiler) {
-			output += this._platform.load(this._platform.getRoot() + "/src/js/profiler.js");
+			output += this._platform.load(this._platform.getRoot() + "/lib/js/rt/profiler.js");
 		}
 		if (this._bootstrapBuilder != null) {
 			output = this._bootstrapBuilder.addBootstrap(output);

src/doc/template.html etc/doc-template/template.htmlsrc/doc/template.html renamed to etc/doc-template/template.html

@@ -421,7 +421,7 @@ class JSXCommand {
 				return 1;
 			}
 			if (compiler.compile()) {
-				new DocumentGenerator(compiler, platform.getRoot() + "/src/doc", outputFile)
+				new DocumentGenerator(compiler, platform.getRoot() + "/etc/doc-template", outputFile)
 					.setResourceFiles(["style.css"])
 					.setPathFilter(function (sourcePath) {
 						if (sourcePath.indexOf("system:") == 0) {