Merge master

Engines/Wine/Engine/Object/script.js

@@ -5,13 +5,13 @@ include(["utils", "functions", "net", "download"]);
 include(["utils", "functions", "net", "resource"]);
 
 /* exported LATEST_STABLE_VERSION */
-var LATEST_STABLE_VERSION = "3.0.4";
+var LATEST_STABLE_VERSION = "4.0";
 /* exported LATEST_DEVELOPMENT_VERSION */
-var LATEST_DEVELOPMENT_VERSION = "4.0-rc6";
+var LATEST_DEVELOPMENT_VERSION = "4.0";
 /* exported LATEST_STAGING_VERSION */
-var LATEST_STAGING_VERSION = "4.0-rc4";
+var LATEST_STAGING_VERSION = "4.0";
 /* exported LATEST_DOS_SUPPORT_VERSION */
-var LATEST_DOS_SUPPORT_VERSION = "4.0-rc4";
+var LATEST_DOS_SUPPORT_VERSION = "4.0";
 
 /**
  * Wine main prototype

Engines/Wine/Verbs/DXVK/script.js

@@ -76,7 +76,7 @@ var verbImplementation = {
             .get();
         var latestVersion = cat(releaseFile).replaceAll("\\n", "");
         // query desired version (default: latest release version)
-        var versions = ["0.93", "0.92", "0.91", "0.90",
+        var versions = ["0.95", "0.94", "0.93", "0.92", "0.91", "0.90",
                         "0.81", "0.80", "0.72", "0.71", "0.70",
                         "0.65", "0.64", "0.63", "0.62", "0.61", "0.60",
                         "0.54", "0.53", "0.52", "0.51", "0.50",

Engines/Wine/Verbs/FAudio/script.js

@@ -0,0 +1,70 @@
+include(["engines", "wine", "engine", "object"]);
+include(["engines", "wine", "plugins", "override_dll"]);
+include(["utils", "functions", "net", "resource"]);
+include(["utils", "functions", "filesystem", "files"]);
+
+/**
+* Verb to install FAudio
+* see: https://github.com/Kron4ek/FAudio-Builds
+* @param {String} faudioVersion version of FAudio to downlaod
+* @returns {Wine} Wine object
+*/
+Wine.prototype.faudio = function (faudioVersion) {
+    if(typeof faudioVersion !== 'string') 
+        faudioVersion = "19.01";
+
+    var setupFile = new Resource()
+        .wizard(this.wizard())
+        .url("https://github.com/Kron4ek/FAudio-Builds/releases/download/" + faudioVersion + "/faudio-" + faudioVersion + ".tar.xz")
+        .name("faudio-" + faudioVersion + ".tar.xz")
+        .get();
+
+    new Extractor()
+        .wizard(this.wizard())
+        .archive(setupFile)
+        .to(this.prefixDirectory() + "/FAudio/")
+        .extract();
+
+    var forEach = Array.prototype.forEach;
+    var sys32dir = this.system32directory();
+    var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion;
+    var self = this;
+
+    forEach.call(ls(faudioDir + "/x32"), function (file) {
+        if (file.endsWith(".dll")) {
+            cp(faudioDir + "/x32/" + file, sys32dir);
+            self.overrideDLL()
+                .set("native", [file])
+                .do();
+        }
+    });
+
+    if (this.architecture() == "amd64")
+    {
+        var sys64dir = this.system64directory();
+        forEach.call(ls(faudioDir + "/x64"), function (file) {
+            if (file.endsWith(".dll")) {
+                cp(faudioDir + "/x64/" + file, sys64dir);
+            }
+        });
+    }
+
+    return this;
+}
+
+/**
+ * Verb to install FAudio
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "FAudio", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.faudio();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);

Engines/Wine/Verbs/FAudio/script.json

@@ -0,0 +1,12 @@
+{
+    "scriptName"                 : "faudio",
+    "id"                         : "faudio",
+    "compatibleOperatingSystems" : [
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [
+        "LINUX"
+    ],
+    "free"          : true,
+    "requiresPatch" : false
+}

Engines/Wine/Verbs/VK9/script.js

@@ -15,7 +15,7 @@ Wine.prototype.VK9 = function (vk9Version) {
     print("NOTE: works from 0.28.0");
 
     if (typeof vk9Version !== 'string')
-        vk9Version = "0.28.1";
+        vk9Version = "0.29.0";
 
     var setupFile32 = new Resource()
         .wizard(this.wizard())
@@ -68,7 +68,7 @@ var verbImplementation = {
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "VK9", java.util.Optional.empty());
         // query desired version (default: 0.28.1)
-        var versions = ["0.28.1", "0.28.0", "0.27.0", "0.26.0", "0.25.0", "0.23.0", "0.17.0", "0.16.0", "0.6.0", "0.4.0"];
+        var versions = ["0.29.0", "0.28.1", "0.28.0"]; //this script is not able to install older versions (VK9.conf mandatory)
         var selectedVersion = wizard.menu(tr("Please select the version."), versions, "0.28.1");
         wine.wizard(wizard);
         // install selected version

docs/_docs/Develop/verbs.md

@@ -80,7 +80,11 @@ It is also possible to pass additional parameters to the `extract()`, e.g.
 ```
 
 If you extract many files, don't forget to add a progress bar like it is done for [d3dx9](https://github.com/PhoenicisOrg/scripts/blob/master/Engines/Wine/Verbs/d3dx9/script.js).
+### Copying DLL's to `C:\windows\sys*`
+On Windows 32 bits, 32 bits dll's go to `C:\windows\system32`.
+On Windows 64 bits, 32 bits dll's go to `C:\windows\syswow64` and 64 bits dll's go to system32.
 
+This is already handled inside the engine implementation if you use the functions `wine.system64directory()` for 64 bits dll's and bits and `wine.system32directory` for 32 bits dll's inside your scripts.  
 ### DLL Overrides
 ```javascript
 this.overrideDLL()

docs/jsdoc/Engines_Wine_Engine_Object_script.js.html

@@ -33,13 +33,13 @@ <h1 class="page-title">Source: Engines/Wine/Engine/Object/script.js</h1>
 include(["utils", "functions", "net", "resource"]);
 
 /* exported LATEST_STABLE_VERSION */
-var LATEST_STABLE_VERSION = "3.0.4";
+var LATEST_STABLE_VERSION = "4.0";
 /* exported LATEST_DEVELOPMENT_VERSION */
-var LATEST_DEVELOPMENT_VERSION = "4.0-rc6";
+var LATEST_DEVELOPMENT_VERSION = "4.0";
 /* exported LATEST_STAGING_VERSION */
-var LATEST_STAGING_VERSION = "4.0-rc4";
+var LATEST_STAGING_VERSION = "4.0";
 /* exported LATEST_DOS_SUPPORT_VERSION */
-var LATEST_DOS_SUPPORT_VERSION = "4.0-rc4";
+var LATEST_DOS_SUPPORT_VERSION = "4.0";
 
 /**
  * Wine main prototype

docs/jsdoc/Engines_Wine_Verbs_DXVK_script.js.html

@@ -104,7 +104,7 @@ <h1 class="page-title">Source: Engines/Wine/Verbs/DXVK/script.js</h1>
             .get();
         var latestVersion = cat(releaseFile).replaceAll("\\n", "");
         // query desired version (default: latest release version)
-        var versions = ["0.93", "0.92", "0.91", "0.90",
+        var versions = ["0.95", "0.94", "0.93", "0.92", "0.91", "0.90",
                         "0.81", "0.80", "0.72", "0.71", "0.70",
                         "0.65", "0.64", "0.63", "0.62", "0.61", "0.60",
                         "0.54", "0.53", "0.52", "0.51", "0.50",

docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Source: Engines/Wine/Verbs/FAudio/script.js</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Source: Engines/Wine/Verbs/FAudio/script.js</h1>
+
+
+
+
+
+
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>include(["engines", "wine", "engine", "object"]);
+include(["engines", "wine", "plugins", "override_dll"]);
+include(["utils", "functions", "net", "resource"]);
+include(["utils", "functions", "filesystem", "files"]);
+
+/**
+* Verb to install FAudio
+* see: https://github.com/Kron4ek/FAudio-Builds
+* @param {String} faudioVersion version of FAudio to downlaod
+* @returns {Wine} Wine object
+*/
+Wine.prototype.faudio = function (faudioVersion) {
+    if(typeof faudioVersion !== 'string') 
+        faudioVersion = "19.01";
+
+    var setupFile = new Resource()
+        .wizard(this.wizard())
+        .url("https://github.com/Kron4ek/FAudio-Builds/releases/download/" + faudioVersion + "/faudio-" + faudioVersion + ".tar.xz")
+        .name("faudio-" + faudioVersion + ".tar.xz")
+        .get();
+
+    new Extractor()
+        .wizard(this.wizard())
+        .archive(setupFile)
+        .to(this.prefixDirectory() + "/FAudio/")
+        .extract();
+
+    var forEach = Array.prototype.forEach;
+    var sys32dir = this.system32directory();
+    var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion;
+    var self = this;
+
+    forEach.call(ls(faudioDir + "/x32"), function (file) {
+        if (file.endsWith(".dll")) {
+            cp(faudioDir + "/x32/" + file, sys32dir);
+            self.overrideDLL()
+                .set("native", [file])
+                .do();
+        }
+    });
+
+    if (this.architecture() == "amd64")
+    {
+        var sys64dir = this.system64directory();
+        forEach.call(ls(faudioDir + "/x64"), function (file) {
+            if (file.endsWith(".dll")) {
+                cp(faudioDir + "/x64/" + file, sys64dir);
+            }
+        });
+    }
+
+    return this;
+}
+
+/**
+ * Verb to install FAudio
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "FAudio", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.faudio();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
+</code></pre>
+        </article>
+    </section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#chmod">chmod</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempDir">createTempDir</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#ls">ls</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#verbImplementation">verbImplementation</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/jsdoc/Engines_Wine_Verbs_VK9_script.js.html

@@ -43,7 +43,7 @@ <h1 class="page-title">Source: Engines/Wine/Verbs/VK9/script.js</h1>
     print("NOTE: works from 0.28.0");
 
     if (typeof vk9Version !== 'string')
-        vk9Version = "0.28.1";
+        vk9Version = "0.29.0";
 
     var setupFile32 = new Resource()
         .wizard(this.wizard())
@@ -96,7 +96,7 @@ <h1 class="page-title">Source: Engines/Wine/Verbs/VK9/script.js</h1>
         wine.prefix(container);
         var wizard = SetupWizard(InstallationType.VERBS, "VK9", java.util.Optional.empty());
         // query desired version (default: 0.28.1)
-        var versions = ["0.28.1", "0.28.0", "0.27.0", "0.26.0", "0.25.0", "0.23.0", "0.17.0", "0.16.0", "0.6.0", "0.4.0"];
+        var versions = ["0.29.0", "0.28.1", "0.28.0"]; //this script is not able to install older versions (VK9.conf mandatory)
         var selectedVersion = wizard.menu(tr("Please select the version."), versions, "0.28.1");
         wine.wizard(wizard);
         // install selected version