Squashed commit of the following:

commit 5405e64
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Tue Mar 5 22:02:09 2013 +1100

    added back support for haxe210

commit cd11fa7
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Mon Feb 25 22:21:29 2013 +1100

    Fixed issue with hxml no longer supporting -swf9

commit b85dcc3
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Mon Feb 25 09:18:57 2013 +1100

    updated neko runner

commit b232135
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Mon Feb 18 21:36:34 2013 +1100

    Removed old js.Dom imports from TestMain

commit 8db7c6d
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Mon Feb 18 10:25:38 2013 +1100

    Fixed mlib tests in haxe3

commit 4723139
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Sun Feb 17 10:21:26 2013 +1100

    Updated package references in docs, incremented haxelib version

commit d2a62cb
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Sun Feb 17 10:18:05 2013 +1100

    renamed 'neko' subproject to sys. verified compilation/local installation of mliv CLI using self

commit fe95b31
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Sun Feb 17 09:56:42 2013 +1100

    Compiling build tool on haxe3

commit 1abe40d
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Sat Feb 16 17:01:33 2013 +1100

    updated neko paths to sys or haxe paths where appropriate

commit 15a7857
Author: Dominic De Lorenzo <dom@misprintt.net>
Date:   Sat Feb 16 16:50:40 2013 +1100

    renamed massive.neko to massive.sys

commit be53625
Author: Jason O'Neil <jason.oneil@gmail.com>
Date:   Tue Dec 25 14:53:59 2012 +0800

    After adding `neko mlib.n install` the licence headers were

    re-inserted

commit 3b903d2
Author: Jason O'Neil <jason.oneil@gmail.com>
Date:   Tue Dec 25 14:49:46 2012 +0800

    Made changes to Log.hx and File.hx to compile with Haxe3

    Basic changes

     * Switch on enums use only 'value', not 'Enum.value'

    Then I ran "./build.sh" and all other changes were a result of that.

commit d526a59
Author: Jason O'Neil <jason.oneil@gmail.com>
Date:   Tue Dec 25 14:40:13 2012 +0800

    Made build script executable

commit 4473ed4
Merge: 7b0fcee afa394b
Author: Jason O'Neil <jason.oneil@gmail.com>
Date:   Mon Dec 24 22:34:16 2012 -0800

    Merge pull request #1 from massiveinteractive/master

    Bring my fork up-to-date

.gitignore

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

.mlib

@@ -1,7 +1,7 @@
 <mlib bin="bin">
 	<resources>
 		<resource type="src" path="haxe/src" dest="" />
-		<resource type="src" path="neko/src" dest="" />
+		<resource type="src" path="sys/src" dest="" />
 		<resource type="src" path="tool/src" dest="" />
 		<resource type="run" path="mlib.n" />
 		<resource type="license" path="resource/license.mtt" />

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2012 Massive Interactive. All rights reserved.
+Copyright 2013 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:

README.md

@@ -18,30 +18,30 @@ mlib provides a lightweight command based structure for rapidly developing comma
 Mlib includes several haxe and neko src packages:
 
 *	massive.haxe (cross platform haxe APIs)
-*	massive.neko (neko specific APIs for file access, command line, haxe and haxelib integration)
+*	massive.sys (neko specific APIs for file access, command line, haxe and haxelib integration)
 *	massive.mlib (command line tool (mlib) for managing development and deployment of haxelib projects)
 
 
 ### Feature highlights
 
 **Expanded File APIs**
 
-See [massive.neko.io.File](https://github.com/massiveinteractive/MassiveLib/blob/master/neko/src/massive/neko/io/File.hx)
+See [massive.sys.io.File](https://github.com/massiveinteractive/MassiveLib/blob/master/sys/src/massive/sys/io/File.hx)
 
 *	recursive dir copy/move/delete
 *	platform safe resolution of file paths
 
 
 **Simplified access to command line**
 
-See  [massive.neko.cmd.Console](https://github.com/massiveinteractive/MassiveLib/blob/master/neko/src/massive/neko/cmd/Console.hx)
+See  [massive.sys.cmd.Console](https://github.com/massiveinteractive/MassiveLib/blob/master/sys/src/massive/sys/cmd/Console.hx)
 
 *	separation of raw system arg into arguments ('foo') and options (-foo bar)
 *	automatic detection and updating of working directory when running in haxelib libraries
 *	convenience methods for prompting user input
 
 **Command line tool runner**
-See [massive.neko.cmd.CommandLineRunner](https://github.com/massiveinteractive/MassiveLib/blob/master/neko/src/massive/neko/cmd/CommandLineRunner.hx)
+See [massive.sys.cmd.CommandLineRunner](https://github.com/massiveinteractive/MassiveLib/blob/master/sys/src/massive/sys/cmd/CommandLineRunner.hx)
 
 *	lightweight interface for mapping command line arguments to Command classes
 *	automatic generation of command line *help* and command and  

build.sh

@@ -20,7 +20,7 @@ cd haxe
 haxe build.hxml
 
 echo ' build neko src'
-cd ../neko
+cd ../sys
 haxe build.hxml
 
 cd ../

haxe/build.hxml

@@ -1,14 +1,15 @@
 # Flash 9+
 -main massive.haxe.AllClasses
 -cp src
--swf9 ../bin/haxe_all.swf
+-swf ../bin/haxe_all.swf
 
 --next
 
 #Flash 8
 -main massive.haxe.AllClasses
 -cp src
 -swf ../bin/haxe8_all.swf
+-swf-version 8
 
 --next
 

haxe/src/massive/haxe/AllClasses.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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:
@@ -50,8 +50,8 @@ class LogClient implements ILogClient
 			msg = Std.string(level) + ": " + message;
 		}
 
-		#if neko
-		neko.Lib.println(msg);
+		#if sys
+		Sys.println(msg);
 		#else
 		trace(msg);
 		#end

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

@@ -1,5 +1,5 @@
 /****
-* Copyright 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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

@@ -3,16 +3,8 @@
 -lib munit
 -cp test
 -cp src
--swf9 ../bin/haxe_test.swf
-
---next
-
-#Flash 8
--main TestMain
--lib munit
--cp test
--cp src
--swf ../bin/haxe8_test.swf
+-swf ../bin/haxe_test.swf
+-swf-version 11
 
 --next
 

haxe/test/TestMain.hx

@@ -29,7 +29,6 @@ import massive.munit.TestRunner;
 
 #if js
 import js.Lib;
-import js.Dom;
 #end
 
 /**
@@ -73,8 +72,8 @@ class TestMain
                 flash.external.ExternalInterface.call("testResult", successful);
             #elseif js
                 js.Lib.eval("testResult(" + successful + ");");
-            #elseif neko
-                neko.Sys.exit(0);
+            #elseif sys
+                Sys.exit(0);
             #end
         }
         // if run from outside browser can get error which we can ignore

haxelib.xml

@@ -4,6 +4,6 @@
 	<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>
+	<description>Lightweight framework for implementing command line driven haxelib (and neko) tools, and for automating the packaging/management of Haxelib libraries.</description>
+	<version name="2.0.0">Updated for Haxe 3.</version>
 </project>

neko/.munit → sys/.munit

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

sys/build.hxml

@@ -0,0 +1,5 @@
+# Neko
+-main massive.sys.AllClasses
+-cp src
+-cp ../haxe/src
+-neko ../bin/sys_all.n

neko/src/massive/neko/AllClasses.hx → sys/src/massive/AllClasses.hx

@@ -1,5 +1,5 @@
 /****
-* Copyright 2012 Massive Interactive. All rights reserved.
+* Copyright 2013 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:
@@ -27,7 +27,7 @@
 * 
 ****/
 
-package massive.neko;
+package massive;
 
 import massive.neko.cmd.Command;
 import massive.neko.cmd.CommandLineRunner;
@@ -41,6 +41,19 @@ import massive.neko.io.FileException;
 import massive.neko.io.FileSys;
 import massive.neko.util.PathUtil;
 import massive.neko.util.ZipUtil;
+import massive.sys.AllClasses;
+import massive.sys.cmd.Command;
+import massive.sys.cmd.CommandLineRunner;
+import massive.sys.cmd.Console;
+import massive.sys.cmd.ICommand;
+import massive.sys.haxe.HaxeWrapper;
+import massive.sys.haxelib.Haxelib;
+import massive.sys.haxelib.HaxelibTools;
+import massive.sys.io.File;
+import massive.sys.io.FileException;
+import massive.sys.io.FileSys;
+import massive.sys.util.PathUtil;
+import massive.sys.util.ZipUtil;
 
 @IgnoreCover
 class AllClasses

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

@@ -0,0 +1,32 @@
+/****
+* Copyright 2013 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:
+* 
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+* 
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+* 
+* THIS SOFTWARE IS PROVIDED BY MASSIVE INTERACTIVE "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MASSIVE INTERACTIVE OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of Massive Interactive.
+* 
+****/
+
+package massive.neko.cmd;
+
+typedef Command = massive.sys.cmd.Command;

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

@@ -0,0 +1,34 @@
+/****
+* Copyright 2013 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:
+* 
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+* 
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+* 
+* THIS SOFTWARE IS PROVIDED BY MASSIVE INTERACTIVE "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MASSIVE INTERACTIVE OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of Massive Interactive.
+* 
+****/
+
+package massive.neko.cmd;
+
+typedef CommandLineRunner = massive.sys.cmd.CommandLineRunner;
+typedef CommandDef = massive.sys.cmd.CommandLineRunner.CommandDef;
+

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

@@ -0,0 +1,32 @@
+/****
+* Copyright 2013 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:
+* 
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+* 
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+* 
+* THIS SOFTWARE IS PROVIDED BY MASSIVE INTERACTIVE "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MASSIVE INTERACTIVE OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of Massive Interactive.
+* 
+****/
+
+package massive.neko.cmd;
+
+typedef Console = massive.sys.cmd.Console;