Simplify default output directory
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
|
||||
@@ -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"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
|
||||
@@ -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"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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"));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -21,11 +21,11 @@ import sys.FileSystem;
|
||||
class WebOSPlatform extends PlatformTarget {
|
||||
|
||||
|
||||
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
|
||||
public function new (command:String, _project:HXProject, targetFlags:Map<String, String>) {
|
||||
|
||||
super (command, _project, targetFlags);
|
||||
|
||||
targetDirectory = project.app.path + "/webos/" + buildType;
|
||||
targetDirectory = project.app.path + "/webos";
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user