Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
Hotfix 1.0.0.1 (#25)
Browse files Browse the repository at this point in the history
* Updated pom with bundledJre64Bit variable

* Updated launch4j configuration

* Added inno-setup file

* Updated inno-setup, pom and Main.java
Updated version date
Fixed ; error in setup.iss
Added alternative jre entry to launch4j pom entry
  • Loading branch information
Fi0x authored Jun 1, 2021
1 parent 4706a4e commit c81a269
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 13 deletions.
20 changes: 9 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.fi0x.edct</groupId>
<artifactId>EliteDangerousCarrierTrader</artifactId>
<version>1.0.0.0</version><!-- //TODO: update version -->
<!-- //TODO: update version -->
<version>1.0.0.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down Expand Up @@ -90,27 +91,24 @@
<version>2.1.1</version>
<executions>
<execution>
<id>l4j-gui</id>
<id>l4j-clui</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration>
<icon>src\\main\\resources\\images\\icon.ico</icon>
<dontWrapJar>false</dontWrapJar>
<headerType>gui</headerType>
<stayAlive>true</stayAlive>
<jar>target/EliteDangerousCarrierTrader-${project.version}-jar-with-dependencies.jar</jar>
<outfile>target/EDCT.exe</outfile>
<downloadUrl>https://jdk.java.net/java-se-ri/13</downloadUrl>
<jar>target/EliteDangerousCarrierTrader-${project.version}-jar-with-dependencies.jar</jar>
<downloadUrl>https://jdk.java.net/archive/</downloadUrl>
<stayAlive>true</stayAlive>
<icon>src\\main\\resources\\images\\icon.ico</icon>
<classPath>
<mainClass>com.fi0x.edct.Main</mainClass>
</classPath>
<jre>
<bundledJre64Bit>true</bundledJre64Bit>
<path>C:\\Program Files\\Java\\jdk-13.0.1</path>
<bundledJreAsFallback>true</bundledJreAsFallback>
<runtimeBits>64</runtimeBits>
<!-- <path>jre</path>-->
<minVersion>13.0.1</minVersion>
</jre>
<versionInfo>
<fileVersion>${project.version}</fileVersion>
Expand Down
52 changes: 52 additions & 0 deletions setup.iss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

; TODO: Update Version info
#define MyAppName "Elite Dangerous Carrier Trader"
#define MyAppVersion "1.0.0.1"
#define MyAppPublisher "Fi0x"
#define MyAppURL "https://github.com/Fi0x/EDCT"
#define MyAppExeName "EDCT.exe"

[Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{374B451B-05E1-466C-BAAF-AF0C54B68548}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={autopf}\{#MyAppName}
DisableProgramGroupPage=yes
LicenseFile=LICENSE
; Remove the following line to run in administrative install mode (install for all users.)
PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog
OutputBaseFilename=edctsetup
SetupIconFile=src\main\resources\images\icon.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"

[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

[Files]
Source: "target\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
; TODO: Make sure this exists before compiling
Source: "target\jre"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

[Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon

[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

4 changes: 2 additions & 2 deletions src/main/java/com/fi0x/edct/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public class Main
public static File errors;
public static File settings;
//TODO: Update version information
public static final Date releaseDate = Date.from(Instant.parse("2021-06-01T08:56:30Z"));
public static final String version = "1.0.0.0";
public static final Date releaseDate = Date.from(Instant.parse("2021-06-02T08:56:30Z"));
public static final String version = "1.0.0.1";

public static void main(String[] args)
{
Expand Down

0 comments on commit c81a269

Please sign in to comment.