Skip to content

Commit 8bc04fc

Browse files
committed
misc fixes/enhancements, update copyright, allow portable installations on Windows
1 parent 5405efe commit 8bc04fc

File tree

24 files changed

+86
-73
lines changed

24 files changed

+86
-73
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Carthage/Build
7575
.idea/**/tasks.xml
7676
.idea/**/dictionaries
7777
.idea/**/shelf
78-
.idea/**/discord.xml # discord plugin
78+
.idea/discord.xml
7979

8080
# Sensitive or high-churn files
8181
.idea/**/dataSources/

.idea/blobsaver.iml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

blobsaver.iss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33

44
#define MyAppName "blobsaver"
55
#define MyAppVersion "2.4.0"
6-
#define MyAppPublisher "blobsaver"
6+
#define MyAppPublisher "airsquared"
77
#define MyAppURL "https://www.github.com/airsquared/blobsaver"
88
#define MyAppExeName "blobsaver.exe"
9+
#define MyAppCopyright "Copyright (c) 2020 airsquared"
910

1011
[Setup]
1112
; NOTE: The value of AppId uniquely identifies this application.
@@ -19,8 +20,11 @@ AppPublisher={#MyAppPublisher}
1920
AppPublisherURL={#MyAppURL}
2021
AppSupportURL={#MyAppURL}
2122
AppUpdatesURL={#MyAppURL}
23+
AppCopyright={#MyAppCopyright}
24+
ArchitecturesAllowed=x64 arm64
25+
ArchitecturesInstallIn64BitMode=x64 arm64
26+
Uninstallable=not IsTaskSelected('portableMode')
2227
DefaultDirName={pf}\{#MyAppName}
23-
DisableDirPage=yes
2428
DisableProgramGroupPage=yes
2529
LicenseFile=build\tmp\innosetup\LICENSE
2630
OutputDir=build\distributions
@@ -35,6 +39,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
3539
[Tasks]
3640
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
3741
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
42+
Name: portableMode; Description: "Portable Mode"
3843

3944
[Files]
4045
Source: "build\tmp\innosetup\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019 airsquared
2+
* Copyright (c) 2020 airsquared
33
*
44
* This file is part of blobsaver.
55
*
@@ -118,7 +118,7 @@ task createLinuxTargz(type: Tar, dependsOn: shadowJar) {
118118

119119
launch4j { // Windows only, don't use this, use createWindowsInstaller
120120
mainClassName = "com.airsquared.blobsaver.Main"
121-
copyright = "Copyright (c) 2019 airsquared"
121+
copyright = "Copyright (c) 2020 airsquared"
122122
downloadUrl = "https://java.com/inc/BrowserRedirect1.jsp"
123123
icon = "${projectDir}/icons/blob_emoji.ico"
124124
jreMinVersion = "1.8.0"

0 commit comments

Comments
 (0)