From fcd12220439fa7f681bbfc8c456547dd4ccc7d9c Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Wed, 18 Feb 2015 08:52:33 -0800 Subject: [PATCH] Always generate a build number, set the platform to have the formatted name instead of lowercase and improve the deployment file name --- lime/project/Platform.hx | 26 +++++++++++++------------- lime/tools/helpers/DeploymentHelper.hx | 2 +- tools/CommandLineTools.hx | 12 +----------- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/lime/project/Platform.hx b/lime/project/Platform.hx index e47edf77e..970a1f52c 100644 --- a/lime/project/Platform.hx +++ b/lime/project/Platform.hx @@ -3,18 +3,18 @@ package lime.project; @:enum abstract Platform(String) { - var ANDROID = "android"; - var BLACKBERRY = "blackberry"; - var FIREFOX = "firefox"; - var FLASH = "flash"; - var HTML5 = "html5"; - var IOS = "ios"; - var LINUX = "linux"; - var MAC = "mac"; - var TIZEN = "tizen"; - var WINDOWS = "windows"; - var WEBOS = "webos"; - var EMSCRIPTEN = "emscripten"; + var ANDROID = "Android"; + var BLACKBERRY = "BlackBerry"; + var FIREFOX = "Firefox"; + var FLASH = "Flash"; + var HTML5 = "HTML5"; + var IOS = "iOS"; + var LINUX = "Linux"; + var MAC = "Mac"; + var TIZEN = "Tizen"; + var WINDOWS = "Windows"; + var WEBOS = "webOS"; + var EMSCRIPTEN = "Emscripten"; var CUSTOM = null; - + } \ No newline at end of file diff --git a/lime/tools/helpers/DeploymentHelper.hx b/lime/tools/helpers/DeploymentHelper.hx index 4173d587c..e01e9555c 100644 --- a/lime/tools/helpers/DeploymentHelper.hx +++ b/lime/tools/helpers/DeploymentHelper.hx @@ -9,7 +9,7 @@ class DeploymentHelper { public static function deploy (project:HXProject, targetFlags:Map , targetDirectory:String) { - var name = project.meta.title + " (" + project.meta.version + ").zip"; + var name = project.meta.title + " (" + project.meta.version + " build " + project.meta.buildNumber + ") (" + project.target + ").zip"; var targetPath = PathHelper.combine (targetDirectory, name); ZipHelper.compress (PathHelper.combine (targetDirectory, "bin"), targetPath); diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx index ea01a756b..4a3e4ec74 100644 --- a/tools/CommandLineTools.hx +++ b/tools/CommandLineTools.hx @@ -1331,17 +1331,7 @@ class CommandLineTools { StringMapHelper.copyKeys (userDefines, project.haxedefs); - // Better way to do this? - - switch (project.target) { - - case ANDROID, IOS, BLACKBERRY: - - getBuildNumber (project, (project.command == "build" || project.command == "test")); - - default: - - } + getBuildNumber (project, (project.command == "build" || project.command == "test")); return project;