From 7573d66aa7b20acc66f4c04222a363f9880b583a Mon Sep 17 00:00:00 2001 From: James Date: Thu, 7 Sep 2017 23:35:28 +1000 Subject: [PATCH] Implement support for Mingw in repo --- package-lock.json | 29 ++++++++++------------------- scripts/mingw-canary.qs | 17 +++++++++++++++++ scripts/mingw-nightly.qs | 17 +++++++++++++++++ scripts/msvc-canary.qs | 2 +- scripts/msvc-nightly.qs | 6 +++--- 5 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 scripts/mingw-canary.qs create mode 100644 scripts/mingw-nightly.qs diff --git a/package-lock.json b/package-lock.json index aa2297e..e698b9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,16 +7,7 @@ "7zip-bin": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-2.1.0.tgz", - "integrity": "sha512-jgBTCcJ0gQedE9o8Jw+H/Gyq//EnQxmVpha7CdprIwzRSC81Uj37inHvPzv6jaZgZwkCcfho52rAaIFBrdbO7w==", - "requires": { - "7zip-bin-linux": "1.1.0" - } - }, - "7zip-bin-linux": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/7zip-bin-linux/-/7zip-bin-linux-1.1.0.tgz", - "integrity": "sha512-BfW7XsUWNV/j723el3gGbiNWdmvLrnTB9VD0BondfCinxCwz4RQ60W4c3UxRpfHn1Q4Cn1o/DxYFmLMgHTEKqg==", - "optional": true + "integrity": "sha512-jgBTCcJ0gQedE9o8Jw+H/Gyq//EnQxmVpha7CdprIwzRSC81Uj37inHvPzv6jaZgZwkCcfho52rAaIFBrdbO7w==" }, "acorn": { "version": "5.1.2", @@ -1785,6 +1776,15 @@ "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -1795,15 +1795,6 @@ "strip-ansi": "4.0.0" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/scripts/mingw-canary.qs b/scripts/mingw-canary.qs new file mode 100644 index 0000000..9babb1b --- /dev/null +++ b/scripts/mingw-canary.qs @@ -0,0 +1,17 @@ +function Component() { + if (systemInfo.kernelType === "winnt") { + component.setValue("Virtual", "false"); + component.setValue("Default", "false"); // bleeding + } else { + component.setValue("Virtual", "true"); + component.setValue("Enabled", "false"); + } +} + +Component.prototype.createOperations = function() +{ + component.createOperations(); + + component.addOperation("CreateShortcut", "@TargetDir@/canary-mingw/citra-qt.exe", "@StartMenuDir@/Citra Canary.lnk", + "workingDirectory=@TargetDir@/canary-mingw"); +} diff --git a/scripts/mingw-nightly.qs b/scripts/mingw-nightly.qs new file mode 100644 index 0000000..0369641 --- /dev/null +++ b/scripts/mingw-nightly.qs @@ -0,0 +1,17 @@ +function Component() { + if (systemInfo.kernelType === "winnt") { + component.setValue("Virtual", "false"); + component.setValue("Default", "true"); + } else { + component.setValue("Virtual", "true"); + component.setValue("Enabled", "false"); + } +} + +Component.prototype.createOperations = function() +{ + component.createOperations(); + + component.addOperation("CreateShortcut", "@TargetDir@/nightly-mingw/citra-qt.exe", "@StartMenuDir@/Citra Nightly.lnk", + "workingDirectory=@TargetDir@/nightly-mingw"); +} diff --git a/scripts/msvc-canary.qs b/scripts/msvc-canary.qs index 453dc36..2437d83 100644 --- a/scripts/msvc-canary.qs +++ b/scripts/msvc-canary.qs @@ -1,6 +1,6 @@ function Component() { if (systemInfo.kernelType === "winnt") { - component.setValue("Virtual", "false"); + component.setValue("Virtual", "true"); // Hidden by default component.setValue("Default", "false"); // bleeding } else { component.setValue("Virtual", "true"); diff --git a/scripts/msvc-nightly.qs b/scripts/msvc-nightly.qs index 305d81f..4d8fe39 100644 --- a/scripts/msvc-nightly.qs +++ b/scripts/msvc-nightly.qs @@ -1,7 +1,7 @@ function Component() { if (systemInfo.kernelType === "winnt") { - component.setValue("Virtual", "false"); - component.setValue("Default", "true"); + component.setValue("Virtual", "true"); + component.setValue("Default", "false"); // msvc } else { component.setValue("Virtual", "true"); component.setValue("Enabled", "false"); @@ -12,6 +12,6 @@ Component.prototype.createOperations = function() { component.createOperations(); - component.addOperation("CreateShortcut", "@TargetDir@/nightly/citra-qt.exe", "@StartMenuDir@/Citra.lnk", + component.addOperation("CreateShortcut", "@TargetDir@/nightly/citra-qt.exe", "@StartMenuDir@/Citra Nightly.lnk", "workingDirectory=@TargetDir@/nightly"); }