Updated to new toolchain

.gitignore

@@ -13,4 +13,3 @@ TestSuite.hx
 /lib/
 
 .haxelib
-/haxelib.json

.hvmrc

@@ -0,0 +1 @@
+HAXE=3.2.0

.munit

@@ -1,6 +1,6 @@
 version=0.9.4.1
-src=test
+src=src/test
 bin=bin/test
 report=bin/test-report
-hxml=test/targets.hxml
-classPaths=src
+hxml=arg/test.hxml
+classPaths=src/lib

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Massive Interactive
+Copyright (c) 2012-2015 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 

arg/example.hxml

@@ -0,0 +1,19 @@
+-main ConsoleExample
+-lib mconsole
+-cp src/example
+
+--each
+
+-js bin/example/javascript.js
+
+--next
+
+-swf bin/example/flash.swf
+
+--next
+
+-neko bin/example/neko.n
+
+--next
+
+-cpp bin/example/native

arg/haxelib.hxml

@@ -0,0 +1,4 @@
+-cp src/build
+--macro Haxelib.run()
+-lib mdk-core
+-D output=bin/haxelib

test/targets.hxml → arg/test.hxml

@@ -1,46 +1,42 @@
-# Flash 9+
 -main TestMain
 -lib munit
 -lib hamcrest
--cp src
--cp test
+-cp src/lib
+-cp src/test
 -swf-version 9
 -swf bin/test/as3_test.swf
 -debug
 
 --next
 
-# JavaScript
 -main TestMain
 -lib munit
 -lib hamcrest
--cp src
+-cp src/lib
 -debug
 
--cp test
+-cp src/test
 -js bin/test/js_test.js
 
 
 --next
 
-# Neko
 -main TestMain
 -lib munit
 -lib hamcrest
--cp src
+-cp src/lib
 -debug
 
--cp test
+-cp src/test
 -neko bin/test/neko_test.n
 
 
 --next
 
-# CPP
 -main TestMain
 -lib munit
 -lib hamcrest
--cp src
--cp test
+-cp src/lib
+-cp src/test
 -debug
 -cpp bin/test/cpp_test

haxelib.json

@@ -0,0 +1,19 @@
+{
+	"name": "minject",
+	"license": "MIT",
+	"tags": [
+		"cross",
+		"utility",
+		"massive",
+		"sys"
+	],
+	"classPath": "src/lib",
+	"description": "A cross platform Haxe implementation of the WebKit console API supporting logging, debugging and profiling. Currently supports AVM2, JS, C++ and Neko.",
+	"contributors": [
+		"massive"
+	],
+	"releasenote": "See https://github.com/massiveinteractive/mconsole/blob/master/doc/changes.md",
+	"version": "1.6.1",
+	"url": "https://github.com/massiveinteractive/mconsole",
+	"dependencies": {}
+}

mdk/info.json

@@ -0,0 +1,33 @@
+{
+	"name": "mconsole",
+	"version": "1.6.1",
+	"dependencies":
+	[
+		{
+			"name": "mcover",
+			"version": "^2.0.0",
+			"development": true
+		},
+		{
+			"name": "hamcrest",
+			"version": "^1.0.0",
+			"development": true
+		},
+		{
+			"name": "munit",
+			"version": "^2.0.0",
+			"development": true
+		},
+		{
+			"name": "hxcpp",
+			"version": "^3.1.0",
+			"source": "haxelib",
+			"development": true
+		},
+		{
+			"name": "mdk-core",
+			"version": "master",
+			"development": true
+		}
+	]
+}

mdk/lib.json

@@ -0,0 +1,13 @@
+{
+	"mlib": "2.0.2",
+	"msys": "1.2.2",
+	"mcover": "2.1.1",
+	"hamcrest": "1.2.1",
+	"msignal": "1.2.3",
+	"mconsole": "1.6.1",
+	"mcore": "1.3.13",
+	"mdk-core": "073c62f",
+	"mtask": "2.1.2",
+	"munit": "2.1.1",
+	"hxcpp": "3.2.102"
+}

src/build/Haxelib.hx

@@ -0,0 +1,28 @@
+// See the file "LICENSE" for the full license governing this code
+
+import sys.io.File;
+
+import haxe.Json;
+import haxe.macro.Context;
+
+import mdk.sys.SysApi;
+
+class Haxelib
+{
+	static function run()
+	{
+		var jsonPath = 'haxelib.json';
+
+		var json = Json.parse(File.getContent(jsonPath));
+		var info = Json.parse(File.getContent('mdk/info.json'));
+		json.version = info.version;
+		File.saveContent(jsonPath, Json.stringify(json, null, '\t') + '\n');
+
+		var path = Context.definedValue('output');
+		SysApi.createDirectory(path);
+		SysApi.copy('LICENSE', '$path/LICENSE');
+		SysApi.copy('src/lib', '$path/src/lib');
+		SysApi.copy(jsonPath, '$path/$jsonPath');
+		SysApi.zip(path, '$path.zip', '$path/');
+	}
+}