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

Make <app path=''/> and <splashScreen path='' /> relative to include.xml path

Browse Source
This commit is contained in:
Joshua Granick
2017-03-13 11:14:00 -07:00
parent ed13ffb865
commit 2414aa4fc6
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lime/project/ProjectXMLParser.hx
View File

@@ -368,7 +368,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseAppElement (element:Fast):Void {
private function parseAppElement (element:Fast, extensionPath:String):Void {
for (attribute in element.x.attributes ()) {
@@ -376,7 +376,7 @@ class ProjectXMLParser extends HXProject {
case "path":
app.path = substitute (element.att.path);
app.path = PathHelper.combine (extensionPath, substitute (element.att.path));
case "min-swf-version":
@@ -967,7 +967,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseOutputElement (element:Fast):Void {
private function parseOutputElement (element:Fast, extensionPath:String):Void {
if (element.has.name) {
@@ -977,7 +977,7 @@ class ProjectXMLParser extends HXProject {
if (element.has.path) {
app.path = substitute (element.att.path);
app.path = PathHelper.combine (extensionPath, substitute (element.att.path));
}
@@ -1267,7 +1267,7 @@ class ProjectXMLParser extends HXProject {
case "app":
parseAppElement (element);
parseAppElement (element, extensionPath);
case "java":
@@ -1294,7 +1294,7 @@ class ProjectXMLParser extends HXProject {
if (element.has.path) {
path = substitute (element.att.path);
path = PathHelper.combine (extensionPath, substitute (element.att.path));
}
@@ -1451,19 +1451,19 @@ class ProjectXMLParser extends HXProject {
case "launchImage", "splashscreen", "splashScreen":
var name:String = "";
var path = "";
if (element.has.path) {
name = substitute (element.att.path);
path = PathHelper.combine (extensionPath, substitute (element.att.path));
} else {
name = substitute (element.att.name);
path = PathHelper.combine (extensionPath, substitute (element.att.name));
}
var splashScreen = new SplashScreen (name);
var splashScreen = new SplashScreen (path);
if (element.has.width) {
@@ -1711,7 +1711,9 @@ class ProjectXMLParser extends HXProject {
case "output":
parseOutputElement (element);
// deprecated?
parseOutputElement (element, extensionPath);
case "section":