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

Add -dryrun flag for testing, improve the behavior of 'rebuild'

Browse Source
This commit is contained in:
Joshua Granick
2014-11-20 09:43:27 -08:00
parent 11a5eee0e9
commit 451a1ccc9a
6 changed files with 118 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/helpers/CPPHelper.hx
View File

@@ -14,6 +14,7 @@ class CPPHelper {
private static var rebuiltLibraries = new Map <String, Bool> ();
private static var rebuiltPaths = new Map <String, Bool> ();
public static function compile (project:HXProject, path:String, flags:Array<String> = null, buildFile:String = "Build.xml"):Void {
@@ -128,6 +129,7 @@ class CPPHelper {
var defines = StringMapHelper.copy (project.defines);
defines.set ("rebuild", 1);
var haxelibProject = HXProject.fromHaxelib (haxelib, defines);
if (haxelibProject == null) {
@@ -140,7 +142,13 @@ class CPPHelper {
StringMapHelper.copyKeys (project.targetFlags, haxelibProject.targetFlags);
rebuiltLibraries.set (haxelib.name, true);
rebuild (haxelibProject, commands);
if (!rebuiltPaths.exists (haxelibProject.config.get ("project.rebuild.path"))) {
rebuiltPaths.set (haxelibProject.config.get ("project.rebuild.path"), true);
rebuild (haxelibProject, commands);
}
}
@@ -198,7 +206,11 @@ class CPPHelper {
}
if (!FileSystem.exists (path)) return;
if (path == null || !FileSystem.exists (path)) {
return;
}
if (buildFile == null && project.config.exists ("project.rebuild.file")) {
@@ -208,7 +220,11 @@ class CPPHelper {
if (buildFile == null) buildFile = "Build.xml";
if (!FileSystem.exists (PathHelper.combine (path, buildFile))) return;
if (!FileSystem.exists (PathHelper.combine (path, buildFile))) {
return;
}
var args = [ "run", project.config.getString ("cpp.buildLibrary", "hxcpp"), buildFile ];