Fix command-line tools

include.xml

@@ -44,7 +44,7 @@
 	<target name="console-pc" handler="lime-console-pc" />
 	<haxelib name="lime-console-pc" if="console-pc" />
 	
-	<section if="hxp">
+	<section if="hxp" unless="lime-tools">
 		
 		<target name="air" path="tools/platforms/AIRPlatform.hx" />
 		<target name="android" path="tools/platforms/AndroidPlatform.hx" />

tools/CommandLineTools.hx

@@ -8,10 +8,10 @@ import haxe.Serializer;
 import haxe.Unserializer;
 import haxe.io.Path;
 import haxe.rtti.Meta;
+import hxp.helpers.*;
+import hxp.platforms.*;
+import hxp.project.*;
 import lime.system.CFFI;
-import lime.tools.helpers.*;
-import lime.tools.platforms.*;
-import lime.project.*;
 import sys.io.File;
 import sys.io.Process;
 import sys.FileSystem;
@@ -20,7 +20,7 @@ import utils.CreateTemplate;
 import utils.JavaExternGenerator;
 import utils.PlatformSetup;
 
-@:access(lime.project.HXProject)
+@:access(hxp.project.HXProject)
 
 
 class CommandLineTools {

tools/RunScript.hx

@@ -21,6 +21,13 @@ class RunScript {
 		
 		var limeDirectory = HaxelibHelper.getPath (new Haxelib ("lime"), true);
 		var toolsDirectory = PathHelper.combine (limeDirectory, "tools");
+		
+		if (!FileSystem.exists (toolsDirectory)) {
+			
+			toolsDirectory = PathHelper.combine (limeDirectory, "../tools");
+			
+		}
+		
 		/*var extendedToolsDirectory = HaxelibHelper.getPath (new Haxelib ("lime-extended"), false);
 		
 		if (extendedToolsDirectory != null && extendedToolsDirectory != "") {

tools/run.hxml

@@ -1,4 +1,3 @@
 -main RunScript
--cp ..
 -neko ../run.n
 -lib hxp

tools/svg.hxml

@@ -1,7 +1,7 @@
 -main SVGExport
 -neko ../svg.n
 -D lime
--cp ..
+-cp ../src
 -lib openfl
 -lib svg
 -D lime-cairo

tools/tools.hxml

@@ -3,7 +3,7 @@
 -D lime-curl
 -D lime-cffi
 -D lime
--cp ..
+-cp ../src
 -lib format
 -lib hxp
 #-lib svg

tools/utils/CreateTemplate.hx

@@ -1,15 +1,15 @@
 package utils;
 
 
-import lime.tools.helpers.FileHelper;
-import lime.tools.helpers.HaxelibHelper;
-import lime.tools.helpers.LogHelper;
-import lime.tools.helpers.PathHelper;
-import lime.project.Haxelib;
-import lime.project.HXProject;
+import hxp.helpers.FileHelper;
+import hxp.helpers.HaxelibHelper;
+import hxp.helpers.LogHelper;
+import hxp.helpers.PathHelper;
+import hxp.project.Haxelib;
+import hxp.project.HXProject;
 import sys.FileSystem;
 
-@:access(lime.project.HXProject)
+@:access(hxp.project.HXProject)
 
 
 class CreateTemplate {

tools/utils/JavaExternGenerator.hx

@@ -7,14 +7,14 @@ import haxe.io.Input;
 import haxe.io.Output;
 import haxe.io.Path;
 import haxe.zip.Reader;
-import lime.tools.helpers.PathHelper;
-import lime.tools.helpers.ProcessHelper;
+import hxp.helpers.PathHelper;
+import hxp.helpers.ProcessHelper;
+import hxp.project.HXProject;
 import sys.io.File;
 import sys.io.Process;
 import sys.FileSystem;
 import neko.Lib;
 import neko.zip.Compress;
-import lime.project.HXProject;
 
 
 class JavaExternGenerator

tools/utils/PlatformSetup.hx

@@ -5,18 +5,18 @@ import haxe.Http;
 import haxe.io.Eof;
 import haxe.io.Path;
 import haxe.zip.Reader;
-import lime.project.Haxelib;
-import lime.project.HXProject;
-import lime.project.Platform;
-import lime.project.Version;
-import lime.tools.helpers.CLIHelper;
-import lime.tools.helpers.ConfigHelper;
-import lime.tools.helpers.FileHelper;
-import lime.tools.helpers.HaxelibHelper;
-import lime.tools.helpers.LogHelper;
-import lime.tools.helpers.PathHelper;
-import lime.tools.helpers.PlatformHelper;
-import lime.tools.helpers.ProcessHelper;
+import hxp.helpers.CLIHelper;
+import hxp.helpers.ConfigHelper;
+import hxp.helpers.FileHelper;
+import hxp.helpers.HaxelibHelper;
+import hxp.helpers.LogHelper;
+import hxp.helpers.PathHelper;
+import hxp.helpers.PlatformHelper;
+import hxp.helpers.ProcessHelper;
+import hxp.project.Haxelib;
+import hxp.project.HXProject;
+import hxp.project.Platform;
+import hxp.project.Version;
 import sys.io.File;
 import sys.io.Process;
 import sys.FileSystem;