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

Improve 'lime display' when templates have not been processed

Browse Source
This commit is contained in:
Joshua Granick
2019-02-26 14:01:45 -08:00
parent 2fd940239f
commit 44bf137f9b
12 changed files with 239 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/platforms/WindowsPlatform.hx
View File

@@ -1,8 +1,11 @@
package;
import hxp.Haxelib;
import hxp.HXML;
import hxp.Log;
import hxp.Path;
import hxp.NDLL;
import haxe.Template;
import hxp.System;
import lime.tools.Architecture;
import lime.tools.Asset;
import lime.tools.AssetHelper;
@@ -10,25 +13,18 @@ import lime.tools.AssetType;
import lime.tools.CPPHelper;
import lime.tools.CSHelper;
import lime.tools.DeploymentHelper;
import hxp.System;
import lime.tools.GUID;
import hxp.Haxelib;
import lime.tools.HTML5Helper;
import lime.tools.HXProject;
import lime.tools.Icon;
import lime.tools.IconHelper;
import lime.tools.JavaHelper;
import hxp.Log;
import lime.tools.ModuleHelper;
import lime.tools.NekoHelper;
import lime.tools.NodeJSHelper;
import hxp.Path;
import lime.tools.Platform;
import hxp.System;
import lime.tools.PlatformTarget;
import hxp.System;
import lime.tools.HXProject;
import lime.tools.ProjectHelper;
import hxp.System;
import sys.io.File;
import sys.FileSystem;
@@ -420,13 +416,27 @@ class WindowsPlatform extends PlatformTarget
private function getDisplayHXML():String
{
var hxml = System.findTemplate(project.templatePaths, targetType + "/hxml/" + buildType + ".hxml");
var template = new Template(File.getContent(hxml));
var path = targetDirectory + "/haxe/" + buildType + ".hxml";
var context = generateContext();
context.OUTPUT_DIR = targetDirectory;
return template.execute(context);
if (FileSystem.exists(path))
{
return File.getContent(path);
}
else
{
var context = project.templateContext;
var hxml = new HXML();
hxml.noOutput = true;
switch (targetType)
{
case "hl": hxml.hl = "_.hl";
case "neko": hxml.neko = "_.n";
case "java": hxml.java = "_";
case "nodejs", "winjs": hxml.js = "_.js";
default: hxml.cpp = "_";
}
return context.HAXE_FLAGS + "\n" + hxml.toString();
}
}
public override function rebuild():Void