Skip to content

Commit

Permalink
3.95.1 - merge 0.95. Add Windows packaging. Remove governor-only pack…
Browse files Browse the repository at this point in the history 
…aging.
  • Loading branch information
@coder111111
coder111111 committed Oct 16, 2021
1 parent 6707bef commit 0719795
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 25 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ text in the planetary spending screen. Since version 1.8 Governor is on by defau

Additional features / changelog

* 3.95.1 Merge 0.95. Added native packaging with launch4j. Removed code-only "governor" packaging.

* 3.91.2 Updated native-transform-maven-plugin

* 3.91.1 Merge v0.91. Change versioning scheme to follow upstream numbers more closely.
Expand Down
58 changes: 34 additions & 24 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.rayfowler</groupId>

<version>3.93.1</version>
<version>3.95.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>8</java.version>
Expand Down Expand Up @@ -239,44 +239,36 @@
</execution>
</executions>
</plugin>
<!-- package a jar with governor classes only -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.6.3</version>
<executions>
<execution>
<phase>package</phase>
<phase>compile</phase>
<goals>
<goal>single</goal>
<goal>wget</goal>
</goals>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/governor.xml</descriptor>
</descriptors>
<archive>
<manifest>
<mainClass>rotp.RotpGovernor</mainClass>
</manifest>
<manifestEntries>
<Class-Path>Remnants.jar</Class-Path>
<Built-By>coder111@protonmail.com</Built-By>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
<configuration>
<url>
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jre_x64_windows_hotspot_11.0.12_7.zip
</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/jre-win</outputDirectory>
<sha256>5e00dd1fa87749c819ca94d8f3f352e198de44a9e2c09b0e75cc120a63edea87</sha256>
</configuration>
</plugin>
<plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<executions>
<execution>
<!-- disabled for now. For this to work, we need to download and package a JRE, and I don't want to go through the hassle yet.
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
-->
<configuration>
<icon>launch4j/rotp.ico</icon>
<splash>
Expand All @@ -298,7 +290,7 @@
<path>jre</path>
<minVersion>11</minVersion>
<bundledJre64Bit>true</bundledJre64Bit>
<bundledJreAsFallback>false</bundledJreAsFallback>
<bundledJreAsFallback>true</bundledJreAsFallback>
<runtimeBits>64</runtimeBits>
<jdkPreference>preferJre</jdkPreference>
<initialHeapSize>2000</initialHeapSize>
Expand All @@ -319,6 +311,24 @@
</execution>
</executions>
</plugin>
<!-- package a jar with governor classes only -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/windows.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<!-- runs with github-release:github-release -->
<plugin>
<groupId>com.ragedunicorn.tools.maven</groupId>
Expand All @@ -337,8 +347,8 @@
<releaseNotes>target/classes/README.md</releaseNotes>
<assets>
<asset>target/rotp-${project.version}.jar</asset>
<asset>target/rotp-${project.version}-governor.jar</asset>
<asset>target/rotp-${project.version}-mini.jar</asset>
<asset>target/rotp-${project.version}-windows.zip</asset>
</assets>
</configuration>
</execution>
Expand Down
21 changes: 21 additions & 0 deletions src/assembly/windows.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>windows</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${basedir}/target/jre-win/jdk-11.0.12+7-jre</directory>
<outputDirectory>/jre</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/target</directory>
<includes>
<include>rotp-*.exe</include>
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
2 changes: 1 addition & 1 deletion src/rotp/RotpGovernor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* to get more memory it uses the right jar file name.
*/
public class RotpGovernor {
static String expectedROTPVersion = "0.93";
static String expectedROTPVersion = "0.95";
public static boolean GRAALVM_NATIVE = System.getProperty("org.graalvm.nativeimage.imagecode") != null;

private static String governorVersion = null;
Expand Down

0 comments on commit 0719795

Please sign in to comment.