package changes.

doc/MakeRelease.bat

@@ -10,14 +10,28 @@ cd haxe-release\std
 
 haxe all.hxml
 cd tools
-haxe docview.hxml
-haxedoc ../flash.xml ../neko.xml ../js.xml
-mv index.html content ../../doc
-mv haxedoc.exe ../..
+
+rem ---------- BUILD TOOLS -----------
+
+cd haxedoc
+haxe haxedoc.hxml
+haxedoc ../../flash.xml ../../neko.xml ../../js.xml
+mv index.html content ../../../doc
+mv haxedoc.exe ../../..
+cd ..
+
+cd haxelib
+haxe haxelib.hxml
+mv haxelib.exe ../../..
+cd ..
+
+rem ---------- DONE -----------
+
 cd ..
 
 rm -rf CVS .cvsignore */CVS */.cvsignore */*/CVS */*/.cvsignore */*/*/CVS */*/*/.cvsignore
-rm -rf all.n all.js *.swf *.xml tools/haxedoc.n tools/index.html tools/content tools/haxedoc.exe
+rm -rf all.n all.js *.swf *.xml 
+rm -rf tools/haxedoc/haxedoc.n tools/haxedoc/index.html tools/haxedoc/content tools/haxedoc/haxedoc.exe
 rm -rf mt mtwin
 
 cd ..\..\..\..\neko\bin

std/haxe/ImportAll.hx

@@ -523,8 +523,6 @@ import neko.db.ResultSet;
 import neko.db.Sqlite;
 import neko.db.Transaction;
 
-import tools.DocView;
-
 #end
 
 #if js
@@ -535,3 +533,14 @@ import js.Dom;
 import js.XMLHttpRequest;
 
 #end
+
+// TOOLS
+
+#if neko
+
+import tools.haxedoc.Main;
+import tools.haxelib.Main;
+import tools.haxelib.Site;
+
+#end
+

std/tools/haxedoc/Main.hx

@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  */
-package tools;
+package tools.haxedoc;
 
 import neko.Lib;
 import neko.Web;
@@ -341,7 +341,7 @@ private enum DocEntry {
 	epackage( name : String, fullname : Array<String>, childs : Array<DocEntry> );
 }
 
-class DocView {
+class Main {
 
 	static var entries = new Array();
 
@@ -445,6 +445,8 @@ class DocView {
 					continue;
 				}
 				var l = Lambda.array(m.elements());
+				var last = l[l.length-1];
+				var doc = if( last == null || last.nodeName != "haxe:doc" ) null else docFormat(l.pop().firstChild().nodeValue);
 				var t = if( m.get("a") == null ) null else {
 					var names = m.get("a").split(":");
 					var params = Lambda.amap(names,function(name) {
@@ -456,6 +458,7 @@ class DocView {
 					tconstr(params);
 				}
 				var f = new DocField(m.nodeName,false,t,c);
+				f.doc = doc;
 				c.fields.push(f);
 			}
 		default:

std/tools/haxedoc/haxedoc.hxml

@@ -1,6 +1,6 @@
 #
 # compile DocView service
 #
--main tools.DocView
+-main tools.haxedoc.Main
 -neko haxedoc.n
 -cmd nekotools boot haxedoc.n

std/tools/haxelib/Datas.hx

@@ -1,4 +1,4 @@
-package tools.haxlib;
+package tools.haxelib;
 
 import neko.zip.File;
 
@@ -36,7 +36,7 @@ typedef XmlInfos = {
 class Datas {
 
 
-	static var XML = "haxlib.xml";
+	static var XML = "haxelib.xml";
 
 	public static var REPOSITORY = "files";
 	public static var alphanum = ~/^[A-Za-z0-9_.-]+$/;

std/tools/haxelib/Main.hx

@@ -1,6 +1,6 @@
-package tools.haxlib;
+package tools.haxelib;
 
-class SiteProxy extends haxe.remoting.Proxy<tools.haxlib.SiteApi> {
+class SiteProxy extends haxe.remoting.Proxy<tools.haxelib.SiteApi> {
 }
 
 class Progress extends neko.io.Output {

std/tools/haxelib/Site.hx

@@ -1,12 +1,12 @@
-package tools.haxlib;
-import tools.haxlib.SiteDb;
+package tools.haxelib;
+import tools.haxelib.SiteDb;
 
 class Site {
 
 	static var db : neko.db.Connection;
 
 	static var CWD = neko.Web.getCwd();
-	static var DB_FILE = CWD+"haxlib.db";
+	static var DB_FILE = CWD+"haxelib.db";
 	public static var TMP_DIR = CWD+"tmp";
 	public static var REP_DIR = CWD+Datas.REPOSITORY;
 

std/tools/haxelib/SiteApi.hx

@@ -1,6 +1,6 @@
-package tools.haxlib;
-import tools.haxlib.Datas;
-import tools.haxlib.SiteDb;
+package tools.haxelib;
+import tools.haxelib.Datas;
+import tools.haxelib.SiteDb;
 
 class SiteApi {
 

std/tools/haxelib/SiteDb.hx

@@ -1,4 +1,4 @@
-package tools.haxlib;
+package tools.haxelib;
 
 class User extends neko.db.Object {
 

std/tools/haxelib/haxelib.hxml

@@ -1,8 +1,8 @@
--main tools.haxlib.Site
+-main tools.haxelib.Site
 -neko index.n
 
 --next
 
--main tools.haxlib.Main
--neko haxlib.n
--cmd nekotools boot haxlib.n
+-main tools.haxelib.Main
+-neko haxelib.n
+-cmd nekotools boot haxelib.n