Merge master

Applications/Graphics/Microsoft Paint/Online/script.js

@@ -0,0 +1,19 @@
+include(["engines", "wine", "quick_script", "zip_script"]);
+
+var installerImplementation = {
+    run: function () {
+        new ZipScript()
+            .name("Microsoft Paint")
+            .editor("Microsoft")
+            .applicationHomepage("http://www.microsoft.com")
+            .author("Quentin PÂRIS")
+            .url("https://web.archive.org/web/20130218065827if_/http://download.microsoft.com/download/winntwks40/paint/1/nt4/en-us/paintnt.exe")
+            .checksum("a22c4e367ef9d2cd23f0a8ae8d9ebff5bc1e8a0b")
+            .category("Graphics")
+            .executable("MSPAINT.EXE")
+            .go();
+    }
+};
+
+/* exported Installer */
+var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation);

Applications/Graphics/Microsoft Paint/Online/script.json

@@ -0,0 +1,11 @@
+{
+    "scriptName"                 : "Online",
+    "id"                         : "online",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
+}

Applications/Graphics/Microsoft Paint/application.json

@@ -0,0 +1,5 @@
+{
+    "name"        : "Microsoft Paint",
+    "id"          : "microsoftpaint",
+    "description" : "Because we are nostalgic people."
+}

Engines/Wine/Engine/Object/script.js

@@ -7,7 +7,7 @@ include(["utils", "functions", "net", "resource"]);
 /* exported LATEST_STABLE_VERSION */
 var LATEST_STABLE_VERSION = "3.0.4";
 /* exported LATEST_DEVELOPMENT_VERSION */
-var LATEST_DEVELOPMENT_VERSION = "4.0-rc5";
+var LATEST_DEVELOPMENT_VERSION = "4.0-rc6";
 /* exported LATEST_STAGING_VERSION */
 var LATEST_STAGING_VERSION = "4.0-rc4";
 /* exported LATEST_DOS_SUPPORT_VERSION */

Engines/Wine/Plugins/Windows version/script.js

@@ -15,18 +15,26 @@ Wine.prototype.windowsVersion = function (version, servicePack) {
     }
 
     // set
-    var regeditFileContent =
-        "REGEDIT4\n" +
-        "\n" +
-        "[HKEY_CURRENT_USER\\Software\\Wine]\n" +
-        "\"Version\"=\"" + version + "\"\n";
-
-    if (servicePack) {
-        var servicePackNumber = servicePack.replace("sp", "");
-        regeditFileContent += "[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion]\n";
-        regeditFileContent += "\"CSDVersion\"=\"Service Pack "+ servicePackNumber +"\"\n";
-        regeditFileContent += "[HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Windows]\n";
-        regeditFileContent += "\"CSDVersion\"=dword:00000"+servicePackNumber+"00\n";
+    var regeditFileContent;
+    if (version == null) {
+        regeditFileContent =
+            "REGEDIT4\n" +
+            "\n" +
+            "[-HKEY_CURRENT_USER\\Software\\Wine]";
+    } else {
+        regeditFileContent =
+            "REGEDIT4\n" +
+            "\n" +
+            "[HKEY_CURRENT_USER\\Software\\Wine]\n" +
+            "\"Version\"=\"" + version + "\"\n";
+
+        if (servicePack) {
+            var servicePackNumber = servicePack.replace("sp", "");
+            regeditFileContent += "[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion]\n";
+            regeditFileContent += "\"CSDVersion\"=\"Service Pack " + servicePackNumber + "\"\n";
+            regeditFileContent += "[HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Windows]\n";
+            regeditFileContent += "\"CSDVersion\"=dword:00000" + servicePackNumber + "00\n";
+        }
     }
 
     this.regedit().patch(regeditFileContent);
@@ -51,7 +59,7 @@ var SetOsForApplication = function () {
         return that;
     };
 
-    that.do =  function () {
+    that.do = function () {
         that._wine.regedit().patch(that._regeditFileContent);
         return that._wine;
     }

Engines/Wine/Verbs/adobeair/script.js

@@ -0,0 +1,43 @@
+include(["engines", "wine", "engine", "object"]);
+include(["utils", "functions", "net", "resource"]);
+include(["engines", "wine", "plugins", "windows_version"]);
+
+/**
+ * Verb to install adobeair
+ * @returns {Wine} Wine object
+ */
+Wine.prototype.adobeair = function () {
+    var adobeair = new Resource()
+        .wizard(this.wizard())
+        .url("https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe")
+        .checksum("68d26cca4c6c8230d3f7aa850ee227d518288dfc")
+        .name("AdobeAIRInstaller.exe")
+        .get();
+
+    // Using Windows XP to workaround the wine bug 43506
+    // See https://bugs.winehq.org/show_bug.cgi?id=43506
+    var currentWindowsVersion = this.windowsVersion();
+    this.windowsVersion("winxp");
+    this.run(adobeair);
+    this.wait();
+    this.windowsVersion(currentWindowsVersion);
+
+    return this;
+};
+
+/**
+ * Verb to install adobeair
+ */
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "adobeair", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.adobeair();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);

Engines/Wine/Verbs/adobeair/script.json

@@ -0,0 +1,11 @@
+{
+    "scriptName"                 : "Adobe Air",
+    "id"                         : "adobeair",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
+}

Engines/Wine/Verbs/vulkanSDK/script.js

@@ -1,74 +1,52 @@
-include(["engines", "wine", "engine", "object"]);
-include(["engines", "wine", "plugins", "regedit"]);
-include(["utils", "functions", "net", "resource"]);
-include(["utils", "functions", "filesystem", "files"]);
-
-/**
-* Verb to install all the necessary things to run winevulkan (even inside wine mainline or newest wine-staging)
-* see: https://github.com/roderickc/wine-vulkan
-* @returns {Wine} Wine object
-*/
-Wine.prototype.vulkanSDK = function () {
-    print("NOTE: you need a graphic driver that supports Vulkan to run winevulkan");
-    print("NOTE: Vulkan works in wine from version 3.3 (if compiled with vulkan support)");
-
-    var sdkVersion = "1.1.73.0";
-
-    var setupFile = new Resource()
-        .wizard(this.wizard())
-        .url("https://sdk.lunarg.com/sdk/download/" + sdkVersion +"/windows/VulkanSDK-" + sdkVersion + "-Installer.exe")
-        .checksum("ac34f732818c409bcb283b5c6100b373ab6a2404")
-        .name("VulkanSDK-" + sdkVersion + "-Installer.exe")
-        .get();
-
-    this.run(setupFile, "/S");
-
-    var pathVulkanJSON = this.prefixDirectory() + "drive_c/windows/winevulkan.json"
-    var contentVulkanJSON = '{\n'                                                                     +
-                            '	"file_format_version": "1.0.0",\n'				       +
-                            '	"ICD": {\n'							       +
-                            '		"library_path": "c:\\windows\\system32\\winevulkan.dll",\n'    +
-                            '		"api_version": "' + sdkVersion +'"\n'			       +
-                            '	}\n'								       +
-                            '}'
-
-    writeToFile(pathVulkanJSON, contentVulkanJSON);
-
-    var regeditFileContent32 =
-	"REGEDIT4\n"                                              	+
-        "\n"                                                      	+
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Khronos\\Vulkan\\Drivers\\]\n" 	+
-        "\"C:\\\\Windows\\\\winevulkan.json\"=dword:00000000" ;
-
-    this.regedit().patch(regeditFileContent32);
-
-    if (this.architecture() == "amd64") {
-        var regeditFileContent64 =
-		"REGEDIT4\n"                                             	           +
-                "\n"                                                            	   +
-                "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Khronos\\Vulkan\\Drivers\\]n" +
-		"\"C:\\\\Windows\\\\winevulkan.json\"=dword:00000000" ;
-
-        this.regedit().patch(regeditFileContent64);
-    }
-
-    return this;
-}
-
-/**
- * Verb to install all the necessary things to run winevulkan (even inside wine mainline or newest wine-staging)
-*/
-var verbImplementation = {
-    install: function (container) {
-        var wine = new Wine();
-        wine.prefix(container);
-        var wizard = SetupWizard(InstallationType.VERBS, "vulkanSDK", java.util.Optional.empty());
-        wine.wizard(wizard);
-        wine.vulkanSDK();
-        wizard.close();
-    }
-};
-
-/* exported Verb */
-var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
-
+include(["engines", "wine", "engine", "object"]);
+include(["engines", "wine", "plugins", "regedit"]);
+include(["utils", "functions", "net", "resource"]);
+include(["utils", "functions", "filesystem", "files"]);
+
+/**
+* All the necessary things to run winevulkan (even inside wine mainline or newest wine-staging)
+* -> https://github.com/roderickc/wine-vulkan
+* @returns {Wine} Wine object
+*/
+Wine.prototype.vulkanSDK = function () {
+    print("NOTE: you need a graphic driver that supports Vulkan to run winevulkan");
+    print("NOTE: Vulkan works in wine from version 3.3 (if compiled with vulkan support)");
+
+    var setupFile = new Resource()
+        .wizard(this.wizard())
+        .url("https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-sdk.exe?u=")
+        //checksum changes everytime a new version is released
+        .name("vulkan-sdk.exe")
+        .get();
+
+    this.run(setupFile, "/S");
+
+    var patchVulkanJSON = this.prefixDirectory() + "drive_c/windows/winevulkan.json";
+    touch(patchVulkanJSON);
+    writeToFile(patchVulkanJSON, "{\n	\"file_format_version\": \"1.0.0\",\n	\"ICD\": {\n		\"library_path\": \"c:\windows\system32\winevulkan.dll\",\n		\"api_version\": \"1.1.92.1\"\n	}\n}");
+    this.run("reg", ["add", "HKLM\Software\Khronos\Vulkan\Drivers", "/v", "C:\Windows\winevulkan.json", "/t", "REG_DWORD", "/d", "00000000", "/f"], null, false, true);
+
+    if (this.architecture() == "amd64") {
+        this.run("reg", ["add", "HKLM\Software\Wow6432Node\Khronos\Vulkan\Drivers", "/v", "C:\Windows\winevulkan.json", "/t", "REG_DWORD", "/d", "00000000", "/f"], null, false, true);
+    }
+
+    return this;
+
+}
+
+/**
+ * Verb to install all the necessary things to run winevulkan (even inside wine mainline or newest wine-staging)
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "vulkanSDK", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.vulkanSDK();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);

README.md

@@ -68,3 +68,7 @@
     * use the following naming convention  
         * for a new script: "Add \<application name\>" (e.g. "Add 7-zip")
         * for an updated script: "Update \<application name\> \<what changed\>" (e.g. "Update 7-zip to use Wine 2.1")
+
+# Translate
+Phoenicis scripts are localized using Crowdin: https://crowdin.com/project/phoenicis-scripts
+If your language is not listed, please create an [issue](https://github.com/PhoenicisOrg/scripts/issues).

docs/_docs/Develop/script-js.md

@@ -45,7 +45,7 @@ To disable the game overlay:
 ```
 If you need a different category, use:
 ```javascript
-    .catgory("Category") 
+    .category("Category") 
 ```
 For a different shortcut (e.g. if you want to pass arguments):
 ```javascript

docs/_layouts/default.html

@@ -59,13 +59,6 @@ <h1>
 						</li>
 					{% endfor %}
 				</ul>
-
-				<ul>
-					<li class="nav-item top-level {% if page.url == '/changelog/' %}current{% endif %}">
-						{% assign changelog = site.html_pages | where: 'url', '/changelog/' | first %}
-						<a href="{{ site.baseurl }}/changelog/">{{ changelog.title }}</a>
-					</li>
-				</ul>
 			</nav>
 		</header>
 

docs/_sass/_layout.scss

@@ -381,20 +381,6 @@ h4 svg {
 	}
 }
 
-.changelog {
-	&,
-	> div {
-		margin: 0;
-		padding: 0;
-		list-style: none;
-	}
-
-	.date {
-		color: #888;
-		font-style: italic;
-	}
-}
-
 .badge {
 	font-family: "Open Sans", sans-serif;
 	padding: 2px 5px;

docs/jsdoc/Engines_Wine_Engine_Object_script.js.html

@@ -35,7 +35,7 @@ <h1 class="page-title">Source: Engines/Wine/Engine/Object/script.js</h1>
 /* exported LATEST_STABLE_VERSION */
 var LATEST_STABLE_VERSION = "3.0.4";
 /* exported LATEST_DEVELOPMENT_VERSION */
-var LATEST_DEVELOPMENT_VERSION = "4.0-rc5";
+var LATEST_DEVELOPMENT_VERSION = "4.0-rc6";
 /* exported LATEST_STAGING_VERSION */
 var LATEST_STAGING_VERSION = "4.0-rc4";
 /* exported LATEST_DOS_SUPPORT_VERSION */