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

Merge pull request #1494 from player-03/include.hxp

Browse Source 
Add support for include.hxp.
This commit is contained in:
player-03
2023-04-16 14:02:27 -04:00
committed by GitHub
parent f07e94708b 83b39e9184
commit 16f96fadf7
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/lime/tools/HXProject.hx
View File

@@ -518,37 +518,48 @@ class HXProject extends Script
return HXProject.fromPath(path, userDefines);
}
public static function fromPath(path:String, userDefines:Map<String, Dynamic> = null):HXProject
public static function fromPath(directory:String, userDefines:Map<String, Dynamic> = null):HXProject
{
if (!FileSystem.exists(path) || !FileSystem.isDirectory(path))
if (!FileSystem.exists(directory) || !FileSystem.isDirectory(directory))
{
return null;
}
var files = ["include.lime", "include.nmml", "include.xml"];
var files = ["include.lime", "include.nmml", "include.xml", "include.hxp"];
var projectFile = null;
for (file in files)
{
if (projectFile == null && FileSystem.exists(Path.combine(path, file)))
if (FileSystem.exists(Path.combine(directory, file)))
{
projectFile = Path.combine(path, file);
projectFile = Path.combine(directory, file);
break;
}
}
var project = null;
if (projectFile != null)
{
var project = new ProjectXMLParser(projectFile, userDefines);
if (StringTools.endsWith(projectFile, ".hxp"))
{
var cwd = Sys.getCwd();
Sys.setCwd(directory);
project = HXProject.fromFile(projectFile, userDefines);
Sys.setCwd(cwd);
}
else
{
project = new ProjectXMLParser(projectFile, userDefines);
}
if (project.config.get("project.rebuild.path") == null)
{
project.config.set("project.rebuild.path", Path.combine(path, "project"));
project.config.set("project.rebuild.path", Path.combine(directory, "project"));
}
return project;
}
return null;
return project;
}
private function getHaxelibVersion(haxelib:Haxelib):String

2
tools/CommandLineTools.hx
View File

@@ -1180,7 +1180,7 @@ class CommandLineTools
if ((extension == "lime" && file != "include.lime")
|| (extension == "nmml" && file != "include.nmml")
|| (extension == "xml" && file != "include.xml")
|| extension == "hxp")
|| (extension == "hxp" && file != "include.hxp"))
{
matches.get(extension).push(path);
}