fix compilation to JS (used in vscode-checkstyle extension) (#379)

* fix compilation to JS (used in vscode-checkstyle extension) * remove fixed munit version
HaxeCheckstyle · Apr 16, 2018 · ed797c3 · ed797c3
1 parent 23f7ce0
commit ed797c3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ install:
   - haxelib install compiletime 2.6.0
   - haxelib install hxargs 3.0.2
   - haxelib install mcover 2.1.1
-  - haxelib install munit 2.2.1
+  - haxelib install munit
 script:
   - haxe buildAll.hxml
 

diff --git a/buildTest.hxml b/buildTest.hxml
@@ -1,6 +1,6 @@
 buildGlobal.hxml
 -lib mcover:2.1.1
--lib munit:2.2.1
+-lib munit
 -D unittest
 -x TestMain
 --macro mcover.MCover.coverage(['checkstyle'], ['src'], ['checkstyle.reporter', 'checkstyle.Main'])

diff --git a/gruntfile.js b/gruntfile.js
@@ -8,7 +8,7 @@ module.exports = function(grunt) {
                     "haxelib install hxargs 3.0.2 && " +
                     "haxelib install compiletime 2.6.0 && " +
                     "haxelib install mcover 2.1.1 && " +
-                    "haxelib install munit 2.2.1"
+                    "haxelib install munit"
             }
         },
 

diff --git a/src/checkstyle/Main.hx b/src/checkstyle/Main.hx
@@ -377,6 +377,7 @@ class Main {
 		if (SHOW_PROGRESS) ReporterManager.INSTANCE.addReporter(new ProgressReporter(files.length));
 		if (EXIT_CODE) ReporterManager.INSTANCE.addReporter(new ExitCodeReporter());
 
+		#if (neko || cpp)
 		if (disableThreads) {
 			checker.process(toProcess, excludesMap);
 		}
@@ -390,6 +391,9 @@ class Main {
 			while (!checkerPool.isFinished()) Sys.sleep(0.1);
 			ReporterManager.INSTANCE.finish();
 		}
+		#else
+		checker.process(toProcess, excludesMap);
+		#end
 	}
 
 	function traverse(path:String, files:Array<String>) {

diff --git a/src/checkstyle/reporter/ReporterManager.hx b/src/checkstyle/reporter/ReporterManager.hx
@@ -114,4 +114,12 @@ class ReporterManager {
 			message:step + " failed: " + e + "\nStacktrace: " + CallStack.toString(CallStack.exceptionStack())
 		};
 	}
-}
+}
+
+#if (!neko && !cpp)
+class Mutex {
+	public function new() {}
+	public function acquire() {}
+	public function release() {}
+}
+#end