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

Fixing template ordering in hxp files

Browse Source
This commit is contained in:
Steven
2016-04-08 10:13:09 -07:00
committed by Joshua Granick
parent d0a14a1a2b
commit 2263fe2807
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lime/project/HXProject.hx
View File

@@ -445,6 +445,7 @@ class HXProject {
ProcessHelper.runCommand ("", "haxe", [ name, "-main", "lime.project.HXProject", "-cp", tempDirectory, "-neko", nekoOutput, "-cp", PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime")), "tools"), "-lib", "lime", "-D", "lime-curl", "-D", "native", "-D", "lime-native", "-D", "lime-cffi" ]); ProcessHelper.runCommand ("", "haxe", [ name, "-main", "lime.project.HXProject", "-cp", tempDirectory, "-neko", nekoOutput, "-cp", PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime")), "tools"), "-lib", "lime", "-D", "lime-curl", "-D", "native", "-D", "lime-native", "-D", "lime-cffi" ]);
ProcessHelper.runCommand ("", "neko", [ FileSystem.fullPath (nekoOutput), HXProject._command, name, Std.string (HXProject._target), Std.string (HXProject._debug), Serializer.run (HXProject._targetFlags), Serializer.run (HXProject._templatePaths), Serializer.run (HXProject._userDefines), temporaryFile ]); ProcessHelper.runCommand ("", "neko", [ FileSystem.fullPath (nekoOutput), HXProject._command, name, Std.string (HXProject._target), Std.string (HXProject._debug), Serializer.run (HXProject._targetFlags), Serializer.run (HXProject._templatePaths), Serializer.run (HXProject._userDefines), temporaryFile ]);
var tPaths:Array<String> = [];
try { try {
var outputPath = PathHelper.combine (tempDirectory, "output.dat"); var outputPath = PathHelper.combine (tempDirectory, "output.dat");
@@ -456,6 +457,10 @@ class HXProject {
unserializer.setResolver (cast { resolveEnum: Type.resolveEnum, resolveClass: resolveClass }); unserializer.setResolver (cast { resolveEnum: Type.resolveEnum, resolveClass: resolveClass });
project = unserializer.unserialize (); project = unserializer.unserialize ();
//Because the project file template paths need to take priority,
//Add them after loading template paths from haxelibs below
tPaths = project.templatePaths;
project.templatePaths = [];
} }
} catch (e:Dynamic) {} } catch (e:Dynamic) {}
@@ -468,7 +473,9 @@ class HXProject {
StringMapHelper.copyKeys (project.defines, defines); StringMapHelper.copyKeys (project.defines, defines);
processHaxelibs (project, defines); processHaxelibs (project, defines);
//Adding template paths from the Project file
project.templatePaths = ArrayHelper.concatUnique (project.templatePaths, tPaths, true);
} }
return project; return project;