From 151a216a281b4ae7a8e3b23b5a0287ac29e8f1f9 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 17 Nov 2019 17:12:43 +0100 Subject: [PATCH] Reenable installation path chooser (#5624) Fixes #5580. --- build.gradle | 5 +- buildres/windows/JabRef-post-image.wsf | 8 +- buildres/windows/JabRef.wxs | 87 --- buildres/windows/jabref-chrome.json | 9 + jabref.install4j | 749 ------------------------- 5 files changed, 17 insertions(+), 841 deletions(-) delete mode 100644 buildres/windows/JabRef.wxs create mode 100644 buildres/windows/jabref-chrome.json delete mode 100644 jabref.install4j diff --git a/build.gradle b/build.gradle index be88645e8da..bdc6e96076d 100644 --- 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 index 285fd471972..fc6b6f202db 100644 --- a/buildres/windows/JabRef-post-image.wsf +++ b/buildres/windows/JabRef-post-image.wsf @@ -4,20 +4,24 @@