Tool fixes

HaxeFoundation · Mar 25, 2014 · 2ecbcba · 2ecbcba
1 parent c5f6c66
commit 2ecbcba
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+obj/
+bin/
diff --git a/run.n b/run.n
diff --git a/tools/run/BuildTool.hx b/tools/run/BuildTool.hx
@@ -6,7 +6,6 @@ import sys.FileSystem;
 import neko.vm.Thread;
 import neko.vm.Mutex;
 import neko.vm.Tls;
-import neko.vm.Tls;
 #else
 import cpp.vm.Thread;
 import cpp.vm.Mutex;
@@ -39,7 +38,8 @@ class BuildTool
    public static var compileCache:String;
    public static var targetKey:String;
    public static var instance:BuildTool;
-   static var printMutex:Mutex;
+   public static var helperThread = new Tls<Thread>();
+   public static var printMutex:Mutex;
    static var mVarMatch = new EReg("\\${(.*?)}","");
 
    public function new(inMakefile:String,inDefines:Hash<String>,inTargets:Array<String>,
@@ -162,7 +162,8 @@ class BuildTool
       if (target.mBuildDir!="")
       {
          restoreDir = Sys.getCwd();
-         LogManager.info("", "Enter \"" + target.mBuildDir + "\"");
+         Sys.println(target.mBuildDir);
+         LogManager.info("", "\x1b[1mChanging directory:\x1b[0m " + target.mBuildDir);
          Sys.setCwd(target.mBuildDir);
       }
 
@@ -307,7 +308,7 @@ class BuildTool
       if (target.mBuildDir!="")
       {
          restoreDir = Sys.getCwd();
-         LogManager.info("", "Enter \"" + target.mBuildDir + "\"");
+         LogManager.info("", "\x1b[1mChanging directory:\x1b[0m " + target.mBuildDir);
          Sys.setCwd(target.mBuildDir);
       }
 
@@ -568,10 +569,10 @@ class BuildTool
       }
       else if (isLinux)
       {
-         result = ProcessManager.runProcess("", "nproc", [], true, true, true);
+         result = ProcessManager.runProcess("", "nproc", []);
          if (result == null)
          {
-            var cpuinfo = ProcessManager.runProcess("", "cat", [ "/proc/cpuinfo" ], true, true, true);
+            var cpuinfo = ProcessManager.runProcess("", "cat", [ "/proc/cpuinfo" ]);
             if (cpuinfo != null)
             {      
                var split = cpuinfo.split("processor");
@@ -582,7 +583,7 @@ class BuildTool
       else if (isMac)
       {
          var cores = ~/Total Number of Cores: (\d+)/;
-         var output = ProcessManager.runProcess("", "/usr/sbin/system_profiler", [ "-detailLevel", "full", "SPHardwareDataType" ]);
+         var output = ProcessManager.runProcess("", "/usr/sbin/system_profiler", [ "-detailLevel", "full", "SPHardwareDataType" ], true, false);
          if (cores.match(output))
          {
             result = cores.matched(1); 
@@ -905,7 +906,7 @@ class BuildTool
 
       if (defines.exists("apple") && !defines.exists("DEVELOPER_DIR"))
       {
-         var developer_dir = ProcessManager.runProcess("", "xcode-select", ["--print-path"]);
+         var developer_dir = ProcessManager.runProcess("", "xcode-select", ["--print-path"], true, false);
          if (developer_dir == null || developer_dir == "" || developer_dir.indexOf ("Run xcode-select") > -1)
             developer_dir = "/Applications/Xcode.app/Contents/Developer";
          if (developer_dir == "/Developer")

diff --git a/tools/run/Compiler.hx b/tools/run/Compiler.hx
@@ -151,7 +151,7 @@ class Compiler
 
          if (inTid >= 0)
          {
-            ProcessManager.runProcess("", exe, args);
+            ProcessManager.runProcessThreaded("", exe, args);
          }
          else
          {
@@ -255,7 +255,7 @@ class Compiler
       var exe = split.shift ();
       args = split.concat (args);
 
-      var result = ProcessManager.runCommand("", exe, args, true, false, true);
+      var result = ProcessManager.runCommand("", exe, args);
       if (result!=0)
       {
          if (FileSystem.exists(pch_name))

diff --git a/tools/run/HLSL.hx b/tools/run/HLSL.hx
@@ -33,7 +33,7 @@ class HLSL
 
          LogManager.info("", exe + " " + args.join(" "));
 
-         var result = ProcessManager.runCommand("", exe, args);
+         var result = ProcessManager.runCommand("", exe, args, false);
          if (result!=0)
          {
             LogManager.error("Could not compile shader \"" + file + "\"");

diff --git a/tools/run/Linker.hx b/tools/run/Linker.hx
@@ -157,7 +157,7 @@ class Linker
                   var libObjs = Setup.readStdout(mExe, ["t", lib ]);
                   var objDir = inCompiler.mObjDir + "/" + libName;
                   PathManager.mkdir(objDir);
-                  ProcessManager.runCommand (objDir, mExe, ["x", lib], true, false, true);
+                  ProcessManager.runCommand (objDir, mExe, ["x", lib]);
                   for(obj in libObjs)
                      objs.push( objDir+"/"+obj );
                }
@@ -186,7 +186,7 @@ class Linker
          var exe = split.shift ();
          args = split.concat (args);
 
-         var result = ProcessManager.runCommand("", exe, args, true, false, true);
+         var result = ProcessManager.runCommand("", exe, args);
          if (result!=0)
          {
             Sys.exit(result);
@@ -196,7 +196,7 @@ class Linker
          if (mRanLib!="")
          {
             args = [out_name];
-            var result = ProcessManager.runCommand("", mRanLib, args, true, false, true);
+            var result = ProcessManager.runCommand("", mRanLib, args);
             if (result!=0)
             {
                Sys.exit(result);

diff --git a/tools/run/LogManager.hx b/tools/run/LogManager.hx
@@ -87,7 +87,7 @@ class LogManager
          }
       }
 
-      if (colorSupported)
+      if (true || colorSupported)
       {
          return output;
       }

diff --git a/tools/run/PathManager.hx b/tools/run/PathManager.hx
@@ -106,7 +106,7 @@ class PathManager
 
          try
          {
-            output = ProcessManager.runProcess(Sys.getEnv ("HAXEPATH"), "haxelib", [ "path", name ], true, true, true);  
+            output = ProcessManager.runProcess(Sys.getEnv ("HAXEPATH"), "haxelib", [ "path", name ]);  
          }
          catch (e:Dynamic) {}
 
@@ -198,10 +198,10 @@ class PathManager
 
             if (!directoryCache.exists (total))
             {
-               directoryCache.set(total, true);
+               //directoryCache.set(total, true);
                if (!FileSystem.exists(total))
                {
-                  LogManager.info("", " - \x1b[1mCreating directory:\x1b[0m " + total);
+                  LogManager.info("", "\x1b[1mCreating directory:\x1b[0m " + total);
                   FileSystem.createDirectory(total);
                }
             }
@@ -245,7 +245,7 @@ class PathManager
             catch (e:Dynamic) {}
          }
 
-         LogManager.info("", " - \x1b[1mRemoving directory:\x1b[0m " + directory);
+         LogManager.info("", "\x1b[1mRemoving directory:\x1b[0m " + directory);
 
          try
          {   
@@ -259,7 +259,7 @@ class PathManager
    {
       if (FileSystem.exists(file))
       {
-         LogManager.info("", " - \x1b[1mRemoving file:\x1b[0m " + file);
+         LogManager.info("", "\x1b[1mRemoving file:\x1b[0m " + file);
          FileSystem.deleteFile(file);
       }
    }
@@ -280,7 +280,7 @@ class PathManager
    }
 
    public static function standardize(path:String, trailingSlash:Bool = false):String
-   {   
+   {
       path = StringTools.replace (path, "\\", "/");
       path = StringTools.replace (path, "//", "/");
       path = StringTools.replace (path, "//", "/");