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

- fix some path issues

Browse Source 
- remove white space changes compared to dev branch
This commit is contained in:
jared gholston
2017-09-15 11:56:11 -07:00
committed by Joshua Granick
parent 89fee086e9
commit a6b88222ee
3 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

252
lime/tools/platforms/WindowsPlatform.hx
View File

@@ -78,8 +78,10 @@ class WindowsPlatform extends PlatformTarget {
targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("windows.output-directory", targetType == "cpp" ? "windows" : targetType)); targetDirectory = PathHelper.combine (project.app.path, project.config.getString ("windows.output-directory", targetType == "cpp" ? "windows" : targetType));
if (project.targetFlags.exists ("uwp")) { if (project.targetFlags.exists ("uwp")) {
targetDirectory = PathHelper.combine (project.app.path, "windows" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType);
outputFile = targetDirectory + "/bin/source/js/" + project.app.file + ".js"; //targetDirectory = PathHelper.combine (project.app.path, "windows" + (is64 ? "64" : "") + "/" + targetType + "/" + buildType);
outputFile = targetDirectory + "/source/js/" + project.app.file + ".js";
} }
targetDirectory = StringTools.replace (targetDirectory, "arch64", is64 ? "64" : ""); targetDirectory = StringTools.replace (targetDirectory, "arch64", is64 ? "64" : "");
@@ -95,26 +97,32 @@ class WindowsPlatform extends PlatformTarget {
var hxml = targetDirectory + "/haxe/" + buildType + ".hxml"; var hxml = targetDirectory + "/haxe/" + buildType + ".hxml";
PathHelper.mkdir (targetDirectory); PathHelper.mkdir (targetDirectory);
var icons = project.icons;
if (icons.length == 0) {
icons = [ new Icon (PathHelper.findTemplate (project.templatePaths, "default/icon.svg")) ];
}
// universal windows platform // universal windows platform
// for now build html5 // for now build html5
if (project.targetFlags.exists ("uwp")) { if (project.targetFlags.exists ("uwp")) {
Sys.println ("Start UWP Build");
ModuleHelper.buildModules (project, targetDirectory + "/obj", targetDirectory + "/bin"); ModuleHelper.buildModules (project, targetDirectory, targetDirectory);
if (project.app.main != null) { if (project.app.main != null) {
ProcessHelper.runCommand ("", "haxe", [ hxml ] ); ProcessHelper.runCommand ("", "haxe", [ hxml ] );
//ProcessHelper.runCommand("","MSBuild",[ targetDirectory + "/bin/source/uwp-project.jsproj", "/p:Configuration=Release", "/t:HelloWorld"]); ProcessHelper.runCommand("","MSBuild",[ targetDirectory + "/source/uwp-project.jsproj",
ProcessHelper.runCommand("","MSBuild",[ targetDirectory + "/bin/source/uwp-project.jsproj",
"/p:Configuration=Release"]); "/p:Configuration=Release"]);
//MSBuild temp/uwa/vws/vws.jsproj /p:Configuration=Release"
if (noOutput) return; if (noOutput) return;
if (project.targetFlags.exists ("webgl")) { if (project.targetFlags.exists ("webgl")) {
FileHelper.copyFile (targetDirectory + "/obj/ApplicationMain.js", outputFile); FileHelper.copyFile (targetDirectory + "/source/ApplicationMain.js", outputFile);
} }
@@ -126,12 +134,12 @@ class WindowsPlatform extends PlatformTarget {
if (project.targetFlags.exists ("minify") || buildType == "final") { if (project.targetFlags.exists ("minify") || buildType == "final") {
HTML5Helper.minify (project, targetDirectory + "/bin/" + project.app.file + ".js"); HTML5Helper.minify (project, targetDirectory + outputFile);
} }
} }
//return; return;
} }
for (dependency in project.dependencies) { for (dependency in project.dependencies) {
@@ -155,112 +163,106 @@ class WindowsPlatform extends PlatformTarget {
} }
var icons = project.icons;
//IconHelper.createIcon (project.icons, 32, 32, PathHelper.combine (applicationDirectory, "icon.png"));
if (icons.length == 0) { if (targetType == "neko") {
icons = [ new Icon (PathHelper.findTemplate (project.templatePaths, "default/icon.svg")) ]; ProcessHelper.runCommand ("", "haxe", [ hxml ]);
if (noOutput) return;
var iconPath = PathHelper.combine (applicationDirectory, "icon.ico");
if (!IconHelper.createWindowsIcon (icons, iconPath)) {
iconPath = null;
}
NekoHelper.createWindowsExecutable (project.templatePaths, targetDirectory + "/obj/ApplicationMain.n", executablePath, iconPath);
NekoHelper.copyLibraries (project.templatePaths, "windows" + (is64 ? "64" : ""), applicationDirectory);
} else if (targetType == "nodejs") {
ProcessHelper.runCommand ("", "haxe", [ hxml ]);
if (noOutput) return;
//NekoHelper.createExecutable (project.templatePaths, "windows" + (is64 ? "64" : ""), targetDirectory + "/obj/ApplicationMain.n", executablePath);
NekoHelper.copyLibraries (project.templatePaths, "windows" + (is64 ? "64" : ""), applicationDirectory);
} else if (targetType == "cs") {
ProcessHelper.runCommand ("", "haxe", [ hxml ]);
if (noOutput) return;
CSHelper.copySourceFiles (project.templatePaths, targetDirectory + "/obj/src");
var txtPath = targetDirectory + "/obj/hxcs_build.txt";
CSHelper.addSourceFiles (txtPath, CSHelper.ndllSourceFiles);
CSHelper.addGUID (txtPath, GUID.uuid ());
CSHelper.compile (project, targetDirectory + "/obj", applicationDirectory + project.app.file, "x86", "desktop");
} else {
var haxeArgs = [ hxml ];
var flags = [];
if (is64) {
haxeArgs.push ("-D");
haxeArgs.push ("HXCPP_M64");
flags.push ("-DHXCPP_M64");
} else {
flags.push ("-DHXCPP_M32");
}
if (!project.environment.exists ("SHOW_CONSOLE")) {
haxeArgs.push ("-D");
haxeArgs.push ("no_console");
flags.push ("-Dno_console");
}
if (!project.targetFlags.exists ("static")) {
ProcessHelper.runCommand ("", "haxe", haxeArgs);
if (noOutput) return;
CPPHelper.compile (project, targetDirectory + "/obj", flags);
FileHelper.copyFile (targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-debug" : "") + ".exe", executablePath);
} else {
ProcessHelper.runCommand ("", "haxe", haxeArgs.concat ([ "-D", "static_link" ]));
if (noOutput) return;
CPPHelper.compile (project, targetDirectory + "/obj", flags.concat ([ "-Dstatic_link" ]));
CPPHelper.compile (project, targetDirectory + "/obj", flags, "BuildMain.xml");
FileHelper.copyFile (targetDirectory + "/obj/Main" + (project.debug ? "-debug" : "") + ".exe", executablePath);
}
var iconPath = PathHelper.combine (applicationDirectory, "icon.ico");
if (IconHelper.createWindowsIcon (icons, iconPath) && PlatformHelper.hostPlatform == Platform.WINDOWS) {
var templates = [ PathHelper.getHaxelib (new Haxelib ("lime")) + "/templates" ].concat (project.templatePaths);
ProcessHelper.runCommand ("", PathHelper.findTemplate (templates, "bin/ReplaceVistaIcon.exe"), [ executablePath, iconPath, "1" ], true, true);
}
} }
// //IconHelper.createIcon (project.icons, 32, 32, PathHelper.combine (applicationDirectory, "icon.png"));
//
// if (targetType == "neko") {
//
// ProcessHelper.runCommand ("", "haxe", [ hxml ]);
//
// if (noOutput) return;
//
// var iconPath = PathHelper.combine (applicationDirectory, "icon.ico");
//
// if (!IconHelper.createWindowsIcon (icons, iconPath)) {
//
// iconPath = null;
//
// }
//
// NekoHelper.createWindowsExecutable (project.templatePaths, targetDirectory + "/obj/ApplicationMain.n", executablePath, iconPath);
// NekoHelper.copyLibraries (project.templatePaths, "windows" + (is64 ? "64" : ""), applicationDirectory);
//
// } else if (targetType == "nodejs") {
//
// ProcessHelper.runCommand ("", "haxe", [ hxml ]);
//
// if (noOutput) return;
//
// //NekoHelper.createExecutable (project.templatePaths, "windows" + (is64 ? "64" : ""), targetDirectory + "/obj/ApplicationMain.n", executablePath);
// NekoHelper.copyLibraries (project.templatePaths, "windows" + (is64 ? "64" : ""), applicationDirectory);
//
// } else if (targetType == "cs") {
//
// ProcessHelper.runCommand ("", "haxe", [ hxml ]);
//
// if (noOutput) return;
//
// CSHelper.copySourceFiles (project.templatePaths, targetDirectory + "/obj/src");
// var txtPath = targetDirectory + "/obj/hxcs_build.txt";
// CSHelper.addSourceFiles (txtPath, CSHelper.ndllSourceFiles);
// CSHelper.addGUID (txtPath, GUID.uuid ());
// CSHelper.compile (project, targetDirectory + "/obj", applicationDirectory + project.app.file, "x86", "desktop");
// } else {
//
// var haxeArgs = [ hxml ];
// var flags = [];
//
// if (is64) {
//
// haxeArgs.push ("-D");
// haxeArgs.push ("HXCPP_M64");
// flags.push ("-DHXCPP_M64");
//
// } else {
//
// flags.push ("-DHXCPP_M32");
//
// }
//
// if (!project.environment.exists ("SHOW_CONSOLE")) {
//
// haxeArgs.push ("-D");
// haxeArgs.push ("no_console");
// flags.push ("-Dno_console");
//
// }
//
// if (!project.targetFlags.exists ("static")) {
//
// ProcessHelper.runCommand ("", "haxe", haxeArgs);
//
// if (noOutput) return;
//
// CPPHelper.compile (project, targetDirectory + "/obj", flags);
//
// FileHelper.copyFile (targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-debug" : "") + ".exe", executablePath);
//
// } else {
//
// ProcessHelper.runCommand ("", "haxe", haxeArgs.concat ([ "-D", "static_link" ]));
//
// if (noOutput) return;
//
// CPPHelper.compile (project, targetDirectory + "/obj", flags.concat ([ "-Dstatic_link" ]));
// CPPHelper.compile (project, targetDirectory + "/obj", flags, "BuildMain.xml");
//
// FileHelper.copyFile (targetDirectory + "/obj/Main" + (project.debug ? "-debug" : "") + ".exe", executablePath);
//
// }
//
// var iconPath = PathHelper.combine (applicationDirectory, "icon.ico");
//
// if (IconHelper.createWindowsIcon (icons, iconPath) && PlatformHelper.hostPlatform == Platform.WINDOWS) {
//
// var templates = [ PathHelper.getHaxelib (new Haxelib ("lime")) + "/templates" ].concat (project.templatePaths);
// ProcessHelper.runCommand ("", PathHelper.findTemplate (templates, "bin/ReplaceVistaIcon.exe"), [ executablePath, iconPath, "1" ], true, true);
//
// }
//
// }
} }
@@ -428,7 +430,7 @@ class WindowsPlatform extends PlatformTarget {
project = project.clone (); project = project.clone ();
var destination = targetDirectory + "/bin/source/"; var destination = targetDirectory + "/source/";
PathHelper.mkdir (destination); PathHelper.mkdir (destination);
var webfontDirectory = targetDirectory + "/obj/webfont"; var webfontDirectory = targetDirectory + "/obj/webfont";
@@ -520,7 +522,7 @@ class WindowsPlatform extends PlatformTarget {
if (project.targetFlags.exists ("webgl")) { if (project.targetFlags.exists ("webgl")) {
context.CPP_DIR = targetDirectory + "/obj"; context.CPP_DIR = targetDirectory;
} }
@@ -567,8 +569,19 @@ class WindowsPlatform extends PlatformTarget {
} }
} }
context.guid = GUID.uuid(); var seed = "unknown";
if(project.defines.exists("APP_PACKAGE")) {
seed = project.defines.get("APP_PACKAGE");
} else if(project.defines.exists("APP_TITLE")) {
seed = project.defines.get("APP_TITLE");
}
var guid = GUID.seededUuid(seed);
context.APP_GUID = guid;
var guidNoBrackets = guid.split("{").join("").split("}").join("");
context.APP_GUID_NOBRACKETS = guidNoBrackets;
context.APP_DESCRIPTION = project.defines.get("APP_DESCRIPTION") != null ?
project.defines.get("APP_DESCRIPTION") : project.defines.get("APP_TITLE");
for (asset in project.assets) { for (asset in project.assets) {
@@ -607,10 +620,7 @@ class WindowsPlatform extends PlatformTarget {
} }
//FileHelper.recursiveCopyTemplate (project.templatePaths, "windows/template", destination, context); FileHelper.recursiveCopyTemplate (project.templatePaths, "windows/template", targetDirectory, context);
FileHelper.recursiveCopyTemplate (project.templatePaths, "windows/template", targetDirectory + "/bin/", context);
Sys.println("project.templatePaths: " + project.templatePaths);
if (project.app.main != null) { if (project.app.main != null) {

4
templates/windows/template/source/package.appxmanifest
View File

@@ -14,7 +14,7 @@
<Properties> <Properties>
<DisplayName>::APP_TITLE::</DisplayName> <DisplayName>::APP_TITLE::</DisplayName>
<PublisherDisplayName>OpenFL</PublisherDisplayName> <PublisherDisplayName>::APP_COMPANY::</PublisherDisplayName>
<Logo>images\storelogo.png</Logo> <Logo>images\storelogo.png</Logo>
</Properties> </Properties>
@@ -33,7 +33,7 @@
<uap:VisualElements <uap:VisualElements
DisplayName="::APP_TITLE::" DisplayName="::APP_TITLE::"
Description="::APP_TITLE::" Description="::APP_DESCRIPTION::"
BackgroundColor="transparent" BackgroundColor="transparent"
Square150x150Logo="images\Square150x150Logo.png" Square150x150Logo="images\Square150x150Logo.png"
Square44x44Logo="images\Square44x44Logo.png"> Square44x44Logo="images\Square44x44Logo.png">

3
templates/windows/template/source/uwp-project.jsproj
View File

@@ -85,9 +85,6 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
<Target Name="HelloWorld">
<Message Text="Hello"></Message> <Message Text="World"></Message>
</Target>
<!-- To modify your build process, add your task inside one of the targets below then uncomment <!-- To modify your build process, add your task inside one of the targets below then uncomment
that target and the DisableFastUpToDateCheck PropertyGroup. that target and the DisableFastUpToDateCheck PropertyGroup.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.