include Inno Setup executables in repository, require a 64bit JVM on Windows to fix #81

Author: airsquared

blobsaver.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "blobsaver"
-#define MyAppVersion "2.4.0"
+#define MyAppVersion "2.4.1-beta5"
 #define MyAppPublisher "airsquared"
 #define MyAppURL "https://www.github.com/airsquared/blobsaver"
 #define MyAppExeName "blobsaver.exe"
@@ -21,6 +21,7 @@ AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 AppCopyright={#MyAppCopyright}
+AppMutex=com.airsquared.blobsaver
 ArchitecturesAllowed=x64 arm64
 ArchitecturesInstallIn64BitMode=x64 arm64
 Uninstallable=not IsTaskSelected('portableMode')
@@ -37,9 +38,8 @@ SolidCompression=yes
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
-Name: portableMode; Description: "Portable Mode"
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
+Name: "portableMode"; Description: "Portable Installation Mode"; Flags: unchecked
 
 [Files]
 Source: "build\tmp\innosetup\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
@@ -48,7 +48,6 @@ Source: "build\tmp\innosetup\*"; DestDir: "{app}"; Flags: ignoreversion recurses
 [Icons]
 Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

build.gradle

@@ -27,6 +27,13 @@ plugins {
 version null
 sourceCompatibility = 1.8
 
+/*
+ * REMEMBER: also update the version string in:
+ *  - Main.java
+ *  - blobsaver.iss
+ */
+String appVersion = "v2.4.1-beta5";
+
 repositories {
     mavenCentral()
 }
@@ -119,18 +126,17 @@ task createLinuxTargz(type: Tar, dependsOn: shadowJar) {
 launch4j { // Windows only, don't use this, use createWindowsInstaller
     mainClassName = "com.airsquared.blobsaver.Main"
     copyright = "Copyright (c) 2020  airsquared"
-    downloadUrl = "https://java.com/inc/BrowserRedirect1.jsp"
+    downloadUrl = "https://www.java.com/en/download/manual.jsp"
     icon = "${projectDir}/icons/blob_emoji.ico"
+    mutexName = "com.airsquared.blobsaver"
+    windowTitle = "blobsaver " + appVersion
+    jreRuntimeBits = "64"
     jreMinVersion = "1.8.0"
     jreMaxVersion = "1.8.0_999"
     createExe.dependsOn shadowJar
 }
 
-// IMPORTANT: first make sure you have installed Inno Setup
-//            Install Inno Setup Preprocessor (ISPP) along with Inno Setup
-//            and make sure you have wine in your path if you are not on windows
-//            Inno Setup **MUST** be installed to C:\Program Files (x86)\Inno Setup 5\
-// if your platform isn't Windows, "wine" is required to run this task
+// if your platform isn't Windows, wine is required to run this task
 task createWindowsInstaller(dependsOn: createExe) {
     inputs.files(createExe.outputs)
     inputs.dir("${projectDir}/dist/windows/")
@@ -150,9 +156,9 @@ task createWindowsInstaller(dependsOn: createExe) {
         exec {
             workingDir = projectDir
             if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) {
-                commandLine 'C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe', '/Qp', 'blobsaver.iss'
+                commandLine 'gradle\\InnoSetup6\\ISCC.exe', '/Qp', 'blobsaver.iss'
             } else {
-                commandLine 'wine', 'C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe', '/Qp', 'blobsaver.iss'
+                commandLine "wine", "gradle/InnoSetup6/ISCC.exe", "/Qp", "blobsaver.iss"
             }
         }
     }