Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
466 lines
29 KiB
Diff
466 lines
29 KiB
Diff
diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml
|
|
index b35356ea76..b7ab1c775b 100644
|
|
--- a/forge-adventure/pom.xml
|
|
+++ b/forge-adventure/pom.xml
|
|
@@ -47,131 +47,6 @@
|
|
</configuration>
|
|
</plugin>
|
|
|
|
- <plugin>
|
|
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
|
|
- <artifactId>launch4j-maven-plugin</artifactId>
|
|
- <version>1.7.25</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>l4j-adv</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge-adventure-editor-java8.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <icon>src/main/config/forge-adventure-editor.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.adventure.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>1.8.0</minVersion>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>-Dfile.encoding=UTF-8</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- 1.0.0.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- 1.0.0.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- 1.0.0.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- 1.0.0.0
|
|
- </txtProductVersion>
|
|
- <productName>forge-adventure-editor</productName>
|
|
- <internalName>forge-adventure-editor</internalName>
|
|
- <originalFilename>forge-adventure-editor-java8.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- <!--extra-->
|
|
- <execution>
|
|
- <id>l4j-adv2</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge-adventure-editor.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
|
|
- <icon>src/main/config/forge-adventure-editor.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.adventure.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>11.0.1</minVersion>
|
|
- <jdkPreference>jdkOnly</jdkPreference>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>-Dfile.encoding=UTF-8</opt>
|
|
- <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
|
|
- <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- 1.0.0.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- 1.0.0.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- 1.0.0.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- 1.0.0.0
|
|
- </txtProductVersion>
|
|
- <productName>forge-adventure-editor</productName>
|
|
- <internalName>forge-adventure-editor</internalName>
|
|
- <originalFilename>forge-adventure-editor.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- <!--extra-->
|
|
- </executions>
|
|
- </plugin>
|
|
-
|
|
<plugin>
|
|
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
|
<artifactId>replacer</artifactId>
|
|
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
|
|
index 3b74663b04..f0e324b69c 100644
|
|
--- a/forge-gui-desktop/pom.xml
|
|
+++ b/forge-gui-desktop/pom.xml
|
|
@@ -282,59 +282,6 @@
|
|
<id>windows-linux-release</id>
|
|
<build>
|
|
<plugins>
|
|
- <plugin>
|
|
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
|
|
- <artifactId>launch4j-maven-plugin</artifactId>
|
|
- <version>2.1.2</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>l4j-gui</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge-java8.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <icon>src/main/config/forge.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.view.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>1.8.0</minVersion>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>-Dfile.encoding=UTF-8</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtProductVersion>
|
|
- <productName>Forge</productName>
|
|
- <internalName>forge</internalName>
|
|
- <originalFilename>forge-java8.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- </executions>
|
|
- </plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
@@ -447,130 +394,6 @@
|
|
<id>windows-linux</id>
|
|
<build>
|
|
<plugins>
|
|
- <plugin>
|
|
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
|
|
- <artifactId>launch4j-maven-plugin</artifactId>
|
|
- <version>2.1.2</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>l4j-gui</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge-java8.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <icon>src/main/config/forge.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.view.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>1.8.0</minVersion>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>-Dfile.encoding=UTF-8</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtProductVersion>
|
|
- <productName>Forge</productName>
|
|
- <internalName>forge</internalName>
|
|
- <originalFilename>forge-java8.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- <!--extra-->
|
|
- <execution>
|
|
- <id>l4j-gui2</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
|
|
- <icon>src/main/config/forge.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.view.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>11.0.1</minVersion>
|
|
- <jdkPreference>jdkOnly</jdkPreference>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>-Dfile.encoding=UTF-8</opt>
|
|
- <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
|
|
- <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
|
|
- </txtProductVersion>
|
|
- <productName>Forge</productName>
|
|
- <internalName>forge</internalName>
|
|
- <originalFilename>forge.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- <!--extra-->
|
|
- </executions>
|
|
- </plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
|
|
index e7439c1e3a..de0cbc16a1 100644
|
|
--- a/forge-gui-mobile-dev/pom.xml
|
|
+++ b/forge-gui-mobile-dev/pom.xml
|
|
@@ -64,130 +64,6 @@
|
|
</replacements>
|
|
</configuration>
|
|
</plugin>
|
|
- <plugin>
|
|
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
|
|
- <artifactId>launch4j-maven-plugin</artifactId>
|
|
- <version>1.7.25</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>l4j-adv</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge-adventure-java8.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <icon>src/main/config/forge-adventure.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.app.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>1.8.0</minVersion>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>-Dfile.encoding=UTF-8</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- 1.0.0.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- 1.0.0.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- 1.0.0.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- 1.0.0.0
|
|
- </txtProductVersion>
|
|
- <productName>forge-adventure</productName>
|
|
- <internalName>forge-adventure</internalName>
|
|
- <originalFilename>forge-adventure-java8.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- <!--extra-->
|
|
- <execution>
|
|
- <id>l4j-adv2</id>
|
|
- <phase>package</phase>
|
|
- <goals>
|
|
- <goal>launch4j</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <headerType>gui</headerType>
|
|
- <outfile>${project.build.directory}/forge-adventure.exe</outfile>
|
|
- <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
|
|
- <dontWrapJar>true</dontWrapJar>
|
|
- <errTitle>forge</errTitle>
|
|
- <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
|
|
- <icon>src/main/config/forge-adventure.ico</icon>
|
|
- <classPath>
|
|
- <mainClass>forge.app.Main</mainClass>
|
|
- <addDependencies>false</addDependencies>
|
|
- <preCp>anything</preCp>
|
|
- </classPath>
|
|
- <jre>
|
|
- <minVersion>11.0.1</minVersion>
|
|
- <jdkPreference>jdkOnly</jdkPreference>
|
|
- <maxHeapSize>4096</maxHeapSize>
|
|
- <opts>
|
|
- <opt>-Dfile.encoding=UTF-8</opt>
|
|
- <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
|
|
- <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
|
|
- <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
|
|
- </opts>
|
|
- </jre>
|
|
- <versionInfo>
|
|
- <fileVersion>
|
|
- 1.0.0.0
|
|
- </fileVersion>
|
|
- <txtFileVersion>
|
|
- 1.0.0.0
|
|
- </txtFileVersion>
|
|
- <fileDescription>Forge</fileDescription>
|
|
- <copyright>Forge</copyright>
|
|
- <productVersion>
|
|
- 1.0.0.0
|
|
- </productVersion>
|
|
- <txtProductVersion>
|
|
- 1.0.0.0
|
|
- </txtProductVersion>
|
|
- <productName>forge-adventure</productName>
|
|
- <internalName>forge-adventure</internalName>
|
|
- <originalFilename>forge-adventure.exe</originalFilename>
|
|
- </versionInfo>
|
|
- </configuration>
|
|
- </execution>
|
|
- <!--extra-->
|
|
- </executions>
|
|
- </plugin>
|
|
<plugin>
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
|
<configuration>
|