Reenable installation path chooser (#5624)

Fixes #5580.
JabRef · Nov 17, 2019 · 151a216 · 151a216
1 parent 15a9bac
commit 151a216
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 841 deletions.
diff --git a/build.gradle b/build.gradle
@@ -615,8 +615,7 @@ jlink {
                     '--vendor', 'JabRef',
                     '--app-version', "${project.version}",
                     '--win-upgrade-uuid', 'd636b4ee-6f10-451e-bf57-c89656780e36',
-                    // temporarily disabled due to conflict with Jpackage update
-                    //'--win-dir-chooser',
+                    '--win-dir-chooser',
                     '--win-shortcut',
                     '--temp', "$buildDir/installer",
                     '--resource-dir', "${projectDir}/buildres/windows"
@@ -656,7 +655,7 @@ if (OperatingSystem.current().isWindows()) {
     tasks.jpackageImage.doLast {
         copy {
             from("${projectDir}/buildres/windows") {
-                include "jabref.json", "JabRefHost.bat", "JabRefHost.ps1"
+                include "jabref.json", "jabref-chrome.json", "JabRefHost.bat", "JabRefHost.ps1"
             }
             into "$buildDir/distribution/JabRef"
         }

diff --git a/buildres/windows/JabRef-post-image.wsf b/buildres/windows/JabRef-post-image.wsf
@@ -4,20 +4,24 @@
     <script language="jscript">
      <![CDATA[
         var fileSystem = new ActiveXObject("Scripting.FileSystemObject");
+
         // The script is invoked in the "image" folder and not in "config" for some reason
+        // DEBUG Output
+        // var shell = new ActiveXObject("WScript.Shell");
+        // shell.Popup(fileSystem.GetFolder("."));
         var jabRefRoot = fileSystem.GetFolder(".").ParentFolder.ParentFolder.ParentFolder.ParentFolder.Path;
         var installerConfig = jabRefRoot + "/build/installer/config/";
 
         // Copy additional installer resources
         fileSystem.CopyFile(jabRefRoot + "/buildres/windows/JabRefTopBanner.bmp", installerConfig);
 
-        var wxsFilePath = jabRefRoot + "/buildres/windows/JabRef.wxs";
+        var wxsFilePath = installerConfig + "main.wxs";
         wxsFile = fileSystem.OpenTextFile(wxsFilePath, 1);
         var contents = wxsFile.ReadAll();
         wxsFile.Close();
 
         // Add registry values for JabRef Browser Extension
-        contents = contents.replace("</Product>", "<DirectoryRef Id=\"TARGETDIR\"><Component Id=\"RegistryJabRefBrowserEntries\" Guid=\"b6bc55ad-905c-4258-89b1-8b37abbe559c\" Win64=\"yes\"><RegistryKey Root=\"HKMU\" Key=\"SOFTWARE\\Mozilla\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[APPLICATIONFOLDER]jabref.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Google\\Chrome\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[APPLICATIONFOLDER]jabref-chrome.json\"/></RegistryKey></Component></DirectoryRef><Feature Id=\"JabFox\" Level=\"1\"><ComponentRef Id=\"RegistryJabFoxEntries\" /></Feature></Product>");
+        contents = contents.replace("</Product>", "<DirectoryRef Id=\"TARGETDIR\"><Component Id=\"RegistryJabRefBrowserEntries\" Guid=\"b6bc55ad-905c-4258-89b1-8b37abbe559c\" Win64=\"yes\"><RegistryKey Root=\"HKMU\" Key=\"SOFTWARE\\Mozilla\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Google\\Chrome\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref-chrome.json\"/></RegistryKey></Component></DirectoryRef><Feature Id=\"BrowserExtension\" Level=\"1\"><ComponentRef Id=\"RegistryJabRefBrowserEntries\" /></Feature></Product>");
 
         // Specify correct icon in Add/Remove Programs
         contents = contents.replace("</Product>", "<Property Id=\"ARPPRODUCTICON\" Value=\"DesktopIcon.exe\" /></Product>");

diff --git a/buildres/windows/JabRef.wxs b/buildres/windows/JabRef.wxs
diff --git a/buildres/windows/jabref-chrome.json b/buildres/windows/jabref-chrome.json
@@ -0,0 +1,9 @@
+{
+  "name": "org.jabref.jabref",
+  "description": "JabRef",
+  "path": "JabRefHost.bat",
+  "type": "stdio",
+  "allowed_origins": [
+    "chrome-extension://bifehkofibaamoeaopjglfkddgkijdlh/"
+  ]
+}