diff --git a/tools/project/ApplicationData.hx b/lime/project/ApplicationData.hx similarity index 91% rename from tools/project/ApplicationData.hx rename to lime/project/ApplicationData.hx index cc71b469c..5dbd44d8c 100644 --- a/tools/project/ApplicationData.hx +++ b/lime/project/ApplicationData.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; typedef ApplicationData = { diff --git a/tools/project/Architecture.hx b/lime/project/Architecture.hx similarity index 77% rename from tools/project/Architecture.hx rename to lime/project/Architecture.hx index 89b8974f7..d2d05ed3b 100644 --- a/tools/project/Architecture.hx +++ b/lime/project/Architecture.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; enum Architecture { diff --git a/tools/project/Asset.hx b/lime/project/Asset.hx similarity index 92% rename from tools/project/Asset.hx rename to lime/project/Asset.hx index bb2bfff34..9b987b46b 100644 --- a/tools/project/Asset.hx +++ b/lime/project/Asset.hx @@ -1,12 +1,12 @@ -package project; +package lime.project; import haxe.io.Path; -import helpers.FileHelper; -import helpers.ObjectHelper; -import helpers.StringHelper; -import helpers.PathHelper; -import project.AssetType; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.ObjectHelper; +import lime.tools.helpers.StringHelper; +import lime.tools.helpers.PathHelper; +import lime.project.AssetType; import sys.FileSystem; diff --git a/tools/project/AssetEncoding.hx b/lime/project/AssetEncoding.hx similarity index 65% rename from tools/project/AssetEncoding.hx rename to lime/project/AssetEncoding.hx index 7dd87b50e..b23c5a698 100644 --- a/tools/project/AssetEncoding.hx +++ b/lime/project/AssetEncoding.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; enum AssetEncoding { diff --git a/tools/project/AssetType.hx b/lime/project/AssetType.hx similarity index 79% rename from tools/project/AssetType.hx rename to lime/project/AssetType.hx index 748939255..cd4e1b040 100644 --- a/tools/project/AssetType.hx +++ b/lime/project/AssetType.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; enum AssetType { diff --git a/tools/project/Command.hx b/lime/project/Command.hx similarity index 80% rename from tools/project/Command.hx rename to lime/project/Command.hx index dd01869f4..4ee42eac1 100644 --- a/tools/project/Command.hx +++ b/lime/project/Command.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; enum Command { diff --git a/tools/project/ConfigData.hx b/lime/project/ConfigData.hx similarity index 99% rename from tools/project/ConfigData.hx rename to lime/project/ConfigData.hx index e70b93c8d..2743461f4 100644 --- a/tools/project/ConfigData.hx +++ b/lime/project/ConfigData.hx @@ -1,9 +1,9 @@ -package project; +package lime.project; import haxe.xml.Fast; -import helpers.LogHelper; -import helpers.ObjectHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.ObjectHelper; abstract ConfigData(Dynamic) to Dynamic from Dynamic { diff --git a/tools/project/Dependency.hx b/lime/project/Dependency.hx similarity index 92% rename from tools/project/Dependency.hx rename to lime/project/Dependency.hx index dd3837d40..5a207dbf5 100644 --- a/tools/project/Dependency.hx +++ b/lime/project/Dependency.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; class Dependency { diff --git a/tools/project/HXProject.hx b/lime/project/HXProject.hx similarity index 97% rename from tools/project/HXProject.hx rename to lime/project/HXProject.hx index 42ac70f02..b25dacc02 100644 --- a/tools/project/HXProject.hx +++ b/lime/project/HXProject.hx @@ -1,25 +1,25 @@ -package project; +package lime.project; import haxe.io.Path; import haxe.Json; import haxe.Serializer; import haxe.Unserializer; -import helpers.ArrayHelper; -import helpers.CompatibilityHelper; -import helpers.LogHelper; -import helpers.ObjectHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.StringHelper; -import helpers.StringMapHelper; -import project.AssetType; +import lime.tools.helpers.ArrayHelper; +import lime.tools.helpers.CompatibilityHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.ObjectHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.StringHelper; +import lime.tools.helpers.StringMapHelper; +import lime.project.AssetType; import sys.FileSystem; import sys.io.File; #if (lime && !lime_legacy) -import helpers.FileHelper; -import helpers.ProcessHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.ProcessHelper; import lime.graphics.Font; import sys.io.Process; @:access(lime.graphics.Font) @@ -58,12 +58,12 @@ class HXProject { public var targetHandlers:Map ; public var templateContext (get_templateContext, null):Dynamic; public var templatePaths:Array ; - @:isVar public var window (get, set):Window; - public var windows:Array ; + @:isVar public var window (get, set):WindowData; + public var windows:Array ; private var defaultApp:ApplicationData; private var defaultMeta:MetaData; - private var defaultWindow:Window; + private var defaultWindow:WindowData; public static var _command:String; public static var _debug:Bool; @@ -1210,7 +1210,7 @@ class HXProject { } - private function get_window ():Window { + private function get_window ():WindowData { if (windows != null) { @@ -1225,7 +1225,7 @@ class HXProject { } - private function set_window (value:Window):Window { + private function set_window (value:WindowData):WindowData { if (windows != null) { diff --git a/tools/project/Haxelib.hx b/lime/project/Haxelib.hx similarity index 93% rename from tools/project/Haxelib.hx rename to lime/project/Haxelib.hx index f8656a485..81c757fe4 100644 --- a/tools/project/Haxelib.hx +++ b/lime/project/Haxelib.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; class Haxelib { diff --git a/tools/project/Icon.hx b/lime/project/Icon.hx similarity index 94% rename from tools/project/Icon.hx rename to lime/project/Icon.hx index 3edc14c18..b674ff669 100644 --- a/tools/project/Icon.hx +++ b/lime/project/Icon.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; class Icon { diff --git a/tools/project/Keystore.hx b/lime/project/Keystore.hx similarity index 97% rename from tools/project/Keystore.hx rename to lime/project/Keystore.hx index ec240748f..26a69042a 100644 --- a/tools/project/Keystore.hx +++ b/lime/project/Keystore.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; class Keystore { diff --git a/tools/project/Library.hx b/lime/project/Library.hx similarity index 97% rename from tools/project/Library.hx rename to lime/project/Library.hx index 1bc54918f..06ccad052 100644 --- a/tools/project/Library.hx +++ b/lime/project/Library.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; import haxe.io.Path; diff --git a/tools/project/MetaData.hx b/lime/project/MetaData.hx similarity index 92% rename from tools/project/MetaData.hx rename to lime/project/MetaData.hx index cac18d40b..6c2425dcc 100644 --- a/tools/project/MetaData.hx +++ b/lime/project/MetaData.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; typedef MetaData = { diff --git a/tools/project/NDLL.hx b/lime/project/NDLL.hx similarity index 96% rename from tools/project/NDLL.hx rename to lime/project/NDLL.hx index 7ee62800b..1e6503e36 100644 --- a/tools/project/NDLL.hx +++ b/lime/project/NDLL.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; import sys.FileSystem; diff --git a/tools/project/NDLLType.hx b/lime/project/NDLLType.hx similarity index 67% rename from tools/project/NDLLType.hx rename to lime/project/NDLLType.hx index 78c66ad07..8803f992e 100644 --- a/tools/project/NDLLType.hx +++ b/lime/project/NDLLType.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; enum NDLLType { diff --git a/tools/project/Orientation.hx b/lime/project/Orientation.hx similarity index 72% rename from tools/project/Orientation.hx rename to lime/project/Orientation.hx index aa3a80ad7..51da597e7 100644 --- a/tools/project/Orientation.hx +++ b/lime/project/Orientation.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; enum Orientation { diff --git a/tools/project/Platform.hx b/lime/project/Platform.hx similarity index 93% rename from tools/project/Platform.hx rename to lime/project/Platform.hx index d2ba29e06..e47edf77e 100644 --- a/tools/project/Platform.hx +++ b/lime/project/Platform.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; @:enum abstract Platform(String) { diff --git a/tools/project/PlatformTarget.hx b/lime/project/PlatformTarget.hx similarity index 97% rename from tools/project/PlatformTarget.hx rename to lime/project/PlatformTarget.hx index 3acd3b56b..ddd8b68fa 100644 --- a/tools/project/PlatformTarget.hx +++ b/lime/project/PlatformTarget.hx @@ -1,9 +1,9 @@ -package project; +package lime.project; import haxe.rtti.Meta; -import helpers.AssetHelper; -import helpers.LogHelper; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.LogHelper; class PlatformTarget { diff --git a/tools/project/PlatformType.hx b/lime/project/PlatformType.hx similarity index 72% rename from tools/project/PlatformType.hx rename to lime/project/PlatformType.hx index daf5d3dfd..9f3bfde77 100644 --- a/tools/project/PlatformType.hx +++ b/lime/project/PlatformType.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; enum PlatformType { diff --git a/tools/project/ProjectXMLParser.hx b/lime/project/ProjectXMLParser.hx similarity index 98% rename from tools/project/ProjectXMLParser.hx rename to lime/project/ProjectXMLParser.hx index 710370382..fa43ffec5 100644 --- a/tools/project/ProjectXMLParser.hx +++ b/lime/project/ProjectXMLParser.hx @@ -1,18 +1,18 @@ -package project; +package lime.project; import haxe.io.Path; import haxe.xml.Fast; -import helpers.ArrayHelper; -import helpers.LogHelper; -import helpers.ObjectHelper; -import helpers.PathHelper; -import helpers.StringMapHelper; -import project.Asset; -import project.AssetType; -import project.Dependency; -import project.Haxelib; -import project.HXProject; +import lime.tools.helpers.ArrayHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.ObjectHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.StringMapHelper; +import lime.project.Asset; +import lime.project.AssetType; +import lime.project.Dependency; +import lime.project.Haxelib; +import lime.project.HXProject; import sys.io.File; import sys.FileSystem; diff --git a/tools/project/SplashScreen.hx b/lime/project/SplashScreen.hx similarity index 95% rename from tools/project/SplashScreen.hx rename to lime/project/SplashScreen.hx index 710961471..da542031e 100644 --- a/tools/project/SplashScreen.hx +++ b/lime/project/SplashScreen.hx @@ -1,4 +1,4 @@ -package project; +package lime.project; class SplashScreen { diff --git a/tools/project/Window.hx b/lime/project/WindowData.hx similarity index 92% rename from tools/project/Window.hx rename to lime/project/WindowData.hx index 94ad0733c..179c5bba6 100644 --- a/tools/project/Window.hx +++ b/lime/project/WindowData.hx @@ -1,7 +1,7 @@ -package project; +package lime.project; -typedef Window = { +typedef WindowData = { @:optional var width:Int; @:optional var height:Int; diff --git a/tools/helpers/AIRHelper.hx b/lime/tools/helpers/AIRHelper.hx similarity index 99% rename from tools/helpers/AIRHelper.hx rename to lime/tools/helpers/AIRHelper.hx index 75767be21..c7765a9f5 100644 --- a/tools/helpers/AIRHelper.hx +++ b/lime/tools/helpers/AIRHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; import sys.FileSystem; diff --git a/tools/helpers/AndroidHelper.hx b/lime/tools/helpers/AndroidHelper.hx similarity index 98% rename from tools/helpers/AndroidHelper.hx rename to lime/tools/helpers/AndroidHelper.hx index 07fbc6e13..1d2924dff 100644 --- a/tools/helpers/AndroidHelper.hx +++ b/lime/tools/helpers/AndroidHelper.hx @@ -1,10 +1,10 @@ -package helpers; +package lime.tools.helpers; -import helpers.LogHelper; -import helpers.ProcessHelper; -import project.HXProject; -import project.Platform; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.HXProject; +import lime.project.Platform; import sys.io.File; import sys.FileSystem; diff --git a/tools/helpers/AntHelper.hx b/lime/tools/helpers/AntHelper.hx similarity index 95% rename from tools/helpers/AntHelper.hx rename to lime/tools/helpers/AntHelper.hx index 3b16e2390..00347d050 100644 --- a/tools/helpers/AntHelper.hx +++ b/lime/tools/helpers/AntHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; class AntHelper { diff --git a/tools/helpers/ArrayHelper.hx b/lime/tools/helpers/ArrayHelper.hx similarity index 98% rename from tools/helpers/ArrayHelper.hx rename to lime/tools/helpers/ArrayHelper.hx index 72c81f4c3..9d4077589 100644 --- a/tools/helpers/ArrayHelper.hx +++ b/lime/tools/helpers/ArrayHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; class ArrayHelper { diff --git a/tools/helpers/AssetHelper.hx b/lime/tools/helpers/AssetHelper.hx similarity index 94% rename from tools/helpers/AssetHelper.hx rename to lime/tools/helpers/AssetHelper.hx index 0f47b1c2a..04993317a 100644 --- a/tools/helpers/AssetHelper.hx +++ b/lime/tools/helpers/AssetHelper.hx @@ -1,12 +1,12 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Path; import haxe.Serializer; import haxe.Unserializer; -import helpers.PathHelper; -import project.AssetType; -import project.HXProject; +import lime.tools.helpers.PathHelper; +import lime.project.AssetType; +import lime.project.HXProject; import sys.io.File; import sys.FileSystem; diff --git a/tools/helpers/BlackBerryHelper.hx b/lime/tools/helpers/BlackBerryHelper.hx similarity index 97% rename from tools/helpers/BlackBerryHelper.hx rename to lime/tools/helpers/BlackBerryHelper.hx index 005ac7b90..fd552ff08 100644 --- a/tools/helpers/BlackBerryHelper.hx +++ b/lime/tools/helpers/BlackBerryHelper.hx @@ -1,14 +1,14 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Eof; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import helpers.ZipHelper; -import project.HXProject; -import project.Platform; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.tools.helpers.ZipHelper; +import lime.project.HXProject; +import lime.project.Platform; import sys.FileSystem; import sys.io.File; import sys.io.Process; diff --git a/tools/helpers/CLIHelper.hx b/lime/tools/helpers/CLIHelper.hx similarity index 98% rename from tools/helpers/CLIHelper.hx rename to lime/tools/helpers/CLIHelper.hx index 34da6ea75..3a7671c95 100644 --- a/tools/helpers/CLIHelper.hx +++ b/lime/tools/helpers/CLIHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Eof; diff --git a/tools/helpers/CPPHelper.hx b/lime/tools/helpers/CPPHelper.hx similarity index 96% rename from tools/helpers/CPPHelper.hx rename to lime/tools/helpers/CPPHelper.hx index dc584daf9..994147364 100644 --- a/tools/helpers/CPPHelper.hx +++ b/lime/tools/helpers/CPPHelper.hx @@ -1,11 +1,11 @@ -package helpers; +package lime.tools.helpers; -import helpers.LogHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.HXProject; -import project.Platform; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.HXProject; +import lime.project.Platform; import sys.io.File; import sys.FileSystem; diff --git a/tools/helpers/CompatibilityHelper.hx b/lime/tools/helpers/CompatibilityHelper.hx similarity index 92% rename from tools/helpers/CompatibilityHelper.hx rename to lime/tools/helpers/CompatibilityHelper.hx index 6954cbc00..f43f06034 100644 --- a/tools/helpers/CompatibilityHelper.hx +++ b/lime/tools/helpers/CompatibilityHelper.hx @@ -1,9 +1,9 @@ -package helpers; +package lime.tools.helpers; import haxe.Json; -import project.Haxelib; -import project.HXProject; +import lime.project.Haxelib; +import lime.project.HXProject; import sys.io.File; diff --git a/tools/helpers/CordovaHelper.hx b/lime/tools/helpers/CordovaHelper.hx similarity index 99% rename from tools/helpers/CordovaHelper.hx rename to lime/tools/helpers/CordovaHelper.hx index 903f2ac46..6c461bbcd 100644 --- a/tools/helpers/CordovaHelper.hx +++ b/lime/tools/helpers/CordovaHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; import data.Asset; diff --git a/tools/helpers/FileHelper.hx b/lime/tools/helpers/FileHelper.hx similarity index 97% rename from tools/helpers/FileHelper.hx rename to lime/tools/helpers/FileHelper.hx index 435ddfa2a..5e1ada93a 100644 --- a/tools/helpers/FileHelper.hx +++ b/lime/tools/helpers/FileHelper.hx @@ -1,16 +1,16 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Bytes; import haxe.io.Path; import haxe.Template; -import helpers.PlatformHelper; -import helpers.StringHelper; -import project.Asset; -import project.AssetEncoding; -import project.HXProject; -import project.NDLL; -import project.Platform; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.StringHelper; +import lime.project.Asset; +import lime.project.AssetEncoding; +import lime.project.HXProject; +import lime.project.NDLL; +import lime.project.Platform; import sys.io.File; import sys.io.FileOutput; import sys.FileSystem; diff --git a/tools/helpers/FlashHelper.hx b/lime/tools/helpers/FlashHelper.hx similarity index 98% rename from tools/helpers/FlashHelper.hx rename to lime/tools/helpers/FlashHelper.hx index 5c388bbb1..d756baf0c 100644 --- a/tools/helpers/FlashHelper.hx +++ b/lime/tools/helpers/FlashHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; //import openfl.text.Font; @@ -10,13 +10,13 @@ import format.swf.Writer; import format.wav.Data; import haxe.io.Bytes; import haxe.io.Path; -import helpers.LogHelper; -import helpers.ProcessHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.ProcessHelper; import lime.graphics.Font; -import project.Asset; -import project.AssetEncoding; -import project.AssetType; -import project.HXProject; +import lime.project.Asset; +import lime.project.AssetEncoding; +import lime.project.AssetType; +import lime.project.HXProject; import sys.io.File; import sys.FileSystem; import sys.io.FileSeek; diff --git a/tools/helpers/HTML5Helper.hx b/lime/tools/helpers/HTML5Helper.hx similarity index 93% rename from tools/helpers/HTML5Helper.hx rename to lime/tools/helpers/HTML5Helper.hx index 68def0b11..5203f1763 100644 --- a/tools/helpers/HTML5Helper.hx +++ b/lime/tools/helpers/HTML5Helper.hx @@ -1,18 +1,18 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Path; import haxe.Timer; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; import neko.vm.Thread; -import project.Architecture; -import project.Asset; -import project.Haxelib; -import project.HXProject; -import project.Platform; +import lime.project.Architecture; +import lime.project.Asset; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.Platform; import sys.FileSystem; diff --git a/tools/helpers/IOSHelper.hx b/lime/tools/helpers/IOSHelper.hx similarity index 97% rename from tools/helpers/IOSHelper.hx rename to lime/tools/helpers/IOSHelper.hx index ff17936a6..660331a76 100644 --- a/tools/helpers/IOSHelper.hx +++ b/lime/tools/helpers/IOSHelper.hx @@ -1,11 +1,11 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Path; -import helpers.PathHelper; -import helpers.ProcessHelper; -import project.Haxelib; -import project.HXProject; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.Haxelib; +import lime.project.HXProject; import sys.io.Process; import sys.FileSystem; diff --git a/tools/helpers/IconHelper.hx b/lime/tools/helpers/IconHelper.hx similarity index 97% rename from tools/helpers/IconHelper.hx rename to lime/tools/helpers/IconHelper.hx index 87cddc22e..55d0d073e 100644 --- a/tools/helpers/IconHelper.hx +++ b/lime/tools/helpers/IconHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; //import openfl.display.Bitmap; @@ -10,15 +10,15 @@ package helpers; import haxe.io.Bytes; import haxe.io.BytesOutput; import haxe.io.Path; -import helpers.FileHelper; -import helpers.ImageHelper; -import helpers.LogHelper; -import helpers.PathHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.ImageHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; import lime.graphics.format.BMP; import lime.graphics.Image; import lime.math.Rectangle; import lime.utils.ByteArray; -import project.Icon; +import lime.project.Icon; import sys.io.File; import sys.FileSystem; diff --git a/tools/helpers/ImageHelper.hx b/lime/tools/helpers/ImageHelper.hx similarity index 97% rename from tools/helpers/ImageHelper.hx rename to lime/tools/helpers/ImageHelper.hx index 03f0bd082..1916d8239 100644 --- a/tools/helpers/ImageHelper.hx +++ b/lime/tools/helpers/ImageHelper.hx @@ -1,12 +1,12 @@ -package helpers; +package lime.tools.helpers; import lime.graphics.Image; import lime.graphics.ImageBuffer; import lime.utils.ByteArray; import lime.utils.UInt8Array; -import project.Haxelib; -import project.Platform; +import lime.project.Haxelib; +import lime.project.Platform; import sys.io.File; import sys.FileSystem; diff --git a/tools/helpers/JavaHelper.hx b/lime/tools/helpers/JavaHelper.hx similarity index 90% rename from tools/helpers/JavaHelper.hx rename to lime/tools/helpers/JavaHelper.hx index 3e894a8fe..bbb620c0e 100644 --- a/tools/helpers/JavaHelper.hx +++ b/lime/tools/helpers/JavaHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; import sys.io.File; diff --git a/tools/helpers/LogHelper.hx b/lime/tools/helpers/LogHelper.hx similarity index 96% rename from tools/helpers/LogHelper.hx rename to lime/tools/helpers/LogHelper.hx index fa7a163d6..83797602a 100644 --- a/tools/helpers/LogHelper.hx +++ b/lime/tools/helpers/LogHelper.hx @@ -1,10 +1,10 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Bytes; -import helpers.PlatformHelper; +import lime.tools.helpers.PlatformHelper; import neko.Lib; -import project.Platform; +import lime.project.Platform; import sys.io.Process; diff --git a/tools/helpers/NekoHelper.hx b/lime/tools/helpers/NekoHelper.hx similarity index 96% rename from tools/helpers/NekoHelper.hx rename to lime/tools/helpers/NekoHelper.hx index 9cfc0d16c..5f4953bef 100644 --- a/tools/helpers/NekoHelper.hx +++ b/lime/tools/helpers/NekoHelper.hx @@ -1,7 +1,7 @@ -package helpers; +package lime.tools.helpers; -import project.Haxelib; +import lime.project.Haxelib; import sys.io.File; diff --git a/tools/helpers/NodeJSHelper.hx b/lime/tools/helpers/NodeJSHelper.hx similarity index 87% rename from tools/helpers/NodeJSHelper.hx rename to lime/tools/helpers/NodeJSHelper.hx index e87be1180..226706430 100644 --- a/tools/helpers/NodeJSHelper.hx +++ b/lime/tools/helpers/NodeJSHelper.hx @@ -1,11 +1,11 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Path; -import project.Architecture; -import project.Haxelib; -import project.HXProject; -import project.Platform; +import lime.project.Architecture; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.Platform; class NodeJSHelper { diff --git a/tools/helpers/ObjectHelper.hx b/lime/tools/helpers/ObjectHelper.hx similarity index 98% rename from tools/helpers/ObjectHelper.hx rename to lime/tools/helpers/ObjectHelper.hx index 22539644c..3c34bf34c 100644 --- a/tools/helpers/ObjectHelper.hx +++ b/lime/tools/helpers/ObjectHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; import haxe.ds.IntMap; diff --git a/tools/helpers/PathHelper.hx b/lime/tools/helpers/PathHelper.hx similarity index 98% rename from tools/helpers/PathHelper.hx rename to lime/tools/helpers/PathHelper.hx index bb2e69f61..1d7220726 100644 --- a/tools/helpers/PathHelper.hx +++ b/lime/tools/helpers/PathHelper.hx @@ -1,13 +1,13 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Path; -import helpers.LogHelper; -import helpers.ProcessHelper; -import project.Architecture; -import project.Haxelib; -import project.NDLL; -import project.Platform; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.Architecture; +import lime.project.Haxelib; +import lime.project.NDLL; +import lime.project.Platform; import sys.io.Process; import sys.FileSystem; diff --git a/tools/helpers/PlatformHelper.hx b/lime/tools/helpers/PlatformHelper.hx similarity index 95% rename from tools/helpers/PlatformHelper.hx rename to lime/tools/helpers/PlatformHelper.hx index 39bbe8437..853d44b9d 100644 --- a/tools/helpers/PlatformHelper.hx +++ b/lime/tools/helpers/PlatformHelper.hx @@ -1,8 +1,8 @@ -package helpers; +package lime.tools.helpers; -import project.Architecture; -import project.Platform; +import lime.project.Architecture; +import lime.project.Platform; import sys.io.Process; diff --git a/tools/helpers/ProcessHelper.hx b/lime/tools/helpers/ProcessHelper.hx similarity index 99% rename from tools/helpers/ProcessHelper.hx rename to lime/tools/helpers/ProcessHelper.hx index 519728197..7e4b8cef4 100644 --- a/tools/helpers/ProcessHelper.hx +++ b/lime/tools/helpers/ProcessHelper.hx @@ -1,10 +1,10 @@ -package helpers; +package lime.tools.helpers; import haxe.io.BytesOutput; import haxe.io.Eof; import haxe.io.Path; -import project.Platform; +import lime.project.Platform; import sys.io.Process; import sys.FileSystem; diff --git a/tools/helpers/StringHelper.hx b/lime/tools/helpers/StringHelper.hx similarity index 99% rename from tools/helpers/StringHelper.hx rename to lime/tools/helpers/StringHelper.hx index 29ad048ea..d6188f283 100644 --- a/tools/helpers/StringHelper.hx +++ b/lime/tools/helpers/StringHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; #if lime diff --git a/tools/helpers/StringMapHelper.hx b/lime/tools/helpers/StringMapHelper.hx similarity index 96% rename from tools/helpers/StringMapHelper.hx rename to lime/tools/helpers/StringMapHelper.hx index f1812c86d..44e3295a4 100644 --- a/tools/helpers/StringMapHelper.hx +++ b/lime/tools/helpers/StringMapHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; import haxe.ds.StringMap; diff --git a/tools/helpers/TizenHelper.hx b/lime/tools/helpers/TizenHelper.hx similarity index 95% rename from tools/helpers/TizenHelper.hx rename to lime/tools/helpers/TizenHelper.hx index 4bc842eaa..d0f88ab06 100644 --- a/tools/helpers/TizenHelper.hx +++ b/lime/tools/helpers/TizenHelper.hx @@ -1,15 +1,15 @@ -package helpers; +package lime.tools.helpers; import haxe.crypto.Crc32; import haxe.io.Bytes; import haxe.io.Eof; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.Haxelib; -import project.HXProject; -import project.Platform; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.Platform; import sys.FileSystem; diff --git a/tools/helpers/WebOSHelper.hx b/lime/tools/helpers/WebOSHelper.hx similarity index 89% rename from tools/helpers/WebOSHelper.hx rename to lime/tools/helpers/WebOSHelper.hx index 22d1f193e..c64b53de7 100644 --- a/tools/helpers/WebOSHelper.hx +++ b/lime/tools/helpers/WebOSHelper.hx @@ -1,10 +1,10 @@ -package helpers; +package lime.tools.helpers; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.HXProject; -import project.Platform; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.HXProject; +import lime.project.Platform; class WebOSHelper { diff --git a/tools/helpers/ZipHelper.hx b/lime/tools/helpers/ZipHelper.hx similarity index 99% rename from tools/helpers/ZipHelper.hx rename to lime/tools/helpers/ZipHelper.hx index 4aff73e62..cd9de4680 100644 --- a/tools/helpers/ZipHelper.hx +++ b/lime/tools/helpers/ZipHelper.hx @@ -1,4 +1,4 @@ -package helpers; +package lime.tools.helpers; import haxe.io.Bytes; diff --git a/tools/platforms/AndroidPlatform.hx b/lime/tools/platforms/AndroidPlatform.hx similarity index 95% rename from tools/platforms/AndroidPlatform.hx rename to lime/tools/platforms/AndroidPlatform.hx index 746ca9347..425552d73 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/lime/tools/platforms/AndroidPlatform.hx @@ -1,21 +1,21 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AndroidHelper; -import helpers.ArrayHelper; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.IconHelper; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.ProcessHelper; -import project.Architecture; -import project.AssetType; -import project.HXProject; -import project.PlatformTarget; +import lime.tools.helpers.AndroidHelper; +import lime.tools.helpers.ArrayHelper; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.Architecture; +import lime.project.AssetType; +import lime.project.HXProject; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/BlackBerryPlatform.hx b/lime/tools/platforms/BlackBerryPlatform.hx similarity index 94% rename from tools/platforms/BlackBerryPlatform.hx rename to lime/tools/platforms/BlackBerryPlatform.hx index 78d69f5c8..bccb8d16b 100644 --- a/tools/platforms/BlackBerryPlatform.hx +++ b/lime/tools/platforms/BlackBerryPlatform.hx @@ -1,22 +1,22 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.BlackBerryHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.HTML5Helper; -import helpers.IconHelper; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.ProcessHelper; -import project.AssetType; -import project.Haxelib; -import project.HXProject; -import project.NDLL; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.BlackBerryHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.HTML5Helper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.AssetType; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.NDLL; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/EmscriptenPlatform.hx b/lime/tools/platforms/EmscriptenPlatform.hx similarity index 95% rename from tools/platforms/EmscriptenPlatform.hx rename to lime/tools/platforms/EmscriptenPlatform.hx index f39692cf7..0fc2d1db0 100644 --- a/tools/platforms/EmscriptenPlatform.hx +++ b/lime/tools/platforms/EmscriptenPlatform.hx @@ -1,20 +1,20 @@ -package platforms; +package lime.tools.platforms; //import openfl.utils.ByteArray; //import openfl.utils.CompressionAlgorithm; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.HTML5Helper; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.ProcessHelper; -import project.AssetType; -import project.HXProject; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.HTML5Helper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.AssetType; +import lime.project.HXProject; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/FirefoxPlatform.hx b/lime/tools/platforms/FirefoxPlatform.hx similarity index 87% rename from tools/platforms/FirefoxPlatform.hx rename to lime/tools/platforms/FirefoxPlatform.hx index b1b33aad9..92b7a7f4a 100644 --- a/tools/platforms/FirefoxPlatform.hx +++ b/lime/tools/platforms/FirefoxPlatform.hx @@ -1,12 +1,12 @@ -package platforms; +package lime.tools.platforms; -import helpers.FileHelper; -import helpers.HTML5Helper; -import helpers.IconHelper; -import helpers.PathHelper; -import helpers.LogHelper; -import project.HXProject; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.HTML5Helper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.LogHelper; +import lime.project.HXProject; import sys.FileSystem; diff --git a/tools/platforms/FlashPlatform.hx b/lime/tools/platforms/FlashPlatform.hx similarity index 93% rename from tools/platforms/FlashPlatform.hx rename to lime/tools/platforms/FlashPlatform.hx index 72b09c6be..b8309e966 100644 --- a/tools/platforms/FlashPlatform.hx +++ b/lime/tools/platforms/FlashPlatform.hx @@ -1,20 +1,20 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Json; import haxe.Template; -import helpers.CompatibilityHelper; -import helpers.FileHelper; -import helpers.FlashHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.AssetType; -import project.Haxelib; -import project.HXProject; -import project.Platform; -import project.PlatformTarget; +import lime.tools.helpers.CompatibilityHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.FlashHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.AssetType; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.Platform; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/HTML5Platform.hx b/lime/tools/platforms/HTML5Platform.hx similarity index 94% rename from tools/platforms/HTML5Platform.hx rename to lime/tools/platforms/HTML5Platform.hx index ca5574870..da0249010 100644 --- a/tools/platforms/HTML5Platform.hx +++ b/lime/tools/platforms/HTML5Platform.hx @@ -1,17 +1,17 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.FileHelper; -import helpers.HTML5Helper; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.ProcessHelper; -import project.AssetType; -import project.HXProject; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.HTML5Helper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.AssetType; +import lime.project.HXProject; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/IOSPlatform.hx b/lime/tools/platforms/IOSPlatform.hx similarity index 96% rename from tools/platforms/IOSPlatform.hx rename to lime/tools/platforms/IOSPlatform.hx index 7fa91d1f8..200bfa60f 100644 --- a/tools/platforms/IOSPlatform.hx +++ b/lime/tools/platforms/IOSPlatform.hx @@ -1,30 +1,30 @@ -package platforms; +package lime.tools.platforms; //import openfl.display.BitmapData; import haxe.io.Path; import haxe.Template; -import helpers.ArrayHelper; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.IconHelper; -import helpers.IOSHelper; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import helpers.StringHelper; +import lime.tools.helpers.ArrayHelper; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.IOSHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.tools.helpers.StringHelper; import lime.graphics.Image; -import project.Architecture; -import project.Asset; -import project.AssetType; -import project.Haxelib; -import project.HXProject; -import project.Keystore; -import project.NDLL; -import project.Platform; -import project.PlatformTarget; +import lime.project.Architecture; +import lime.project.Asset; +import lime.project.AssetType; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.Keystore; +import lime.project.NDLL; +import lime.project.Platform; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/LinuxPlatform.hx b/lime/tools/platforms/LinuxPlatform.hx similarity index 94% rename from tools/platforms/LinuxPlatform.hx rename to lime/tools/platforms/LinuxPlatform.hx index 65e843f9d..1bac7205e 100644 --- a/tools/platforms/LinuxPlatform.hx +++ b/lime/tools/platforms/LinuxPlatform.hx @@ -1,21 +1,21 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.NekoHelper; -import helpers.NodeJSHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.AssetType; -import project.Architecture; -import project.HXProject; -import project.Platform; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.NekoHelper; +import lime.tools.helpers.NodeJSHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.AssetType; +import lime.project.Architecture; +import lime.project.HXProject; +import lime.project.Platform; +import lime.project.PlatformTarget; import sys.io.File; import sys.io.Process; import sys.FileSystem; diff --git a/tools/platforms/MacPlatform.hx b/lime/tools/platforms/MacPlatform.hx similarity index 93% rename from tools/platforms/MacPlatform.hx rename to lime/tools/platforms/MacPlatform.hx index 2c37f80c8..644753da8 100644 --- a/tools/platforms/MacPlatform.hx +++ b/lime/tools/platforms/MacPlatform.hx @@ -1,24 +1,24 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.IconHelper; -import helpers.JavaHelper; -import helpers.NekoHelper; -import helpers.NodeJSHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.AssetType; -import project.Architecture; -import project.Haxelib; -import project.HXProject; -import project.Platform; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.JavaHelper; +import lime.tools.helpers.NekoHelper; +import lime.tools.helpers.NodeJSHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.AssetType; +import lime.project.Architecture; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.Platform; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/TizenPlatform.hx b/lime/tools/platforms/TizenPlatform.hx similarity index 92% rename from tools/platforms/TizenPlatform.hx rename to lime/tools/platforms/TizenPlatform.hx index 8b39d23e1..c74b8c936 100644 --- a/tools/platforms/TizenPlatform.hx +++ b/lime/tools/platforms/TizenPlatform.hx @@ -1,18 +1,18 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.IconHelper; -import helpers.PathHelper; -import helpers.ProcessHelper; -import helpers.TizenHelper; -import project.AssetType; -import project.HXProject; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; +import lime.tools.helpers.TizenHelper; +import lime.project.AssetType; +import lime.project.HXProject; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/WebOSPlatform.hx b/lime/tools/platforms/WebOSPlatform.hx similarity index 90% rename from tools/platforms/WebOSPlatform.hx rename to lime/tools/platforms/WebOSPlatform.hx index b71dd96a9..1e12b5935 100644 --- a/tools/platforms/WebOSPlatform.hx +++ b/lime/tools/platforms/WebOSPlatform.hx @@ -1,18 +1,18 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.IconHelper; -import helpers.PathHelper; -import helpers.ProcessHelper; -import helpers.WebOSHelper; -import project.AssetType; -import project.HXProject; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; +import lime.tools.helpers.WebOSHelper; +import lime.project.AssetType; +import lime.project.HXProject; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/platforms/WindowsPlatform.hx b/lime/tools/platforms/WindowsPlatform.hx similarity index 93% rename from tools/platforms/WindowsPlatform.hx rename to lime/tools/platforms/WindowsPlatform.hx index 75a8b9d25..d23eb795b 100644 --- a/tools/platforms/WindowsPlatform.hx +++ b/lime/tools/platforms/WindowsPlatform.hx @@ -1,22 +1,22 @@ -package platforms; +package lime.tools.platforms; import haxe.io.Path; import haxe.Template; -import helpers.AssetHelper; -import helpers.CPPHelper; -import helpers.FileHelper; -import helpers.IconHelper; -import helpers.NekoHelper; -import helpers.NodeJSHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.Asset; -import project.AssetType; -import project.Haxelib; -import project.HXProject; -import project.PlatformTarget; +import lime.tools.helpers.AssetHelper; +import lime.tools.helpers.CPPHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.IconHelper; +import lime.tools.helpers.NekoHelper; +import lime.tools.helpers.NodeJSHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.Asset; +import lime.project.AssetType; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.PlatformTarget; import sys.io.File; import sys.FileSystem; diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx index 13369a6f3..b49ce34a2 100644 --- a/tools/CommandLineTools.hx +++ b/tools/CommandLineTools.hx @@ -9,10 +9,10 @@ import haxe.Serializer; import haxe.Unserializer; import haxe.io.Path; import haxe.rtti.Meta; -import helpers.*; +import lime.tools.helpers.*; import lime.system.System; -import platforms.*; -import project.*; +import lime.tools.platforms.*; +import lime.project.*; import sys.io.File; import sys.io.Process; import sys.FileSystem; diff --git a/tools/RunScript.hx b/tools/RunScript.hx index d69c0aec1..36c2eb3e0 100644 --- a/tools/RunScript.hx +++ b/tools/RunScript.hx @@ -2,15 +2,15 @@ package; import haxe.io.Path; -import project.Haxelib; +import lime.project.Haxelib; import sys.io.File; import sys.io.Process; import sys.FileSystem; -import helpers.FileHelper; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; class RunScript { diff --git a/tools/SVGExport.hx b/tools/SVGExport.hx index e6ce4084d..726b8e43a 100644 --- a/tools/SVGExport.hx +++ b/tools/SVGExport.hx @@ -3,14 +3,14 @@ package; import format.SVG; import haxe.io.Path; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; import openfl.display.Bitmap; import openfl.display.BitmapData; import openfl.display.Shape; import openfl.geom.Matrix; -import project.Architecture; +import lime.project.Architecture; import sys.io.File; import sys.io.Process; import sys.FileSystem; diff --git a/tools/utils/CreateTemplate.hx b/tools/utils/CreateTemplate.hx index 727edf508..5d7f30415 100644 --- a/tools/utils/CreateTemplate.hx +++ b/tools/utils/CreateTemplate.hx @@ -1,11 +1,11 @@ package utils; -import helpers.FileHelper; -import helpers.LogHelper; -import helpers.PathHelper; -import project.Haxelib; -import project.HXProject; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.project.Haxelib; +import lime.project.HXProject; import sys.FileSystem; diff --git a/tools/utils/JavaExternGenerator.hx b/tools/utils/JavaExternGenerator.hx index 94660d4d2..276148c5c 100644 --- a/tools/utils/JavaExternGenerator.hx +++ b/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 helpers.PathHelper; -import helpers.ProcessHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.ProcessHelper; import sys.io.File; import sys.io.Process; import sys.FileSystem; import neko.Lib; import neko.zip.Compress; -import project.HXProject; +import lime.project.HXProject; class JavaExternGenerator diff --git a/tools/utils/PlatformSetup.hx b/tools/utils/PlatformSetup.hx index ed6d33ee1..c3415ddea 100644 --- a/tools/utils/PlatformSetup.hx +++ b/tools/utils/PlatformSetup.hx @@ -5,16 +5,16 @@ import haxe.Http; import haxe.io.Eof; import haxe.io.Path; import haxe.zip.Reader; -import helpers.BlackBerryHelper; -import helpers.CLIHelper; -import helpers.FileHelper; -import helpers.LogHelper; -import helpers.PathHelper; -import helpers.PlatformHelper; -import helpers.ProcessHelper; -import project.Haxelib; -import project.HXProject; -import project.Platform; +import lime.tools.helpers.BlackBerryHelper; +import lime.tools.helpers.CLIHelper; +import lime.tools.helpers.FileHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.PathHelper; +import lime.tools.helpers.PlatformHelper; +import lime.tools.helpers.ProcessHelper; +import lime.project.Haxelib; +import lime.project.HXProject; +import lime.project.Platform; import sys.io.File; import sys.io.Process; import sys.FileSystem; diff --git a/tools/utils/publish/FirefoxMarketplace.hx b/tools/utils/publish/FirefoxMarketplace.hx index 83ee4cf56..c65b5b9cc 100644 --- a/tools/utils/publish/FirefoxMarketplace.hx +++ b/tools/utils/publish/FirefoxMarketplace.hx @@ -4,14 +4,14 @@ package utils.publish; import haxe.crypto.Base64; import haxe.io.Path; import haxe.Json; -import helpers.CLIHelper; -import helpers.LogHelper; -import helpers.ZipHelper; -import helpers.ProcessHelper; +import lime.tools.helpers.CLIHelper; +import lime.tools.helpers.LogHelper; +import lime.tools.helpers.ZipHelper; +import lime.tools.helpers.ProcessHelper; import lime.graphics.Image; import lime.net.oauth.*; import lime.net.*; -import project.HXProject; +import lime.project.HXProject; import utils.PlatformSetup; import sys.FileSystem; import sys.io.File;