Merge pull request #1 from massiveinteractive/master

Bring my fork up-to-date

.gitignore

@@ -1 +1,7 @@
-.svn
+.svn
+haxe/tmp/
+report/
+bin/
+.DS_Store
+.mcover
+/mlib.sublime-workspace

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2011 Massive Interactive. All rights reserved.
+Copyright 2012 Massive Interactive. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are
 permitted provided that the following conditions are met:

build.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+
+mkdir -p bin
+
+#build tool
+echo ' build tool src'
+cd tool
+haxe build.hxml
+cd ../
+
+#neko mlib.n license
+
+#update allClasses imports
+neko mlib.n allClasses
+
+#compile libraries
+echo ' build haxe src'
+cd haxe
+haxe build.hxml
+
+echo ' build neko src'
+cd ../neko
+haxe build.hxml
+
+cd ../
+
+#run tests
+bash test.sh
+
+#package up and install over current version
+neko mlib.n install
+
+#neko mlib.n submit

haxe/.munit

@@ -1,5 +1,6 @@
-version=0.2.0.116
+version=0.9.5.2
 src=test
 bin=../bin
 report=../report/haxe
-hxml=test.hxml
+hxml=test.hxml
+classPaths=src

haxe/src/massive/haxe/AllClasses.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/src/massive/haxe/Exception.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/src/massive/haxe/log/ILogClient.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/src/massive/haxe/log/Log.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/src/massive/haxe/log/LogClient.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/src/massive/haxe/util/ReflectUtil.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/src/massive/haxe/util/RegExpUtil.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/src/massive/haxe/util/TemplateUtil.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

haxe/test.hxml

@@ -1,33 +1,33 @@
 # Flash 9+
 -main TestMain
+-lib munit
 -cp test
 -cp src
--lib munit
 -swf9 ../bin/haxe_test.swf
 
 --next
 
 #Flash 8
 -main TestMain
+-lib munit
 -cp test
 -cp src
--lib munit
 -swf ../bin/haxe8_test.swf
 
 --next
 
 # JavaScript
 -main TestMain
+-lib munit
 -cp test
 -cp src
--lib munit
 -js ../bin/haxe_test.js
 
 --next
 
 # Neko
 -main TestMain
+-lib munit
 -cp test
 -cp src
--lib munit
 -neko ../bin/haxe_test.n

haxe/test/TestMain.hx

@@ -1,55 +1,85 @@
+/*
+Copyright (c) 2012 Massive Interactive
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do 
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.
+*/
+
 import massive.munit.client.PrintClient;
+import massive.munit.client.RichPrintClient;
 import massive.munit.client.HTTPClient;
 import massive.munit.client.JUnitReportClient;
+import massive.munit.client.SummaryReportClient;
 import massive.munit.TestRunner;
 
 #if js
 import js.Lib;
 import js.Dom;
 #end
 
-
 /**
- * Auto generated Test Application.	
+ * Auto generated Test Application.
  * Refer to munit command line tool for more information (haxelib run munit)
  */
+class TestMain
+{
+    static function main(){	new TestMain(); }
+
+    public function new()
+    {
+        var suites = new Array<Class<massive.munit.TestSuite>>();
+        suites.push(TestSuite);
+
+        #if MCOVER
+            var client = new mcover.coverage.munit.client.MCoverPrintClient();
+            var httpClient = new HTTPClient(new mcover.coverage.munit.client.MCoverSummaryReportClient());
+        #else
+            var client = new RichPrintClient();
+            var httpClient = new HTTPClient(new SummaryReportClient());
+        #end
+
+        var runner:TestRunner = new TestRunner(client); 
+        runner.addResultClient(httpClient);
+        //runner.addResultClient(new HTTPClient(new JUnitReportClient()));
+
+        runner.completionHandler = completionHandler;
+        runner.run(suites);
+    }
 
-class TestMain 
-{		
-	static function main(){	new TestMain();}
-
-	public function new()
-	{
-		var suites = new Array<Class<massive.munit.TestSuite>>();
-		suites.push(TestSuite);
-
-		var runner:TestRunner = new TestRunner(new HTTPClient(new JUnitReportClient(), "http://localhost:2000"));	
-		runner.addResultClient(new PrintClient());
-		runner.completionHandler = completionHandler;
-		runner.run(suites);
-	}
-
-	/*
-		updates the background color and closes the current browser
-		for flash and html targets (useful for continous integration servers)
-	*/
-	private function completionHandler(successful:Bool):Void
-	{
-		try
-		{
-			#if flash
-				flash.external.ExternalInterface.call("testResult", successful);	
-			#elseif flash9
-				flash.external.ExternalInterface.call("testResult", successful);	
-			#elseif js
-				js.Lib.eval("testResult(" + successful + ");");
-			#elseif neko
-				neko.Sys.exit(0);
-			#end
-		}
-		// if run from outside browser can get error which we can ignore
-		catch (e:Dynamic)
-		{
-		}
-	}
-}
+    /*
+        updates the background color and closes the current browser
+        for flash and html targets (useful for continous integration servers)
+    */
+    function completionHandler(successful:Bool):Void
+    {
+        try
+        {
+            #if flash
+                flash.external.ExternalInterface.call("testResult", successful);
+            #elseif js
+                js.Lib.eval("testResult(" + successful + ");");
+            #elseif neko
+                neko.Sys.exit(0);
+            #end
+        }
+        // if run from outside browser can get error which we can ignore
+        catch (e:Dynamic)
+        {
+        }
+    }
+}

haxelib.xml

@@ -1,7 +1,9 @@
 <project name="mlib" url="https://github.com/massiveinteractive/MassiveLib" license="BSD">
 	<user name="massive"/>
-	<tag v="cross" />
 	<tag v="neko" />
-	<description>Massive Interactive public haXe libraries containing utilities and tools for developing simple command line driven neko and haxelib tools.</description>
-	<version name="0.3.0.2">Small internal change to HaxeWrapper to compile targets individually</version>
+	<tag v="sys" />
+	<tag v="haxelib" />
+	<tag v="massive" />
+	<description>Lightwieght framework for implementing command line driven haxelib (and neko) tools, and for automating the packaging/management of Haxelib libraries.</description>
+	<version name="0.4.3">Fix for HaxeWrapper and hxcpp errors (bug in nekovm)</version>
 </project>

mlib.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": "/"
+		}
+	]
+}

neko/.munit

@@ -1,5 +1,6 @@
-version=0.2.0.116
+version=0.9.5.2
 src=test
 bin=../bin
 report=../report/neko
-hxml=test.hxml
+hxml=test.hxml
+classPaths=src

neko/src/massive/neko/AllClasses.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

neko/src/massive/neko/cmd/Command.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

neko/src/massive/neko/cmd/CommandLineRunner.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:

neko/src/massive/neko/cmd/Console.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:
@@ -188,7 +188,13 @@ class Console
 	public function prompt(promptMsg:String, rpad:Int=0):String
 	{
 		neko.Lib.print(StringTools.rpad(promptMsg + " ", " ", rpad) + ": ");
-		var str:String = neko.io.File.stdin().readLine();
+
+		#if haxe_209
+			var str:String = Sys.stdin().readLine();
+		#else
+			var str:String = neko.io.File.stdin().readLine();
+		#end
+
 		if(str.length == 0)
 		{
 			str = null;

neko/src/massive/neko/cmd/ICommand.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2011 Massive Interactive. All rights reserved.
+* Copyright 2012 Massive Interactive. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met: