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

Run formatter

Browse Source
This commit is contained in:
Joshua Granick
2021-03-10 12:48:55 -08:00
parent 2c563b7809
commit 8c9808b038
38 changed files with 116 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/platforms/AndroidPlatform.hx
View File

@@ -280,7 +280,7 @@ class AndroidPlatform extends PlatformTarget
var armv7 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.ARMV7));
var arm64 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.ARM64));
var x86 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.X86));
var x64 = ( /*command == "rebuild" ||*/ ArrayTools.containsValue(project.architectures, Architecture.X64));
var x64 = (/*command == "rebuild" ||*/ ArrayTools.containsValue(project.architectures, Architecture.X64));
var commands = [];

2
tools/platforms/HTML5Platform.hx
View File

@@ -376,7 +376,7 @@ class HTML5Platform extends PlatformTarget
if (asset.type != AssetType.TEMPLATE)
{
if ( /*asset.embed != true &&*/ asset.type != AssetType.FONT)
if (/*asset.embed != true &&*/ asset.type != AssetType.FONT)
{
dir = Path.directory(path);
if (!createdDirectories.exists(dir))

15
tools/platforms/IOSPlatform.hx
View File

@@ -682,12 +682,19 @@ class IOSPlatform extends PlatformTarget
ProjectHelper.recursiveSmartCopyTemplate(project, "iphone/PROJ.xcodeproj", targetDirectory + "/" + project.app.file + ".xcodeproj", context, true,
false);
//Merge plist files
var plistFiles = System.readDirectory(projectDirectory).filter(function(fileName:String){
// Merge plist files
var plistFiles = System.readDirectory(projectDirectory).filter(function(fileName:String)
{
return fileName.substr(-11) == "-Info.plist" && fileName != projectDirectory + "/" + project.app.file + "-Info.plist";
});
for(plist in plistFiles){
System.runCommand(project.workingDirectory, "/usr/libexec/PlistBuddy", ["-x", "-c", "Merge " + plist, projectDirectory + "/" + project.app.file + "-Info.plist"]);
for (plist in plistFiles)
{
System.runCommand(project.workingDirectory, "/usr/libexec/PlistBuddy", [
"-x",
"-c",
"Merge " + plist,
projectDirectory + "/" + project.app.file + "-Info.plist"
]);
}
System.mkdir(projectDirectory + "/lib");

5
tools/platforms/WindowsPlatform.hx
View File

@@ -210,8 +210,9 @@ class WindowsPlatform extends PlatformTarget
var command = #if lime "lime" #else "hxp" #end;
Log.warn("You must define HL_PATH to copy HashLink dependencies, please run '" + command + " setup hl' first");
}else{
}
else
{
System.copyFile(project.environment.get("HL_PATH") + '/ssl.hdll', applicationDirectory + '/ssl.hdll');
}
}

10
tools/utils/PlatformSetup.hx
View File

@@ -413,7 +413,7 @@ class PlatformSetup
case "neko", "cs", "uwp", "winjs", "nodejs", "java":
Log.println("\x1b[0;3mNo additional configuration is required.\x1b[0m");
case "hl", "hashlink":
setupHL();
@@ -1103,7 +1103,6 @@ class PlatformSetup
if (answer == YES || answer == ALWAYS)
{
if (System.hostPlatform == MAC)
{
try
@@ -1183,24 +1182,21 @@ class PlatformSetup
System.openURL(visualStudioURL);
}
}
public static function setupHL():Void
{
Log.println("\x1b[1mIn order to build HashLink executables you must have");
Log.println("HashLink binaries installed.");
Log.println("We recommend using version \"1.10.0\"");
Log.println("available as a free download from Github.\x1b[0m");
var answer = CLIHelper.ask("Would you like to visit the download page now?");
if (answer == YES || answer == ALWAYS)
{
System.openURL(hashlinkURL);
}
getDefineValue("HL_PATH", "Path to Hashlink binaries.");
Log.println("");
Log.println("Setup completed");