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

Fix .bundle directory with include.xml

Browse Source
This commit is contained in:
Joshua Granick
2017-06-16 11:40:41 -07:00
parent d29e9dd4ee
commit 82b6e6576f
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lime/project/ProjectXMLParser.hx
View File

@@ -521,7 +521,7 @@ class ProjectXMLParser extends HXProject {
} }
if (!FileSystem.isDirectory (path) || Path.extension (path) == "bundle") { if (!FileSystem.isDirectory (path)) {
var asset = new Asset (path, targetPath, type, embed); var asset = new Asset (path, targetPath, type, embed);
asset.library = library; asset.library = library;
@@ -540,6 +540,31 @@ class ProjectXMLParser extends HXProject {
assets.push (asset); assets.push (asset);
} else if (Path.extension (path) == "bundle") {
var includePath = findIncludeFile (path);
if (includePath != null && includePath != "" && FileSystem.exists (includePath) && !FileSystem.isDirectory (includePath)) {
var includeProject = new ProjectXMLParser (includePath, defines);
merge (includeProject);
return;
} else {
var asset = new Asset (path, targetPath, type, embed);
asset.library = library;
if (element.has.id) {
asset.id = substitute (element.att.id);
}
assets.push (asset);
}
} else { } else {
var exclude = ".*|cvs|thumbs.db|desktop.ini|*.fla|*.hash"; var exclude = ".*|cvs|thumbs.db|desktop.ini|*.fla|*.hash";
@@ -706,20 +731,6 @@ class ProjectXMLParser extends HXProject {
private function parseAssetsElementDirectory (path:String, targetPath:String, include:String, exclude:String, type:AssetType, embed:Null<Bool>, library:String, glyphs:String, recursive:Bool):Void { private function parseAssetsElementDirectory (path:String, targetPath:String, include:String, exclude:String, type:AssetType, embed:Null<Bool>, library:String, glyphs:String, recursive:Bool):Void {
if (StringTools.endsWith (path, ".bundle")) {
var includePath = findIncludeFile (path);
if (includePath != null && includePath != "" && FileSystem.exists (includePath) && !FileSystem.isDirectory (includePath)) {
var includeProject = new ProjectXMLParser (includePath, defines);
merge (includeProject);
return;
}
}
var files = FileSystem.readDirectory (path); var files = FileSystem.readDirectory (path);
if (targetPath != "") { if (targetPath != "") {