kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for dev HXP

Browse Source
This commit is contained in:
Joshua Granick
2018-08-02 21:25:48 -07:00
parent 4040e35ca8
commit 6d9f3c4bd8
16 changed files with 1380 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api/build.hx
View File

@@ -1,4 +1,4 @@
import hxp.helpers.ProcessHelper;
import hxp.ProcessHelper;
import hxp.HXML;
import sys.io.File;

73
tools/CommandLineTools.hx
View File

@@ -8,8 +8,7 @@ import haxe.Serializer;
import haxe.Unserializer;
import haxe.io.Path;
import haxe.rtti.Meta;
import hxp.helpers.*;
import hxp.project.*;
import hxp.*;
import lime.system.CFFI;
import sys.io.File;
import sys.io.Process;
@@ -19,7 +18,7 @@ import utils.CreateTemplate;
import utils.JavaExternGenerator;
import utils.PlatformSetup;
@:access(hxp.project.HXProject)
@:access(hxp.Project)
class CommandLineTools {
@@ -34,8 +33,8 @@ class CommandLineTools {
private var debug:Bool;
private var environment:Map<String, String>;
private var includePaths:Array<String>;
private var overrides:HXProject;
private var project:HXProject;
private var overrides:Project;
private var project:Project;
private var projectDefines:Map<String, String>;
private var runFromHaxelib:Bool;
private var targetFlags:Map<String, String>;
@@ -58,7 +57,7 @@ class CommandLineTools {
userDefines = new Map<String, Dynamic> ();
words = new Array<String> ();
overrides = new HXProject ();
overrides = new Project ();
overrides.architectures = [];
//HaxelibHelper.setOverridePath (new Haxelib ("lime-tools"), PathHelper.combine (HaxelibHelper.getPath (new Haxelib ("lime")), "tools"));
@@ -364,23 +363,23 @@ class CommandLineTools {
} else {
HXProject._command = command;
HXProject._environment = environment;
HXProject._debug = debug;
HXProject._target = target;
HXProject._targetFlags = targetFlags;
HXProject._userDefines = userDefines;
Project._command = command;
Project._environment = environment;
Project._debug = debug;
Project._target = target;
Project._targetFlags = targetFlags;
Project._userDefines = userDefines;
var project = null;
if (haxelib != null) {
userDefines.set ("rebuild", 1);
project = HXProject.fromHaxelib (haxelib, userDefines);
project = Project.fromHaxelib (haxelib, userDefines);
if (project == null) {
project = new HXProject ();
project = new Project ();
project.config.set ("project.rebuild.path", PathHelper.combine (HaxelibHelper.getPath (haxelib), "project"));
} else {
@@ -391,11 +390,11 @@ class CommandLineTools {
} else {
//project = HXProject.fromPath (path);
//project = Project.fromPath (path);
if (project == null) {
project = new HXProject ();
project = new Project ();
if (FileSystem.isDirectory (path)) {
@@ -421,7 +420,7 @@ class CommandLineTools {
for (haxelib in overrides.haxelibs) {
var includeProject = HXProject.fromHaxelib (haxelib, project.defines);
var includeProject = Project.fromHaxelib (haxelib, project.defines);
if (includeProject != null) {
@@ -528,7 +527,7 @@ class CommandLineTools {
while (true) {
var line = StringTools.trim (process.stdout.readLine ());
trace (line);
if (StringTools.startsWith (line, "-L ")) {
path = StringTools.trim (line.substr (2));
@@ -595,7 +594,7 @@ class CommandLineTools {
#end
private function buildProject (project:HXProject, command:String = "") {
private function buildProject (project:Project, command:String = "") {
if (command == "") {
@@ -797,7 +796,7 @@ class CommandLineTools {
var sampleExists = false;
var defines = new Map<String, Dynamic> ();
defines.set ("create", 1);
var project = HXProject.fromHaxelib (new Haxelib (defaultLibrary), defines);
var project = Project.fromHaxelib (new Haxelib (defaultLibrary), defines);
for (samplePath in project.samplePaths) {
@@ -1340,7 +1339,7 @@ class CommandLineTools {
}
private function getBuildNumber (project:HXProject, increment:Bool = true):Void {
private function getBuildNumber (project:Project, increment:Bool = true):Void {
var buildNumber = project.meta.buildNumber;
@@ -1404,7 +1403,7 @@ class CommandLineTools {
}
private function getBuildNumber_GIT (project:HXProject, increment:Bool = true):String {
private function getBuildNumber_GIT (project:Project, increment:Bool = true):String {
var cache = LogHelper.mute;
LogHelper.mute = true;
@@ -1444,7 +1443,7 @@ class CommandLineTools {
}
private function getBuildNumber_SVN (project:HXProject, increment:Bool = true):String {
private function getBuildNumber_SVN (project:Project, increment:Bool = true):String {
var cache = LogHelper.mute;
LogHelper.mute = true;
@@ -1508,7 +1507,7 @@ class CommandLineTools {
}
private function initializeProject (project:HXProject = null, targetName:String = ""):HXProject {
private function initializeProject (project:Project = null, targetName:String = ""):Project {
LogHelper.info ("", LogHelper.accentColor + "Initializing project..." + LogHelper.resetColor);
@@ -1729,12 +1728,12 @@ class CommandLineTools {
}
HXProject._command = command;
HXProject._debug = debug;
HXProject._environment = environment;
HXProject._target = target;
HXProject._targetFlags = targetFlags;
HXProject._userDefines = userDefines;
Project._command = command;
Project._debug = debug;
Project._environment = environment;
Project._target = target;
Project._targetFlags = targetFlags;
Project._userDefines = userDefines;
var config = ConfigHelper.getConfig ();
@@ -1854,12 +1853,12 @@ class CommandLineTools {
if (project == null) {
HXProject._command = command;
HXProject._debug = debug;
HXProject._environment = environment;
HXProject._target = target;
HXProject._targetFlags = targetFlags;
HXProject._userDefines = userDefines;
Project._command = command;
Project._debug = debug;
Project._environment = environment;
Project._target = target;
Project._targetFlags = targetFlags;
Project._userDefines = userDefines;
try { Sys.setCwd (Path.directory (projectFile)); } catch (e:Dynamic) {}
@@ -1869,7 +1868,7 @@ class CommandLineTools {
} else if (Path.extension (projectFile) == "hxp") {
project = HXProject.fromFile (projectFile, userDefines, includePaths);
project = Project.fromFile (projectFile, userDefines, includePaths);
if (project != null) {

22
tools/platforms/AIRPlatform.hx
View File

@@ -3,8 +3,25 @@ package;
import haxe.io.Path;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.AIRHelper;
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.FlashHelper;
import hxp.Icon;
import hxp.IconHelper;
import hxp.LogHelper;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.PlatformType;
import hxp.Project;
import hxp.ZipHelper;
#else
import hxp.project.AssetType;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Icon;
import hxp.project.Platform;
import hxp.project.PlatformType;
@@ -18,6 +35,7 @@ import hxp.helpers.PathHelper;
import hxp.helpers.PlatformHelper;
import hxp.helpers.LogHelper;
import hxp.helpers.ZipHelper;
#end
import sys.io.File;
import sys.FileSystem;
@@ -31,7 +49,7 @@ class AIRPlatform extends FlashPlatform {
private var targetPlatformType:PlatformType;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String>) {
public function new (command:String, _project:Project, targetFlags:Map<String, String>) {
super (command, _project, targetFlags);

24
tools/platforms/AndroidPlatform.hx
View File

@@ -3,6 +3,25 @@ package;
import haxe.io.Path;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.AndroidHelper;
import hxp.Architecture;
import hxp.ArrayHelper;
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.Haxelib;
import hxp.Icon;
import hxp.IconHelper;
import hxp.LogHelper;
import hxp.PathHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.WatchHelper;
#else
import hxp.helpers.AndroidHelper;
import hxp.helpers.ArrayHelper;
import hxp.helpers.AssetHelper;
@@ -17,9 +36,10 @@ import hxp.helpers.WatchHelper;
import hxp.project.Architecture;
import hxp.project.AssetType;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Icon;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.FileSystem;
@@ -30,7 +50,7 @@ class AndroidPlatform extends PlatformTarget {
private var deviceID:String;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String>) {
public function new (command:String, _project:Project, targetFlags:Map<String, String>) {
super (command, _project, targetFlags);

19
tools/platforms/EmscriptenPlatform.hx
View File

@@ -4,6 +4,20 @@ package;
import haxe.io.Path;
import haxe.Json;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.Haxelib;
import hxp.HTML5Helper;
import hxp.LogHelper;
import hxp.PathHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
#else
import hxp.helpers.AssetHelper;
import hxp.helpers.CPPHelper;
import hxp.helpers.DeploymentHelper;
@@ -14,8 +28,9 @@ import hxp.helpers.PathHelper;
import hxp.helpers.ProcessHelper;
import hxp.project.AssetType;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.FileSystem;
@@ -26,7 +41,7 @@ class EmscriptenPlatform extends PlatformTarget {
private var outputFile:String;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String>) {
public function new (command:String, _project:Project, targetFlags:Map<String, String>) {
super (command, _project, targetFlags);

22
tools/platforms/FlashPlatform.hx
View File

@@ -4,6 +4,23 @@ package;
import haxe.io.Path;
import haxe.Json;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.FlashHelper;
import hxp.Haxelib;
import hxp.HTML5Helper;
import hxp.LogHelper;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.WatchHelper;
#else
import hxp.helpers.AssetHelper;
import hxp.helpers.DeploymentHelper;
import hxp.helpers.FileHelper;
@@ -16,9 +33,10 @@ import hxp.helpers.ProcessHelper;
import hxp.helpers.WatchHelper;
import hxp.project.AssetType;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Platform;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.FileSystem;
@@ -34,7 +52,7 @@ class FlashPlatform extends PlatformTarget {
private var logLength:Int = 0;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String>) {
public function new (command:String, _project:Project, targetFlags:Map<String, String>) {
super (command, _project, targetFlags);

24
tools/platforms/HTML5Platform.hx
View File

@@ -6,6 +6,23 @@ import haxe.Template;
#if lime
import lime.text.Font;
#end
#if (hxp > "1.0.0")
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.DeploymentHelper;
import hxp.ElectronHelper;
import hxp.FileHelper;
import hxp.HTML5Helper;
import hxp.Icon;
import hxp.IconHelper;
import hxp.LogHelper;
import hxp.ModuleHelper;
import hxp.PathHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.WatchHelper;
#else
import hxp.helpers.AssetHelper;
import hxp.helpers.DeploymentHelper;
import hxp.helpers.ElectronHelper;
@@ -18,9 +35,10 @@ import hxp.helpers.PathHelper;
import hxp.helpers.ProcessHelper;
import hxp.helpers.WatchHelper;
import hxp.project.AssetType;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Icon;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.FileSystem;
@@ -32,7 +50,7 @@ class HTML5Platform extends PlatformTarget {
private var outputFile:String;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
public function new (command:String, _project:Project, targetFlags:Map<String, String> ) {
super (command, _project, targetFlags);
@@ -145,7 +163,7 @@ class HTML5Platform extends PlatformTarget {
}
private function initialize (command:String, project:HXProject):Void {
private function initialize (command:String, project:Project):Void {
if (targetFlags.exists ("electron")) {

36
tools/platforms/IOSPlatform.hx
View File

@@ -5,6 +5,31 @@ package;
import haxe.io.Path;
import haxe.Json;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.Architecture;
import hxp.ArrayHelper;
import hxp.Asset;
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.Haxelib;
import hxp.Icon;
import hxp.IconHelper;
import hxp.IOSHelper;
import hxp.Keystore;
import hxp.LogHelper;
import hxp.NDLL;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.StringHelper;
import hxp.WatchHelper;
#else
import hxp.helpers.ArrayHelper;
import hxp.helpers.AssetHelper;
import hxp.helpers.CPPHelper;
@@ -18,19 +43,20 @@ import hxp.helpers.PlatformHelper;
import hxp.helpers.ProcessHelper;
import hxp.helpers.StringHelper;
import hxp.helpers.WatchHelper;
#if lime
import lime.graphics.Image;
#end
import hxp.project.Architecture;
import hxp.project.Asset;
import hxp.project.AssetType;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Icon;
import hxp.project.Keystore;
import hxp.project.NDLL;
import hxp.project.Platform;
import hxp.project.PlatformTarget;
#end
#if lime
import lime.graphics.Image;
#end
import sys.io.File;
import sys.FileSystem;
@@ -38,7 +64,7 @@ import sys.FileSystem;
class IOSPlatform extends PlatformTarget {
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
public function new (command:String, _project:Project, targetFlags:Map<String, String> ) {
super (command, _project, targetFlags);

25
tools/platforms/LinuxPlatform.hx
View File

@@ -3,6 +3,26 @@ package;
import haxe.io.Path;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.Architecture;
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.Haxelib;
import hxp.JavaHelper;
import hxp.LogHelper;
import hxp.NekoHelper;
import hxp.NodeJSHelper;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.WatchHelper;
#else
import hxp.helpers.AssetHelper;
import hxp.helpers.CPPHelper;
import hxp.helpers.DeploymentHelper;
@@ -18,9 +38,10 @@ import hxp.helpers.WatchHelper;
import hxp.project.AssetType;
import hxp.project.Architecture;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Platform;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.io.Process;
import sys.FileSystem;
@@ -36,7 +57,7 @@ class LinuxPlatform extends PlatformTarget {
private var targetType:String;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
public function new (command:String, _project:Project, targetFlags:Map<String, String> ) {
super (command, _project, targetFlags);

30
tools/platforms/MacPlatform.hx
View File

@@ -3,6 +3,31 @@ package;
import haxe.io.Path;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.Architecture;
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.CSHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.GUID;
import hxp.Haxelib;
import hxp.HaxelibHelper;
import hxp.Icon;
import hxp.IconHelper;
import hxp.JavaHelper;
import hxp.LogHelper;
import hxp.NekoHelper;
import hxp.NodeJSHelper;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.WatchHelper;
#else
import hxp.helpers.AssetHelper;
import hxp.helpers.CPPHelper;
import hxp.helpers.CSHelper;
@@ -22,10 +47,11 @@ import hxp.helpers.WatchHelper;
import hxp.project.AssetType;
import hxp.project.Architecture;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Icon;
import hxp.project.Platform;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.FileSystem;
@@ -41,7 +67,7 @@ class MacPlatform extends PlatformTarget {
private var targetType:String;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
public function new (command:String, _project:Project, targetFlags:Map<String, String> ) {
super (command, _project, targetFlags);

40
tools/platforms/TVOSPlatform.hx
View File

@@ -5,32 +5,58 @@ package;
import haxe.io.Path;
import haxe.Json;
import haxe.Template;
import hxp.helpers.AssetHelper;
#if (hxp > "1.0.0")
import hxp.Architecture;
import hxp.ArrayHelper;
import hxp.Asset;
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.Haxelib;
import hxp.Icon;
import hxp.IconHelper;
import hxp.Keystore;
import hxp.LogHelper;
import hxp.NDLL;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.StringHelper;
import hxp.TVOSHelper;
import hxp.WatchHelper;
#else
import hxp.helpers.ArrayHelper;
import hxp.helpers.AssetHelper;
import hxp.helpers.CPPHelper;
import hxp.helpers.DeploymentHelper;
import hxp.helpers.FileHelper;
import hxp.helpers.IconHelper;
import hxp.helpers.TVOSHelper;
import hxp.helpers.LogHelper;
import hxp.helpers.PathHelper;
import hxp.helpers.PlatformHelper;
import hxp.helpers.ProcessHelper;
import hxp.helpers.StringHelper;
import hxp.helpers.TVOSHelper;
import hxp.helpers.WatchHelper;
#if lime
import lime.graphics.Image;
#end
import hxp.project.Architecture;
import hxp.project.Asset;
import hxp.project.AssetType;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Icon;
import hxp.project.Keystore;
import hxp.project.NDLL;
import hxp.project.Platform;
import hxp.project.PlatformTarget;
#end
#if lime
import lime.graphics.Image;
#end
import sys.io.File;
import sys.FileSystem;
@@ -38,7 +64,7 @@ import sys.FileSystem;
class TVOSPlatform extends PlatformTarget {
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
public function new (command:String, _project:Project, targetFlags:Map<String, String> ) {
super (command, _project, targetFlags);

19
tools/platforms/TizenPlatform.hx
View File

@@ -3,6 +3,20 @@ package;
import haxe.io.Path;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.Icon;
import hxp.IconHelper;
import hxp.PathHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.TizenHelper;
#else
import hxp.helpers.AssetHelper;
import hxp.helpers.CPPHelper;
import hxp.helpers.DeploymentHelper;
@@ -12,9 +26,10 @@ import hxp.helpers.PathHelper;
import hxp.helpers.ProcessHelper;
import hxp.helpers.TizenHelper;
import hxp.project.AssetType;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Icon;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.FileSystem;
@@ -25,7 +40,7 @@ class TizenPlatform extends PlatformTarget {
private static var uuid:String = null;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
public function new (command:String, _project:Project, targetFlags:Map<String, String> ) {
super (command, _project, targetFlags);

32
tools/platforms/WindowsPlatform.hx
View File

@@ -3,6 +3,33 @@ package;
import haxe.io.Path;
import haxe.Template;
#if (hxp > "1.0.0")
import hxp.Architecture;
import hxp.Asset;
import hxp.AssetHelper;
import hxp.AssetType;
import hxp.CPPHelper;
import hxp.CSHelper;
import hxp.DeploymentHelper;
import hxp.FileHelper;
import hxp.GUID;
import hxp.Haxelib;
import hxp.HTML5Helper;
import hxp.Icon;
import hxp.IconHelper;
import hxp.JavaHelper;
import hxp.LogHelper;
import hxp.ModuleHelper;
import hxp.NekoHelper;
import hxp.NodeJSHelper;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.PlatformTarget;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.WatchHelper;
#else
import hxp.project.Icon;
import hxp.helpers.AssetHelper;
import hxp.helpers.CPPHelper;
@@ -25,9 +52,10 @@ import hxp.project.Architecture;
import hxp.project.Asset;
import hxp.project.AssetType;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Platform;
import hxp.project.PlatformTarget;
#end
import sys.io.File;
import sys.FileSystem;
@@ -42,7 +70,7 @@ class WindowsPlatform extends PlatformTarget {
private var outputFile:String;
public function new (command:String, _project:HXProject, targetFlags:Map<String, String> ) {
public function new (command:String, _project:Project, targetFlags:Map<String, String> ) {
super (command, _project, targetFlags);

22
tools/utils/CreateTemplate.hx
View File

@@ -1,14 +1,24 @@
package utils;
#if (hxp > "1.0.0")
import hxp.FileHelper;
import hxp.Haxelib;
import hxp.HaxelibHelper;
import hxp.LogHelper;
import hxp.PathHelper;
import hxp.Project;
#else
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 hxp.project.HXProject in Project;
#end
import sys.FileSystem;
@:access(hxp.Project)
@:access(hxp.project.HXProject)
@@ -82,7 +92,7 @@ class CreateTemplate {
}
public static function createProject (words:Array<String>, userDefines:Map<String, Dynamic>, overrides:HXProject):Void {
public static function createProject (words:Array<String>, userDefines:Map<String, Dynamic>, overrides:Project):Void {
var colonIndex = words[0].indexOf (":");
@@ -141,7 +151,7 @@ class CreateTemplate {
var defines = new Map<String, Dynamic> ();
defines.set ("create", 1);
var project = HXProject.fromHaxelib (new Haxelib (projectName), defines);
var project = Project.fromHaxelib (new Haxelib (projectName), defines);
if (project != null) {
@@ -361,14 +371,14 @@ class CreateTemplate {
var defines = new Map<String, Dynamic> ();
defines.set ("create", 1);
var project = HXProject.fromHaxelib (new Haxelib (projectName), defines);
var project = Project.fromHaxelib (new Haxelib (projectName), defines);
if (project == null && outputPath == null) {
outputPath = sampleName;
sampleName = projectName;
projectName = CommandLineTools.defaultLibrary;
project = HXProject.fromHaxelib (new Haxelib (projectName), defines);
project = Project.fromHaxelib (new Haxelib (projectName), defines);
}
@@ -412,7 +422,7 @@ class CreateTemplate {
var defines = new Map<String, Dynamic> ();
defines.set ("create", 1);
var project = HXProject.fromHaxelib (new Haxelib (projectName), defines);
var project = Project.fromHaxelib (new Haxelib (projectName), defines);
if (project != null) {

12
tools/utils/JavaExternGenerator.hx
View File

@@ -7,9 +7,15 @@ import haxe.io.Input;
import haxe.io.Output;
import haxe.io.Path;
import haxe.zip.Reader;
#if (hxp > "1.0.0")
import hxp.PathHelper;
import hxp.ProcessHelper;
import hxp.Project;
#else
import hxp.helpers.PathHelper;
import hxp.helpers.ProcessHelper;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
#end
import sys.io.File;
import sys.io.Process;
import sys.FileSystem;
@@ -32,7 +38,7 @@ class JavaExternGenerator
private static var base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
private static var fmatch = ~/^\((.*)\)(.*)/;
private var config:HXProject;
private var config:Project;
private var externPath:String;
private var extractedAndroidClasses:Bool;
private var extractedAndroidPaths:Array<String>;
@@ -48,7 +54,7 @@ class JavaExternGenerator
private var retType:JNIType;
public function new(config:HXProject, javaPath:String, externPath:String)
public function new(config:Project, javaPath:String, externPath:String)
{
this.config = config;
this.javaPath = javaPath;

21
tools/utils/PlatformSetup.hx
View File

@@ -5,6 +5,20 @@ import haxe.Http;
import haxe.io.Eof;
import haxe.io.Path;
import haxe.zip.Reader;
#if (hxp > "1.0.0")
import hxp.CLIHelper;
import hxp.ConfigHelper;
import hxp.FileHelper;
import hxp.Haxelib;
import hxp.HaxelibHelper;
import hxp.LogHelper;
import hxp.PathHelper;
import hxp.Platform;
import hxp.PlatformHelper;
import hxp.ProcessHelper;
import hxp.Project;
import hxp.Version;
#else
import hxp.helpers.CLIHelper;
import hxp.helpers.ConfigHelper;
import hxp.helpers.FileHelper;
@@ -14,9 +28,10 @@ import hxp.helpers.PathHelper;
import hxp.helpers.PlatformHelper;
import hxp.helpers.ProcessHelper;
import hxp.project.Haxelib;
import hxp.project.HXProject;
import hxp.project.HXProject in Project;
import hxp.project.Platform;
import hxp.project.Version;
#end
import sys.io.File;
import sys.io.Process;
import sys.FileSystem;
@@ -813,7 +828,7 @@ class PlatformSetup {
}
var project = HXProject.fromHaxelib (haxelib, defines, true);
var project = Project.fromHaxelib (haxelib, defines, true);
if (project != null && project.haxelibs.length > 0) {
@@ -1214,7 +1229,7 @@ class PlatformSetup {
try {
project = HXProject.fromHaxelib (new Haxelib ("openfl"));
project = Project.fromHaxelib (new Haxelib ("openfl"));
} catch (e:Dynamic) {}