Switch to lime.exe instead of lime.bat (fixes exit from batch files)

This commit is contained in:
Joshua Granick
2015-02-16 17:58:14 -08:00
parent 4ac8380cca
commit 9675f8a40a
6 changed files with 34 additions and 6 deletions

3
.gitignore vendored
View File

@@ -14,7 +14,8 @@ project/winrt/shaders/
*.swp
.idea/
*.iml
tools/tools.n
tools/*.n
tools/*.exe
haxedoc.xml
docs/*.xml
docs/pages*

View File

@@ -1,2 +0,0 @@
@echo off
haxelib run lime %*

BIN
templates/bin/lime.exe Normal file

Binary file not shown.

18
tools/AliasScript.hx Normal file
View File

@@ -0,0 +1,18 @@
package;
import haxe.macro.Compiler;
class AliasScript {
public static function main () {
var args = [ "run", Compiler.getDefine ("command") ].concat (Sys.args ());
Sys.exit (Sys.command ("haxelib", args));
}
}

11
tools/alias.hxml Normal file
View File

@@ -0,0 +1,11 @@
-main AliasScript
-D command=lime
-neko lime.n
-cmd nekotools boot lime.n
--next
-main AliasScript
-D command=openfl
-neko openfl.n
-cmd nekotools boot openfl.n

View File

@@ -1686,7 +1686,7 @@ class PlatformSetup {
}
File.copy (PathHelper.getHaxelib (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.bat", haxePath + "\\lime.bat");
File.copy (PathHelper.getHaxelib (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.exe", haxePath + "\\lime.exe");
File.copy (PathHelper.getHaxelib (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.sh", haxePath + "\\lime");
} else {
@@ -1835,9 +1835,9 @@ class PlatformSetup {
}
File.copy (PathHelper.getHaxelib (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.bat", haxePath + "\\lime.bat");
File.copy (PathHelper.getHaxelib (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.exe", haxePath + "\\lime.exe");
File.copy (PathHelper.getHaxelib (new Haxelib ("lime")) + "\\templates\\\\bin\\lime.sh", haxePath + "\\lime");
File.copy (PathHelper.getHaxelib (new Haxelib ("openfl")) + "\\templates\\\\bin\\openfl.bat", haxePath + "\\openfl.bat");
File.copy (PathHelper.getHaxelib (new Haxelib ("openfl")) + "\\templates\\\\bin\\openfl.exe", haxePath + "\\openfl.exe");
File.copy (PathHelper.getHaxelib (new Haxelib ("openfl")) + "\\templates\\\\bin\\openfl.sh", haxePath + "\\openfl");
} else {