From 5854cea2b96a2907e7ac1ba27bd984d77b9589d1 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 24 Aug 2017 15:56:38 -0700 Subject: [PATCH] Simplify default output directory --- lime/tools/platforms/AIRPlatform.hx | 2 +- lime/tools/platforms/AndroidPlatform.hx | 2 +- lime/tools/platforms/BlackBerryPlatform.hx | 4 ++-- lime/tools/platforms/EmscriptenPlatform.hx | 2 +- lime/tools/platforms/FirefoxPlatform.hx | 2 +- lime/tools/platforms/FlashPlatform.hx | 2 +- lime/tools/platforms/HTML5Platform.hx | 2 +- lime/tools/platforms/IOSPlatform.hx | 2 +- lime/tools/platforms/LinuxPlatform.hx | 2 +- lime/tools/platforms/MacPlatform.hx | 2 +- lime/tools/platforms/TVOSPlatform.hx | 2 +- lime/tools/platforms/TizenPlatform.hx | 2 +- lime/tools/platforms/WebOSPlatform.hx | 4 ++-- lime/tools/platforms/WindowsPlatform.hx | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lime/tools/platforms/AIRPlatform.hx b/lime/tools/platforms/AIRPlatform.hx index 4ca433e57..c529b5303 100644 --- a/lime/tools/platforms/AIRPlatform.hx +++ b/lime/tools/platforms/AIRPlatform.hx @@ -26,7 +26,7 @@ class AIRPlatform extends FlashPlatform { super (command, _project, targetFlags); - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("air.output-directory", "air/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("air.output-directory", "air")); targetPlatform = PlatformHelper.hostPlatform; targetPlatformType = DESKTOP; diff --git a/lime/tools/platforms/AndroidPlatform.hx b/lime/tools/platforms/AndroidPlatform.hx index 79c2a28ae..dd720f750 100644 --- a/lime/tools/platforms/AndroidPlatform.hx +++ b/lime/tools/platforms/AndroidPlatform.hx @@ -52,7 +52,7 @@ class AndroidPlatform extends PlatformTarget { } - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("android.output-directory", "android/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("android.output-directory", "android")); } diff --git a/lime/tools/platforms/BlackBerryPlatform.hx b/lime/tools/platforms/BlackBerryPlatform.hx index f6950091c..03aba0997 100644 --- a/lime/tools/platforms/BlackBerryPlatform.hx +++ b/lime/tools/platforms/BlackBerryPlatform.hx @@ -34,12 +34,12 @@ class BlackBerryPlatform extends PlatformTarget { if (!project.targetFlags.exists ("html5")) { - targetDirectory = project.app.path + "/blackberry/cpp/" + buildType; + targetDirectory = project.app.path + "/blackberry"; outputFile = targetDirectory + "/bin/" + PathHelper.safeFileName (project.app.file); } else { - targetDirectory = project.app.path + "/blackberry/html5/" + buildType; + targetDirectory = project.app.path + "/blackberry"; outputFile = targetDirectory + "/src/" + project.app.file + ".js"; } diff --git a/lime/tools/platforms/EmscriptenPlatform.hx b/lime/tools/platforms/EmscriptenPlatform.hx index 0328d0acd..defd23b40 100644 --- a/lime/tools/platforms/EmscriptenPlatform.hx +++ b/lime/tools/platforms/EmscriptenPlatform.hx @@ -29,7 +29,7 @@ class EmscriptenPlatform extends PlatformTarget { super (command, _project, targetFlags); - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("emscripten.output-directory", "emscripten/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("emscripten.output-directory", "emscripten")); outputFile = targetDirectory + "/bin/" + project.app.file + ".js"; } diff --git a/lime/tools/platforms/FirefoxPlatform.hx b/lime/tools/platforms/FirefoxPlatform.hx index 4f5e62ffd..779949f3f 100644 --- a/lime/tools/platforms/FirefoxPlatform.hx +++ b/lime/tools/platforms/FirefoxPlatform.hx @@ -42,7 +42,7 @@ class FirefoxPlatform extends HTML5Platform { private override function initialize (command:String, project:HXProject):Void { - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("firefox.output-directory", "firefox/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("firefox.output-directory", "firefox")); outputFile = targetDirectory + "/bin/" + project.app.file + ".js"; } diff --git a/lime/tools/platforms/FlashPlatform.hx b/lime/tools/platforms/FlashPlatform.hx index 2bafd6923..b04d1ec2e 100644 --- a/lime/tools/platforms/FlashPlatform.hx +++ b/lime/tools/platforms/FlashPlatform.hx @@ -37,7 +37,7 @@ class FlashPlatform extends PlatformTarget { super (command, _project, targetFlags); - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("flash.output-directory", "flash/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("flash.output-directory", "flash")); } diff --git a/lime/tools/platforms/HTML5Platform.hx b/lime/tools/platforms/HTML5Platform.hx index 6a76c305d..11072c249 100644 --- a/lime/tools/platforms/HTML5Platform.hx +++ b/lime/tools/platforms/HTML5Platform.hx @@ -116,7 +116,7 @@ class HTML5Platform extends PlatformTarget { private function initialize (command:String, project:HXProject):Void { - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("html5.output-directory", "html5/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("html5.output-directory", "html5")); outputFile = targetDirectory + "/bin/" + project.app.file + ".js"; } diff --git a/lime/tools/platforms/IOSPlatform.hx b/lime/tools/platforms/IOSPlatform.hx index 89d70d86b..1f6b37157 100644 --- a/lime/tools/platforms/IOSPlatform.hx +++ b/lime/tools/platforms/IOSPlatform.hx @@ -38,7 +38,7 @@ class IOSPlatform extends PlatformTarget { super (command, _project, targetFlags); - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("ios.output-directory", "ios/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("ios.output-directory", "ios")); } diff --git a/lime/tools/platforms/LinuxPlatform.hx b/lime/tools/platforms/LinuxPlatform.hx index bc7bd834e..be1783fdf 100644 --- a/lime/tools/platforms/LinuxPlatform.hx +++ b/lime/tools/platforms/LinuxPlatform.hx @@ -71,7 +71,7 @@ class LinuxPlatform extends PlatformTarget { } - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("linux.output-directory", "linux" + (is64 ? "64" : "") + (isRaspberryPi ? "-rpi" : "") + "/" + targetType + "/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("linux.output-directory", targetType == "cpp" ? "linux" : targetType)); targetDirectory = StringTools.replace (targetDirectory, "arch64", is64 ? "64" : ""); applicationDirectory = targetDirectory + "/bin/"; executablePath = PathHelper.combine (applicationDirectory, project.app.file); diff --git a/lime/tools/platforms/MacPlatform.hx b/lime/tools/platforms/MacPlatform.hx index 0beb133df..4575f5c8a 100644 --- a/lime/tools/platforms/MacPlatform.hx +++ b/lime/tools/platforms/MacPlatform.hx @@ -75,7 +75,7 @@ class MacPlatform extends PlatformTarget { } - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("mac.output-directory", "mac" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("mac.output-directory", targetType == "cpp" ? "macos" : targetType)); targetDirectory = StringTools.replace (targetDirectory, "arch64", is64 ? "64" : ""); applicationDirectory = targetDirectory + "/bin/" + project.app.file + ".app"; contentDirectory = applicationDirectory + "/Contents/Resources"; diff --git a/lime/tools/platforms/TVOSPlatform.hx b/lime/tools/platforms/TVOSPlatform.hx index 29aeee502..f632a477b 100644 --- a/lime/tools/platforms/TVOSPlatform.hx +++ b/lime/tools/platforms/TVOSPlatform.hx @@ -38,7 +38,7 @@ class TVOSPlatform extends PlatformTarget { super (command, _project, targetFlags); - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("tvos.output-directory", "tvos/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("tvos.output-directory", "tvos")); } diff --git a/lime/tools/platforms/TizenPlatform.hx b/lime/tools/platforms/TizenPlatform.hx index 2779262e7..2a1006cdd 100644 --- a/lime/tools/platforms/TizenPlatform.hx +++ b/lime/tools/platforms/TizenPlatform.hx @@ -28,7 +28,7 @@ class TizenPlatform extends PlatformTarget { super (command, _project, targetFlags); - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("tizen.output-directory", "tizen/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("tizen.output-directory", "tizen")); } diff --git a/lime/tools/platforms/WebOSPlatform.hx b/lime/tools/platforms/WebOSPlatform.hx index 8614603e2..81336fbab 100644 --- a/lime/tools/platforms/WebOSPlatform.hx +++ b/lime/tools/platforms/WebOSPlatform.hx @@ -21,11 +21,11 @@ import sys.FileSystem; class WebOSPlatform extends PlatformTarget { - public function new (command:String, _project:HXProject, targetFlags:Map ) { + public function new (command:String, _project:HXProject, targetFlags:Map) { super (command, _project, targetFlags); - targetDirectory = project.app.path + "/webos/" + buildType; + targetDirectory = project.app.path + "/webos"; } diff --git a/lime/tools/platforms/WindowsPlatform.hx b/lime/tools/platforms/WindowsPlatform.hx index 40c0dac9b..a44008e3a 100644 --- a/lime/tools/platforms/WindowsPlatform.hx +++ b/lime/tools/platforms/WindowsPlatform.hx @@ -68,7 +68,7 @@ class WindowsPlatform extends PlatformTarget { } - targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("windows.output-directory", "windows" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType)); + targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("windows.output-directory", targetType == "cpp" ? "windows" : targetType)); targetDirectory = StringTools.replace (targetDirectory, "arch64", is64 ? "64" : ""); applicationDirectory = targetDirectory + "/bin/"; executablePath = applicationDirectory + project.app.file + ".exe";