kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for overriding otarget output directory

Browse Source
This commit is contained in:
Joshua Granick
2017-06-19 16:29:13 -07:00
parent 22d02c2888
commit b40f82b6e7
13 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lime/project/ConfigData.hx
View File

@@ -362,7 +362,7 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
} }
public function parse (elem:Fast):Void { public function parse (elem:Fast, substitute:String->String = null):Void {
var bucket = this; var bucket = this;
var bucketType = ""; var bucketType = "";
@@ -386,21 +386,22 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
} }
parseAttributes (elem, bucket); parseAttributes (elem, bucket, substitute);
parseChildren (elem, bucket); parseChildren (elem, bucket, 0, substitute);
log ("> current config : " + this); log ("> current config : " + this);
} }
private function parseAttributes (elem:Fast, bucket:Dynamic):Void { private function parseAttributes (elem:Fast, bucket:Dynamic, substitute:String->String = null):Void {
for (attrName in elem.x.attributes ()) { for (attrName in elem.x.attributes ()) {
if (attrName != "type") { if (attrName != "type") {
var attrValue = elem.x.get (attrName); var attrValue = elem.x.get (attrName);
if (substitute != null) attrValue = substitute (attrValue);
setNode (bucket, attrName, attrValue); setNode (bucket, attrName, attrValue);
} }
@@ -410,7 +411,7 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
} }
private function parseChildren (elem:Fast, bucket:Dynamic, depth:Int = 0):Void { private function parseChildren (elem:Fast, bucket:Dynamic, depth:Int = 0, substitute:String->String = null):Void {
for (child in elem.elements) { for (child in elem.elements) {
@@ -437,19 +438,19 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
if (hasAttributes) { if (hasAttributes) {
parseAttributes (child, arrayBucket); parseAttributes (child, arrayBucket, substitute);
} }
if (hasChildren) { if (hasChildren) {
parseChildren (child, arrayBucket, d); parseChildren (child, arrayBucket, d, substitute);
} }
if (!hasChildren && !hasAttributes) { if (!hasChildren && !hasAttributes) {
parseValue (child, arrayBucket); parseValue (child, arrayBucket, substitute);
} }
@@ -457,7 +458,7 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
if (!hasChildren && !hasAttributes) { if (!hasChildren && !hasAttributes) {
parseValue (child, bucket); parseValue (child, bucket, substitute);
} else { } else {
@@ -465,13 +466,13 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
if (hasAttributes) { if (hasAttributes) {
parseAttributes (child, childBucket); parseAttributes (child, childBucket, substitute);
} }
if (hasChildren) { if (hasChildren) {
parseChildren (child, childBucket, d); parseChildren (child, childBucket, d, substitute);
} }
@@ -483,11 +484,13 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
} }
private function parseValue (elem:Fast, bucket:Dynamic):Void { private function parseValue (elem:Fast, bucket:Dynamic, substitute:String->String = null):Void {
if (elem.innerHTML != "") { if (elem.innerHTML != "") {
setNode (bucket, elem.name, elem.innerHTML); var value = elem.innerHTML;
if (substitute != null) value = substitute (value);
setNode (bucket, elem.name, value);
} }

24
lime/project/ProjectXMLParser.hx
View File

@@ -66,44 +66,53 @@ class ProjectXMLParser extends HXProject {
case MOBILE: case MOBILE:
defines.set ("platformType", "mobile");
defines.set ("mobile", "1"); defines.set ("mobile", "1");
case DESKTOP: case DESKTOP:
defines.set ("platformType", "desktop");
defines.set ("desktop", "1"); defines.set ("desktop", "1");
case WEB: case WEB:
defines.set ("platformType", "web");
defines.set ("web", "1"); defines.set ("web", "1");
case CONSOLE: case CONSOLE:
defines.set ("platformType", "console");
defines.set ("console", "1"); defines.set ("console", "1");
} }
if (targetFlags.exists ("neko")) { if (targetFlags.exists ("neko")) {
defines.set ("targetType", "neko");
defines.set ("native", "1"); defines.set ("native", "1");
defines.set ("neko", "1"); defines.set ("neko", "1");
} else if (targetFlags.exists ("java")) { } else if (targetFlags.exists ("java")) {
defines.set ("targetType", "java");
defines.set ("native", "1"); defines.set ("native", "1");
defines.set ("java", "1"); defines.set ("java", "1");
} else if (targetFlags.exists ("nodejs")) { } else if (targetFlags.exists ("nodejs")) {
defines.set ("targetType", "nodejs");
defines.set ("native", "1"); defines.set ("native", "1");
defines.set ("nodejs", "1"); defines.set ("nodejs", "1");
} else if (targetFlags.exists ("cs")) { } else if (targetFlags.exists ("cs")) {
defines.set ("targetType", "cs");
defines.set ("native", "1"); defines.set ("native", "1");
defines.set ("cs", "1"); defines.set ("cs", "1");
} else if (target == Platform.FIREFOX) { } else if (target == Platform.FIREFOX) {
defines.set ("targetType", "js");
defines.set ("html5", "1"); defines.set ("html5", "1");
} else if (platformType == DESKTOP && target != PlatformHelper.hostPlatform) { } else if (platformType == DESKTOP && target != PlatformHelper.hostPlatform) {
@@ -112,32 +121,42 @@ class ProjectXMLParser extends HXProject {
if (target == Platform.WINDOWS) { if (target == Platform.WINDOWS) {
defines.set ("targetType", "cpp");
defines.set ("cpp", "1"); defines.set ("cpp", "1");
defines.set ("mingw", "1"); defines.set ("mingw", "1");
} else { } else {
defines.set ("targetType", "neko");
defines.set ("neko", "1"); defines.set ("neko", "1");
} }
} else if (targetFlags.exists ("cpp") || ((platformType != PlatformType.WEB) && !targetFlags.exists ("html5")) || target == Platform.EMSCRIPTEN) { } else if (targetFlags.exists ("cpp") || ((platformType != PlatformType.WEB) && !targetFlags.exists ("html5")) || target == Platform.EMSCRIPTEN) {
defines.set ("targetType", "cpp");
defines.set ("native", "1"); defines.set ("native", "1");
defines.set ("cpp", "1"); defines.set ("cpp", "1");
} else if (target == Platform.FLASH) {
defines.set ("targetType", "swf");
} }
if (debug) { if (debug) {
defines.set ("buildType", "debug");
defines.set ("debug", "1"); defines.set ("debug", "1");
} else if (targetFlags.exists ("final")) { } else if (targetFlags.exists ("final")) {
defines.set ("buildType", "final");
defines.set ("final", "1"); defines.set ("final", "1");
} else { } else {
defines.set ("buildType", "release");
defines.set ("release", "1"); defines.set ("release", "1");
} }
@@ -156,6 +175,7 @@ class ProjectXMLParser extends HXProject {
defines.set (Std.string (target).toLowerCase (), "1"); defines.set (Std.string (target).toLowerCase (), "1");
defines.set ("target", Std.string (target).toLowerCase ()); defines.set ("target", Std.string (target).toLowerCase ());
defines.set ("platform", defines.get ("target"));
} }
@@ -2044,7 +2064,7 @@ class ProjectXMLParser extends HXProject {
case "config": case "config":
config.parse (element); config.parse (element, substitute);
case "prebuild": case "prebuild":
@@ -2058,7 +2078,7 @@ class ProjectXMLParser extends HXProject {
if (StringTools.startsWith (element.name, "config:")) { if (StringTools.startsWith (element.name, "config:")) {
config.parse (element); config.parse (element, substitute);
} }

2
lime/tools/platforms/AndroidPlatform.hx
View File

@@ -52,7 +52,7 @@ class AndroidPlatform extends PlatformTarget {
} }
targetDirectory = project.app.path + "/android/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("android.output-directory", "android/" + buildType));
} }

2
lime/tools/platforms/EmscriptenPlatform.hx
View File

@@ -29,7 +29,7 @@ class EmscriptenPlatform extends PlatformTarget {
super (command, _project, targetFlags); super (command, _project, targetFlags);
targetDirectory = project.app.path + "/emscripten/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("emscripten.output-directory", "emscripten/" + buildType));
outputFile = targetDirectory + "/bin/" + project.app.file + ".js"; outputFile = targetDirectory + "/bin/" + project.app.file + ".js";
} }

2
lime/tools/platforms/FirefoxPlatform.hx
View File

@@ -42,7 +42,7 @@ class FirefoxPlatform extends HTML5Platform {
private override function initialize (command:String, project:HXProject):Void { private override function initialize (command:String, project:HXProject):Void {
targetDirectory = project.app.path + "/firefox/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("firefox.output-directory", "firefox/" + buildType));
outputFile = targetDirectory + "/bin/" + project.app.file + ".js"; outputFile = targetDirectory + "/bin/" + project.app.file + ".js";
} }

2
lime/tools/platforms/FlashPlatform.hx
View File

@@ -37,7 +37,7 @@ class FlashPlatform extends PlatformTarget {
super (command, _project, targetFlags); super (command, _project, targetFlags);
targetDirectory = project.app.path + "/flash/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("flash.output-directory", "flash/" + buildType));
} }

2
lime/tools/platforms/HTML5Platform.hx
View File

@@ -110,7 +110,7 @@ class HTML5Platform extends PlatformTarget {
private function initialize (command:String, project:HXProject):Void { private function initialize (command:String, project:HXProject):Void {
targetDirectory = project.app.path + "/html5/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("html5.output-directory", "html5/" + buildType));
outputFile = targetDirectory + "/bin/" + project.app.file + ".js"; outputFile = targetDirectory + "/bin/" + project.app.file + ".js";
} }

2
lime/tools/platforms/IOSPlatform.hx
View File

@@ -38,7 +38,7 @@ class IOSPlatform extends PlatformTarget {
super (command, _project, targetFlags); super (command, _project, targetFlags);
targetDirectory = PathHelper.combine (project.app.path, "ios/" + buildType); targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("ios.output-directory", "ios/" + buildType));
} }

2
lime/tools/platforms/LinuxPlatform.hx
View File

@@ -71,7 +71,7 @@ class LinuxPlatform extends PlatformTarget {
} }
targetDirectory = project.app.path + "/linux" + (is64 ? "64" : "") + (isRaspberryPi ? "-rpi" : "") + "/" + targetType + "/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("linux.output-directory", "linux" + (is64 ? "64" : "") + (isRaspberryPi ? "-rpi" : "") + "/" + targetType + "/" + buildType));
applicationDirectory = targetDirectory + "/bin/"; applicationDirectory = targetDirectory + "/bin/";
executablePath = PathHelper.combine (applicationDirectory, project.app.file); executablePath = PathHelper.combine (applicationDirectory, project.app.file);

2
lime/tools/platforms/MacPlatform.hx
View File

@@ -75,7 +75,7 @@ class MacPlatform extends PlatformTarget {
} }
targetDirectory = project.app.path + "/mac" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("mac.output-directory", "mac" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType));
applicationDirectory = targetDirectory + "/bin/" + project.app.file + ".app"; applicationDirectory = targetDirectory + "/bin/" + project.app.file + ".app";
contentDirectory = applicationDirectory + "/Contents/Resources"; contentDirectory = applicationDirectory + "/Contents/Resources";
executableDirectory = applicationDirectory + "/Contents/MacOS"; executableDirectory = applicationDirectory + "/Contents/MacOS";

2
lime/tools/platforms/TVOSPlatform.hx
View File

@@ -38,7 +38,7 @@ class TVOSPlatform extends PlatformTarget {
super (command, _project, targetFlags); super (command, _project, targetFlags);
targetDirectory = PathHelper.combine (project.app.path, "tvos/" + buildType); targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("tvos.output-directory", "tvos/" + buildType));
} }

2
lime/tools/platforms/TizenPlatform.hx
View File

@@ -28,7 +28,7 @@ class TizenPlatform extends PlatformTarget {
super (command, _project, targetFlags); super (command, _project, targetFlags);
targetDirectory = project.app.path + "/tizen/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("tizen.output-directory", "tizen/" + buildType));
} }

2
lime/tools/platforms/WindowsPlatform.hx
View File

@@ -68,7 +68,7 @@ class WindowsPlatform extends PlatformTarget {
} }
targetDirectory = project.app.path + "/windows" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType; targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("windows.output-directory", "windows" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType));
applicationDirectory = targetDirectory + "/bin/"; applicationDirectory = targetDirectory + "/bin/";
executablePath = applicationDirectory + project.app.file + ".exe"; executablePath = applicationDirectory + project.app.file + ".exe";