From 3e4930fe01e35f6d81916dc0fd6cb5acb267967b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Waneck?= Date: Tue, 4 Mar 2014 13:46:49 -0300 Subject: [PATCH] better naming scheme for output file; haxelib update --- build-tool/src/compiler/java/Javac.hx | 21 ++++++++++++++++++--- haxelib.json | 4 ++-- run.n | Bin 44709 -> 44874 bytes 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/build-tool/src/compiler/java/Javac.hx b/build-tool/src/compiler/java/Javac.hx index 2e9a608..4b779b2 100644 --- a/build-tool/src/compiler/java/Javac.hx +++ b/build-tool/src/compiler/java/Javac.hx @@ -19,14 +19,29 @@ class Javac extends Compiler override public function compile(data:Data):Void { - if (cmd.output == null) + var name = if (data.main != null) + { + var idx = data.main.lastIndexOf("."); + if (idx != -1) + data.main.substr(idx + 1); + else + data.main; + } + else { var name = Sys.getCwd(); name = name.substr(0, name.length - 1); if (name.lastIndexOf("\\") > name.lastIndexOf("/")) - cmd.output = name.split("\\").pop(); + name = name.split("\\").pop(); else - cmd.output = name.split("/").pop(); + name = name.split("/").pop(); + } + if (data.defines.exists("debug")) + name += "-Debug"; + + if (cmd.output == null) + { + cmd.output = name; } else { cmd.output = Tools.addPath(data.baseDir, cmd.output); } diff --git a/haxelib.json b/haxelib.json index 85bc7e1..052990d 100644 --- a/haxelib.json +++ b/haxelib.json @@ -4,7 +4,7 @@ "license":"Public", "tags":["java","core"], "description":"Support library for the Java backend of the Haxe compiler", - "version":"3.0.0-rc.1", - "releasenote":"Added Java standard lib JAR file", + "version":"3.1.0", + "releasenote":"Update to haxe 3.1 release and changed output file to a better naming scheme", "contributors":["waneck"] } diff --git a/run.n b/run.n index 22d709545d1eceebb11b7867efd32e351fd1a15f..48fca5adc9fcfb4d758cb99da7a4bde72c930a16 100644 GIT binary patch delta 4502 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 delta 4513 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 bR>Pa!0pfPM|F7Kv@JTm%b$LSEG1-3rajAb2