From e0f8813b966c60100d72597ab48f54199af84482 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Sat, 4 Aug 2018 18:17:51 -0700 Subject: [PATCH] Simplify HXP imports, fixes --- src/lime/tools/AIRHelper.hx | 1 - src/lime/tools/Asset.hx | 6 +----- src/lime/tools/AssetHelper.hx | 2 -- src/lime/tools/AssetType.hx | 1 + src/lime/tools/CPPHelper.hx | 3 --- src/lime/tools/CSHelper.hx | 6 +++--- src/lime/tools/CommandHelper.hx | 2 +- src/lime/tools/ConfigData.hx | 3 +-- src/lime/tools/ConfigHelper.hx | 3 +-- src/lime/tools/ElectronHelper.hx | 3 +-- src/lime/tools/FlashHelper.hx | 5 +---- src/lime/tools/HTML5Helper.hx | 10 +--------- src/lime/tools/HXProject.hx | 12 +----------- src/lime/tools/IOSHelper.hx | 6 +----- src/lime/tools/IconHelper.hx | 5 +---- src/lime/tools/ImageHelper.hx | 4 +--- src/lime/tools/ModuleData.hx | 2 +- src/lime/tools/ModuleHelper.hx | 4 +--- src/lime/tools/NekoHelper.hx | 5 +---- src/lime/tools/NodeJSHelper.hx | 4 +--- src/lime/tools/PlatformTarget.hx | 2 +- src/lime/tools/PlatformTargetMain.hx | 7 +------ src/lime/tools/Project.hx | 17 ++--------------- src/lime/tools/ProjectXMLParser.hx | 2 -- src/lime/tools/TVOSHelper.hx | 4 ---- src/lime/tools/TizenHelper.hx | 5 +---- tools/CommandLineTools.hx | 1 - tools/RunScript.hx | 9 +-------- tools/SVGExport.hx | 7 ++----- tools/utils/CreateTemplate.hx | 6 +----- tools/utils/JavaExternGenerator.hx | 10 +--------- tools/utils/PlatformSetup.hx | 25 +------------------------ 32 files changed, 30 insertions(+), 152 deletions(-) diff --git a/src/lime/tools/AIRHelper.hx b/src/lime/tools/AIRHelper.hx index 5747d10c0..4aba3f209 100644 --- a/src/lime/tools/AIRHelper.hx +++ b/src/lime/tools/AIRHelper.hx @@ -1,7 +1,6 @@ package lime.tools; -import hxp.Path; import hxp.*; import sys.FileSystem; diff --git a/src/lime/tools/Asset.hx b/src/lime/tools/Asset.hx index 4c05b5156..4492fbc00 100644 --- a/src/lime/tools/Asset.hx +++ b/src/lime/tools/Asset.hx @@ -1,11 +1,7 @@ package lime.tools; -import hxp.Path; -import hxp.System; -import hxp.ObjectTools; -import hxp.StringTools; -import hxp.Path; +import hxp.*; import lime.tools.AssetType; import sys.FileSystem; diff --git a/src/lime/tools/AssetHelper.hx b/src/lime/tools/AssetHelper.hx index e9d342e0d..98961afb5 100644 --- a/src/lime/tools/AssetHelper.hx +++ b/src/lime/tools/AssetHelper.hx @@ -1,10 +1,8 @@ package lime.tools; #if lime -import hxp.Path; import haxe.Serializer; import haxe.Unserializer; -import hxp.Path; import hxp.*; import lime.tools.AssetType; import lime.tools.Asset; diff --git a/src/lime/tools/AssetType.hx b/src/lime/tools/AssetType.hx index 4929e9fdb..2c9dc7fa9 100644 --- a/src/lime/tools/AssetType.hx +++ b/src/lime/tools/AssetType.hx @@ -1,5 +1,6 @@ package lime.tools; + enum AssetType { BINARY; diff --git a/src/lime/tools/CPPHelper.hx b/src/lime/tools/CPPHelper.hx index 076fc54f8..d2e2bb5c9 100644 --- a/src/lime/tools/CPPHelper.hx +++ b/src/lime/tools/CPPHelper.hx @@ -1,9 +1,6 @@ package lime.tools; -import hxp.Log; -import hxp.System; -import hxp.System; import hxp.*; import lime.tools.Project; import lime.tools.Platform; diff --git a/src/lime/tools/CSHelper.hx b/src/lime/tools/CSHelper.hx index 4709ec082..e71a1615a 100644 --- a/src/lime/tools/CSHelper.hx +++ b/src/lime/tools/CSHelper.hx @@ -1,14 +1,14 @@ package lime.tools; + +import hxp.*; import lime.tools.Architecture; import lime.tools.Project; -import hxp.NDLL; -import hxp.System; -import hxp.*; import sys.io.File; import sys.FileSystem; using StringTools; + class CSHelper { public static var ndllSourceFiles:Array = [ diff --git a/src/lime/tools/CommandHelper.hx b/src/lime/tools/CommandHelper.hx index 87de9c596..1e66a4ab3 100644 --- a/src/lime/tools/CommandHelper.hx +++ b/src/lime/tools/CommandHelper.hx @@ -1,9 +1,9 @@ package lime.tools; +import hxp.*; import lime.tools.CLICommand; import lime.tools.Platform; -import hxp.*; class CommandHelper { diff --git a/src/lime/tools/ConfigData.hx b/src/lime/tools/ConfigData.hx index 2db986456..7f2aa98b7 100644 --- a/src/lime/tools/ConfigData.hx +++ b/src/lime/tools/ConfigData.hx @@ -2,8 +2,7 @@ package lime.tools; import haxe.xml.Fast; -import hxp.Log; -import hxp.ObjectTools; +import hxp.*; abstract ConfigData(Dynamic) to Dynamic from Dynamic { diff --git a/src/lime/tools/ConfigHelper.hx b/src/lime/tools/ConfigHelper.hx index 72ee1e8a1..7c0daf468 100644 --- a/src/lime/tools/ConfigHelper.hx +++ b/src/lime/tools/ConfigHelper.hx @@ -1,10 +1,9 @@ package lime.tools; -import hxp.Path; +import hxp.*; import lime.tools.Project; import lime.tools.Platform; -import hxp.*; import lime.tools.ProjectXMLParser; import sys.io.File; import sys.FileSystem; diff --git a/src/lime/tools/ElectronHelper.hx b/src/lime/tools/ElectronHelper.hx index 95fda1b7b..abe343e42 100644 --- a/src/lime/tools/ElectronHelper.hx +++ b/src/lime/tools/ElectronHelper.hx @@ -1,8 +1,7 @@ package lime.tools; -import hxp.Path; -import hxp.System; +import hxp.*; import lime.tools.Project; diff --git a/src/lime/tools/FlashHelper.hx b/src/lime/tools/FlashHelper.hx index 09cf8c133..6da0bfa6c 100644 --- a/src/lime/tools/FlashHelper.hx +++ b/src/lime/tools/FlashHelper.hx @@ -4,7 +4,7 @@ package lime.tools; //import openfl.text.Font; //import openfl.utils.ByteArray; import haxe.io.Bytes; -import hxp.Path; +import hxp.*; import lime.tools.Asset; import lime.tools.AssetEncoding; import lime.tools.AssetType; @@ -12,9 +12,6 @@ import lime.tools.Project; #if (lime && lime_cffi && !macro) import lime.text.Font; #end -import hxp.Log; -import hxp.System; -import hxp.*; import sys.io.File; import sys.FileSystem; import sys.io.FileSeek; diff --git a/src/lime/tools/HTML5Helper.hx b/src/lime/tools/HTML5Helper.hx index 97ea84020..c7f5133cd 100644 --- a/src/lime/tools/HTML5Helper.hx +++ b/src/lime/tools/HTML5Helper.hx @@ -1,19 +1,11 @@ package lime.tools; -import hxp.Path; -import haxe.Timer; -import hxp.Log; -import hxp.Path; -import hxp.System; -import hxp.System; -import lime.tools.Architecture; import hxp.*; +import lime.tools.Architecture; import lime.tools.Asset; -import hxp.Haxelib; import lime.tools.Project; import lime.tools.Platform; -import hxp.Version; import sys.FileSystem; import sys.io.File; diff --git a/src/lime/tools/HXProject.hx b/src/lime/tools/HXProject.hx index fecb22ecb..f235f9c05 100644 --- a/src/lime/tools/HXProject.hx +++ b/src/lime/tools/HXProject.hx @@ -2,21 +2,11 @@ package lime.tools; import haxe.io.Eof; -import hxp.Path; import haxe.xml.Fast; import haxe.Json; import haxe.Serializer; import haxe.Unserializer; -import hxp.ArrayTools; -import hxp.System; -import hxp.Haxelib; -import hxp.Log; -import hxp.ObjectTools; -import hxp.Path; -import hxp.System; -import hxp.System; -import hxp.StringTools; -import hxp.MapTools; +import hxp.*; import lime.tools.AssetType; import sys.FileSystem; import sys.io.File; diff --git a/src/lime/tools/IOSHelper.hx b/src/lime/tools/IOSHelper.hx index 6c27bba8d..cf9d10eea 100644 --- a/src/lime/tools/IOSHelper.hx +++ b/src/lime/tools/IOSHelper.hx @@ -1,12 +1,8 @@ package lime.tools; -import hxp.Path; -import lime.tools.Platform; -import hxp.Path; -import hxp.System; -import hxp.Haxelib; import hxp.*; +import lime.tools.Platform; import lime.tools.Project; import sys.io.Process; import sys.FileSystem; diff --git a/src/lime/tools/IconHelper.hx b/src/lime/tools/IconHelper.hx index e0cac791c..7691858ce 100644 --- a/src/lime/tools/IconHelper.hx +++ b/src/lime/tools/IconHelper.hx @@ -9,11 +9,8 @@ package lime.tools; //import format.SVG; import haxe.io.Bytes; import haxe.io.BytesOutput; -import hxp.Path; -import hxp.System; +import hxp.*; import lime.tools.ImageHelper; -import hxp.Log; -import hxp.Path; #if (lime && lime_cffi && !macro) import lime.graphics.Image; import lime.math.Rectangle; diff --git a/src/lime/tools/ImageHelper.hx b/src/lime/tools/ImageHelper.hx index 651a69a9c..c93241d98 100644 --- a/src/lime/tools/ImageHelper.hx +++ b/src/lime/tools/ImageHelper.hx @@ -1,15 +1,13 @@ package lime.tools; +import hxp.*; #if (lime && lime_cffi && !macro) import lime.graphics.Image; import lime.graphics.ImageBuffer; import lime.utils.UInt8Array; #end -import hxp.Path; -import hxp.Haxelib; import lime.tools.Platform; -import hxp.*; import sys.io.File; import sys.FileSystem; diff --git a/src/lime/tools/ModuleData.hx b/src/lime/tools/ModuleData.hx index a84a2be61..eff23abd5 100644 --- a/src/lime/tools/ModuleData.hx +++ b/src/lime/tools/ModuleData.hx @@ -1,7 +1,7 @@ package lime.tools; -import hxp.ArrayTools; +import hxp.*; class ModuleData { diff --git a/src/lime/tools/ModuleHelper.hx b/src/lime/tools/ModuleHelper.hx index 77538313c..f9dcaf860 100644 --- a/src/lime/tools/ModuleHelper.hx +++ b/src/lime/tools/ModuleHelper.hx @@ -1,10 +1,8 @@ package lime.tools; #if !macro -import hxp.Path; -import lime.tools.Dependency; -import hxp.Haxelib; import hxp.*; +import lime.tools.Dependency; import lime.tools.Project; import lime.tools.ModuleData; import sys.io.File; diff --git a/src/lime/tools/NekoHelper.hx b/src/lime/tools/NekoHelper.hx index 93a9e4280..39289bb58 100644 --- a/src/lime/tools/NekoHelper.hx +++ b/src/lime/tools/NekoHelper.hx @@ -1,11 +1,8 @@ package lime.tools; -import hxp.Path; -import hxp.System; -import hxp.Haxelib; -import lime.tools.Platform; import hxp.*; +import lime.tools.Platform; import sys.FileSystem; import sys.io.File; diff --git a/src/lime/tools/NodeJSHelper.hx b/src/lime/tools/NodeJSHelper.hx index f5970da58..fd7aa9f74 100644 --- a/src/lime/tools/NodeJSHelper.hx +++ b/src/lime/tools/NodeJSHelper.hx @@ -1,12 +1,10 @@ package lime.tools; -import hxp.Path; +import hxp.*; import lime.tools.Architecture; -import hxp.Haxelib; import lime.tools.Project; import lime.tools.Platform; -import hxp.*; class NodeJSHelper { diff --git a/src/lime/tools/PlatformTarget.hx b/src/lime/tools/PlatformTarget.hx index 9d1941313..17a12a411 100644 --- a/src/lime/tools/PlatformTarget.hx +++ b/src/lime/tools/PlatformTarget.hx @@ -2,9 +2,9 @@ package lime.tools; import haxe.rtti.Meta; +import hxp.*; import lime.tools.AssetHelper; import lime.tools.CommandHelper; -import hxp.Log; class PlatformTarget { diff --git a/src/lime/tools/PlatformTargetMain.hx b/src/lime/tools/PlatformTargetMain.hx index c4de6e923..033565e6a 100644 --- a/src/lime/tools/PlatformTargetMain.hx +++ b/src/lime/tools/PlatformTargetMain.hx @@ -1,16 +1,11 @@ package lime.tools; -import hxp.Path; import haxe.Unserializer; +import hxp.*; import lime.tools.Architecture; -import hxp.Haxelib; import lime.tools.Project; import lime.tools.Platform; -import hxp.Haxelib; -import hxp.Log; -import hxp.Path; -import hxp.System; import sys.io.File; import sys.io.Process; import sys.FileSystem; diff --git a/src/lime/tools/Project.hx b/src/lime/tools/Project.hx index ddc1dd2f2..e3c7e4ccb 100644 --- a/src/lime/tools/Project.hx +++ b/src/lime/tools/Project.hx @@ -2,27 +2,14 @@ package lime.tools; import haxe.io.Eof; -import hxp.Path; import haxe.xml.Fast; import haxe.Json; import haxe.Serializer; import haxe.Unserializer; +import hxp.*; import lime.tools.Architecture; -import hxp.ArrayTools; -import hxp.System; -import hxp.Haxelib; -import hxp.Haxelib; -import hxp.Log; -import hxp.NDLL; -import hxp.ObjectTools; -import hxp.Path; -import lime.tools.Platform; -import hxp.System; -import hxp.System; -import hxp.Script; -import hxp.StringTools; -import hxp.MapTools; import lime.tools.AssetType; +import lime.tools.Platform; import sys.FileSystem; import sys.io.File; import sys.io.Process; diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx index 92665d2da..00ba2666d 100644 --- a/src/lime/tools/ProjectXMLParser.hx +++ b/src/lime/tools/ProjectXMLParser.hx @@ -1,7 +1,6 @@ package lime.tools; -import hxp.Path; import haxe.xml.Fast; import hxp.*; import lime.tools.CommandHelper; @@ -9,7 +8,6 @@ import lime.tools.ModuleHelper; import lime.tools.Asset; import lime.tools.AssetType; import lime.tools.Dependency; -import hxp.Haxelib; import lime.tools.Project; #if lime import lime.utils.AssetManifest; diff --git a/src/lime/tools/TVOSHelper.hx b/src/lime/tools/TVOSHelper.hx index 5af8512f3..96c7160ba 100644 --- a/src/lime/tools/TVOSHelper.hx +++ b/src/lime/tools/TVOSHelper.hx @@ -1,10 +1,6 @@ package lime.tools; -import hxp.Path; -import hxp.Path; -import hxp.System; -import hxp.Haxelib; import hxp.*; import lime.tools.Project; import sys.io.Process; diff --git a/src/lime/tools/TizenHelper.hx b/src/lime/tools/TizenHelper.hx index 903afed1f..a602e8954 100644 --- a/src/lime/tools/TizenHelper.hx +++ b/src/lime/tools/TizenHelper.hx @@ -4,10 +4,7 @@ package lime.tools; import haxe.crypto.Crc32; import haxe.io.Bytes; import haxe.io.Eof; -import hxp.Path; -import hxp.System; -import hxp.System; -import hxp.Haxelib; +import hxp.*; import lime.tools.Project; import lime.tools.Platform; import sys.FileSystem; diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx index 23c30fb33..b4aa899d7 100644 --- a/tools/CommandLineTools.hx +++ b/tools/CommandLineTools.hx @@ -6,7 +6,6 @@ package; //import openfl.utils.CompressionAlgorithm; import haxe.Serializer; import haxe.Unserializer; -import hxp.Path; import haxe.rtti.Meta; import hxp.*; import lime.system.CFFI; diff --git a/tools/RunScript.hx b/tools/RunScript.hx index d3d63bcd4..c87d1f470 100644 --- a/tools/RunScript.hx +++ b/tools/RunScript.hx @@ -1,14 +1,7 @@ package; -import hxp.Path; -import hxp.helpers.FileHelper; -import hxp.helpers.HaxelibHelper; -import hxp.helpers.Log; -import hxp.helpers.PathHelper; -import hxp.helpers.PlatformHelper; -import hxp.helpers.ProcessHelper; -import lime.tools.Project.Haxelib; +import hxp.*; import sys.io.File; import sys.io.Process; import sys.FileSystem; diff --git a/tools/SVGExport.hx b/tools/SVGExport.hx index 8a509ae4d..5465c2d2b 100644 --- a/tools/SVGExport.hx +++ b/tools/SVGExport.hx @@ -2,11 +2,8 @@ package; import format.SVG; -import hxp.Path; -import hxp.helpers.Log; -import hxp.helpers.PathHelper; -import hxp.helpers.PlatformHelper; -import lime.tools.Project.Architecture; +import hxp.*; +import lime.tools.Architecture; import openfl.display.Bitmap; import openfl.display.BitmapData; import openfl.display.PNGEncoderOptions; diff --git a/tools/utils/CreateTemplate.hx b/tools/utils/CreateTemplate.hx index e379b6d86..218d62b74 100644 --- a/tools/utils/CreateTemplate.hx +++ b/tools/utils/CreateTemplate.hx @@ -1,11 +1,7 @@ package utils; -import hxp.System; -import hxp.Haxelib; -import hxp.Haxelib; -import hxp.Log; -import hxp.Path; +import hxp.*; import lime.tools.Project; import lime.tools.ProjectHelper; import sys.FileSystem; diff --git a/tools/utils/JavaExternGenerator.hx b/tools/utils/JavaExternGenerator.hx index a0f686e9b..11c835ca4 100644 --- a/tools/utils/JavaExternGenerator.hx +++ b/tools/utils/JavaExternGenerator.hx @@ -5,17 +5,9 @@ import haxe.crypto.BaseCode; import haxe.io.Bytes; import haxe.io.Input; import haxe.io.Output; -import hxp.Path; import haxe.zip.Reader; -#if (hxp > "1.0.0") -import hxp.Path; -import hxp.System; +import hxp.*; import lime.tools.Project; -#else -import hxp.helpers.PathHelper; -import hxp.helpers.ProcessHelper; -import lime.tools.Project.HXProject in Project; -#end import sys.io.File; import sys.io.Process; import sys.FileSystem; diff --git a/tools/utils/PlatformSetup.hx b/tools/utils/PlatformSetup.hx index bd8d89b60..b0a92d637 100644 --- a/tools/utils/PlatformSetup.hx +++ b/tools/utils/PlatformSetup.hx @@ -3,35 +3,12 @@ package utils; import haxe.Http; import haxe.io.Eof; -import hxp.Path; import haxe.zip.Reader; -#if (hxp > "1.0.0") +import hxp.*; import lime.tools.CLIHelper; import lime.tools.ConfigHelper; -import hxp.System; -import hxp.Haxelib; -import hxp.Haxelib; -import hxp.Log; -import hxp.Path; import lime.tools.Platform; -import hxp.System; -import hxp.System; import lime.tools.Project; -import hxp.Version; -#else -import hxp.helpers.CLIHelper; -import hxp.helpers.ConfigHelper; -import hxp.helpers.FileHelper; -import hxp.helpers.HaxelibHelper; -import hxp.helpers.Log; -import hxp.helpers.PathHelper; -import hxp.helpers.PlatformHelper; -import hxp.helpers.ProcessHelper; -import lime.tools.Project.Haxelib; -import lime.tools.Project.HXProject in Project; -import lime.tools.Project.Platform; -import lime.tools.Project.Version; -#end import sys.io.File; import sys.io.Process; import sys.FileSystem;