Merge pull request #366 from vroad/PR/fix-3

Use "iojs" instead in NodeJSHelper
openfl · Mar 6, 2015 · f1617e5 · f1617e5
2 parents f88a35f + 8ed6ad3
commit f1617e5
Show file tree

Hide file tree

Showing 124 changed files with 2 additions and 10,048 deletions.
diff --git a/lime/tools/helpers/NodeJSHelper.hx b/lime/tools/helpers/NodeJSHelper.hx
@@ -12,39 +12,7 @@ class NodeJSHelper {
 
 
 	public static function run (project:HXProject, modulePath:String, args:Array<String> = null):Void {
-
-		var suffix = switch (PlatformHelper.hostPlatform) {
-
-			case Platform.WINDOWS: "-windows.exe";
-			case Platform.MAC: "-mac";
-			case Platform.LINUX: "-linux";
-			default: return;
-
-		}
-
-		if (suffix == "-linux") {
-
-			if (PlatformHelper.hostArchitecture == Architecture.X86) {
-
-				suffix += "32";
-
-			} else {
-
-				suffix += "64";
-
-			}
-
-		}
-
-		var templatePaths = [ PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime")), "templates") ].concat (project.templatePaths);
-		var node = PathHelper.findTemplate (templatePaths, "bin/node/node" + suffix);
-
-		if (PlatformHelper.hostPlatform != Platform.WINDOWS) {
-
-			Sys.command ("chmod", [ "+x", node ]);
-
-		}
-
+
 		if (args == null) {
 
 			args = [];
@@ -53,7 +21,7 @@ class NodeJSHelper {
 
 		args.unshift (Path.withoutDirectory (modulePath));
 
-		ProcessHelper.runCommand (Path.directory (modulePath), node, args);
+		ProcessHelper.runCommand (Path.directory (modulePath), "iojs", args);
 
 	}
 

diff --git a/templates/bin/node/http-server/LICENSE b/templates/bin/node/http-server/LICENSE
diff --git a/templates/bin/node/http-server/http-server b/templates/bin/node/http-server/http-server
diff --git a/templates/bin/node/http-server/http-server.js b/templates/bin/node/http-server/http-server.js
diff --git a/templates/bin/node/http-server/node_modules/.bin/ecstatic b/templates/bin/node/http-server/node_modules/.bin/ecstatic
diff --git a/templates/bin/node/http-server/node_modules/.bin/opener b/templates/bin/node/http-server/node_modules/.bin/opener
diff --git a/templates/bin/node/http-server/node_modules/colors/MIT-LICENSE.txt b/templates/bin/node/http-server/node_modules/colors/MIT-LICENSE.txt