mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-12 16:58:57 +00:00
fix compilation
This commit is contained in:
Anthony Calosa
2
.github/workflows/snapshots-android.yml
vendored
2
.github/workflows/snapshots-android.yml
vendored
@@ -91,7 +91,7 @@ jobs:
|
|||||||
export _JAVA_OPTIONS="-Xmx2g"
|
export _JAVA_OPTIONS="-Xmx2g"
|
||||||
d=$(date +%m-%d)
|
d=$(date +%m-%d)
|
||||||
# Replace date in forge-gui-mobile/src/forge/Forge.java
|
# Replace date in forge-gui-mobile/src/forge/Forge.java
|
||||||
sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
# sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
||||||
mvn -U -B -P android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true
|
mvn -U -B -P android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true
|
||||||
mkdir -p forge-gui-android/target/upload
|
mkdir -p forge-gui-android/target/upload
|
||||||
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
||||||
|
|||||||
14
.github/workflows/snapshots-pc.yml
vendored
14
.github/workflows/snapshots-pc.yml
vendored
@@ -45,7 +45,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
export DISPLAY=":1"
|
export DISPLAY=":1"
|
||||||
Xvfb :1 -screen 0 800x600x8 &
|
Xvfb :1 -screen 0 800x600x8 &
|
||||||
mvn -U -B clean -P windows-linux install -T 1C -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }}
|
mvn -U -B clean -P windows-linux install -T 1C -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }}
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
|
|
||||||
@@ -55,13 +55,13 @@ jobs:
|
|||||||
|
|
||||||
- name: Rename before upload
|
- name: Rename before upload
|
||||||
run: |
|
run: |
|
||||||
mkdir tarball
|
mkdir izpack
|
||||||
# If this works just gotta figure out how to append datetime
|
# If this works just gotta figure out how to append datetime
|
||||||
mv /home/runner/.m2/repository/forge/forge-gui-desktop/*/*.bz2 tarball/
|
mv /home/runner/.m2/repository/forge/forge-installer/*/*.jar izpack/
|
||||||
cd tarball
|
cd izpack
|
||||||
out="$(basename -s .tar.bz2 *)"
|
out="$(basename -s .jar *)"
|
||||||
d=$(date +%m-%d)
|
d=$(date +%m-%d)
|
||||||
mv "${out}.tar.bz2" "${out}-${d}.tar.bz2"
|
mv "${out}.jar" "${out}-${d}.jar"
|
||||||
|
|
||||||
- name: 📂 Sync files
|
- name: 📂 Sync files
|
||||||
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
|
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
|
||||||
@@ -69,7 +69,7 @@ jobs:
|
|||||||
server: ftp.cardforge.org
|
server: ftp.cardforge.org
|
||||||
username: ${{ secrets.FTP_USERNAME }}
|
username: ${{ secrets.FTP_USERNAME }}
|
||||||
password: ${{ secrets.FTP_PASSWORD }}
|
password: ${{ secrets.FTP_PASSWORD }}
|
||||||
local-dir: tarball/
|
local-dir: izpack/
|
||||||
server-dir: downloads/dailysnapshots/
|
server-dir: downloads/dailysnapshots/
|
||||||
exclude: |
|
exclude: |
|
||||||
*.jar
|
*.jar
|
||||||
|
|||||||
2
.github/workflows/test-build.yaml
vendored
2
.github/workflows/test-build.yaml
vendored
@@ -26,4 +26,4 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
export DISPLAY=":1"
|
export DISPLAY=":1"
|
||||||
Xvfb :1 -screen 0 800x600x8 &
|
Xvfb :1 -screen 0 800x600x8 &
|
||||||
mvn -U -B clean -P windows-linux test
|
mvn -U -B clean -P test
|
||||||
|
|||||||
@@ -20,7 +20,61 @@
|
|||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.akathist.maven.plugins.launch4j</groupId>
|
||||||
|
<artifactId>launch4j-maven-plugin</artifactId>
|
||||||
|
<version>2.5.1</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>l4j-gui</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://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
|
||||||
|
<icon>src/main/config/forge.ico</icon>
|
||||||
|
<classPath>
|
||||||
|
<mainClass>forge.view.Main</mainClass>
|
||||||
|
<addDependencies>false</addDependencies>
|
||||||
|
<preCp>anything</preCp>
|
||||||
|
</classPath>
|
||||||
|
<jre>
|
||||||
|
<minVersion>17</minVersion>
|
||||||
|
<requiresJdk>true</requiresJdk>
|
||||||
|
<maxHeapSize>4096</maxHeapSize>
|
||||||
|
<opts>
|
||||||
|
<opt>${mandatory.java.args}</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>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
@@ -353,106 +407,6 @@
|
|||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
|
||||||
<id>windows-linux</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>com.akathist.maven.plugins.launch4j</groupId>
|
|
||||||
<artifactId>launch4j-maven-plugin</artifactId>
|
|
||||||
<version>2.5.1</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>l4j-gui</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://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
|
|
||||||
<icon>src/main/config/forge.ico</icon>
|
|
||||||
<classPath>
|
|
||||||
<mainClass>forge.view.Main</mainClass>
|
|
||||||
<addDependencies>false</addDependencies>
|
|
||||||
<preCp>anything</preCp>
|
|
||||||
</classPath>
|
|
||||||
<jre>
|
|
||||||
<minVersion>17</minVersion>
|
|
||||||
<requiresJdk>true</requiresJdk>
|
|
||||||
<maxHeapSize>4096</maxHeapSize>
|
|
||||||
<opts>
|
|
||||||
<opt>${mandatory.java.args}</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.codehaus.mojo</groupId>
|
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
|
||||||
<version>3.6.0</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>released-version</id>
|
|
||||||
<phase>validate</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>released-version</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>parse-version</id>
|
|
||||||
<goals>
|
|
||||||
<goal>parse-version</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>attach-distribution</id>
|
|
||||||
<phase>post-integration-test</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>attach-artifact</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<artifacts>
|
|
||||||
<artifact>
|
|
||||||
<file>${basedir}/../forge-installer/target/forge.zip</file>
|
|
||||||
<type>zip</type>
|
|
||||||
</artifact>
|
|
||||||
</artifacts>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<properties>
|
<properties>
|
||||||
<license.file.name>"LICENSE.txt"</license.file.name>
|
<license.file.name>"LICENSE.txt"</license.file.name>
|
||||||
|
|||||||
@@ -47,33 +47,6 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.izpack</groupId>
|
|
||||||
<artifactId>izpack-maven-plugin</artifactId>
|
|
||||||
<version>5.2.3</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>post-integration-test</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>izpack</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<!-- base for relative paths in izpack descriptor -->
|
|
||||||
<baseDir>${project.basedir}/target</baseDir>
|
|
||||||
<installFile>${project.basedir}/target/install.xml</installFile>
|
|
||||||
<outputDirectory>${project.basedir}/target</outputDirectory>
|
|
||||||
<finalName>${project.build.finalName}</finalName>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.izpack</groupId>
|
|
||||||
<artifactId>izpack-panel</artifactId>
|
|
||||||
<version>5.2.3</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
||||||
<artifactId>replacer</artifactId>
|
<artifactId>replacer</artifactId>
|
||||||
@@ -104,134 +77,212 @@
|
|||||||
</replacements>
|
</replacements>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.ant</groupId>
|
|
||||||
<artifactId>ant-nodeps</artifactId>
|
|
||||||
<version>1.8.1</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>izpack-prepare</id>
|
|
||||||
<phase>initialize</phase>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<!--mkdir dir="${project.basedir}/target" />
|
|
||||||
<delete>
|
|
||||||
<fileset dir="${project.basedir}/target" includes="*.jar" />
|
|
||||||
<fileset dir="${project.basedir}/target" includes="*.txt" />
|
|
||||||
<fileset dir="${project.basedir}/target" includes="*.xml" />
|
|
||||||
<fileset dir="${project.basedir}/target" includes="*.zip" />
|
|
||||||
</delete-->
|
|
||||||
<copy todir="${project.basedir}/target">
|
|
||||||
<fileset dir="${basedir}" includes="*.png" />
|
|
||||||
<fileset dir="${basedir}" includes="*.txt" />
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>win-linux-app-bundle</id>
|
|
||||||
<phase>pre-integration-test</phase>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<!-- Windows/Linux archive -->
|
|
||||||
<mkdir dir="${project.build.directory}/${project.build.finalName}" />
|
|
||||||
<copy todir="${project.build.directory}/${project.build.finalName}">
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.sh" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.command" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.cmd" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/" includes="forge.profile.properties.example" />
|
|
||||||
<fileset dir="${basedir}/" includes="sentry.properties" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/release-files/" includes="CONTRIBUTORS.txt" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/release-files/" includes="GAMEPAD_README.txt" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
|
|
||||||
<fileset dir="${basedir}/../forge-gui/">
|
|
||||||
<include name="res/**" />
|
|
||||||
<exclude name="res/cardsfolder/**" />
|
|
||||||
</fileset>
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.exe" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge-gui-desktop-${revision}-jar-with-dependencies.jar" />
|
|
||||||
<fileset dir="${project.build.directory}/../../adventure-editor/tools" includes="gdx-particle-editor.jar" />
|
|
||||||
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.exe" />
|
|
||||||
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.sh" />
|
|
||||||
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.command" />
|
|
||||||
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.cmd" />
|
|
||||||
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor-jar-with-dependencies.jar" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure-mac.sh" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" />
|
|
||||||
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target/classes" includes="build.txt" />
|
|
||||||
</copy>
|
|
||||||
<mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
|
|
||||||
<zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge.cmd" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.sh" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-mac.sh" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.command" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.cmd" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.sh" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.command" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.cmd" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.exe" perm="a+rx" />
|
|
||||||
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.exe" perm="a+rx" />
|
|
||||||
<zip destfile="${basedir}/target/forge.zip">
|
|
||||||
<zipfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
|
|
||||||
<include name="forge.sh" />
|
|
||||||
<include name="forge.command" />
|
|
||||||
<include name="forge.cmd" />
|
|
||||||
<include name="forge.exe" />
|
|
||||||
<include name="forge-adventure.sh" />
|
|
||||||
<include name="forge-adventure.command" />
|
|
||||||
<include name="forge-adventure.cmd" />
|
|
||||||
<include name="forge-adventure.exe" />
|
|
||||||
<include name="adventure-editor.sh" />
|
|
||||||
<include name="adventure-editor.command" />
|
|
||||||
<include name="adventure-editor.cmd" />
|
|
||||||
<include name="adventure-editor.exe" />
|
|
||||||
</zipfileset>
|
|
||||||
<zipfileset dir="${project.build.directory}/${project.build.finalName}">
|
|
||||||
<include name="**" />
|
|
||||||
<exclude name="forge.sh" />
|
|
||||||
<exclude name="forge.command" />
|
|
||||||
<exclude name="forge.cmd" />
|
|
||||||
<exclude name="forge.exe" />
|
|
||||||
<exclude name="forge-adventure.sh" />
|
|
||||||
<exclude name="forge-adventure.command" />
|
|
||||||
<exclude name="forge-adventure.cmd" />
|
|
||||||
<exclude name="forge-adventure.exe" />
|
|
||||||
<exclude name="adventure-editor.sh" />
|
|
||||||
<exclude name="adventure-editor.command" />
|
|
||||||
<exclude name="adventure-editor.cmd" />
|
|
||||||
<exclude name="adventure-editor.exe" />
|
|
||||||
</zipfileset>
|
|
||||||
</zip>
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>forge</groupId>
|
||||||
|
<artifactId>forge-gui-mobile-dev</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>forge</groupId>
|
||||||
|
<artifactId>forge-gui-desktop</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>windows-linux</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.izpack</groupId>
|
||||||
|
<artifactId>izpack-maven-plugin</artifactId>
|
||||||
|
<version>5.2.3</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>post-integration-test</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>izpack</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<!-- base for relative paths in izpack descriptor -->
|
||||||
|
<baseDir>${project.basedir}/target</baseDir>
|
||||||
|
<installFile>${project.basedir}/target/install.xml</installFile>
|
||||||
|
<outputDirectory>${project.basedir}/target</outputDirectory>
|
||||||
|
<finalName>${project.build.finalName}</finalName>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.izpack</groupId>
|
||||||
|
<artifactId>izpack-panel</artifactId>
|
||||||
|
<version>5.2.3</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<version>3.0.0</version>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.ant</groupId>
|
||||||
|
<artifactId>ant-nodeps</artifactId>
|
||||||
|
<version>1.8.1</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>izpack-prepare</id>
|
||||||
|
<phase>initialize</phase>
|
||||||
|
<configuration>
|
||||||
|
<target>
|
||||||
|
<copy todir="${project.basedir}/target">
|
||||||
|
<fileset dir="${basedir}" includes="*.png" />
|
||||||
|
<fileset dir="${basedir}" includes="*.txt" />
|
||||||
|
</copy>
|
||||||
|
</target>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>win-linux-app-bundle</id>
|
||||||
|
<phase>pre-integration-test</phase>
|
||||||
|
<configuration>
|
||||||
|
<target>
|
||||||
|
<!-- Windows/Linux archive -->
|
||||||
|
<mkdir dir="${project.build.directory}/${project.build.finalName}" />
|
||||||
|
<copy todir="${project.build.directory}/${project.build.finalName}">
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.sh" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.command" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.cmd" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/" includes="forge.profile.properties.example" />
|
||||||
|
<fileset dir="${basedir}/" includes="sentry.properties" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/release-files/" includes="CONTRIBUTORS.txt" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/release-files/" includes="GAMEPAD_README.txt" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
|
||||||
|
<fileset dir="${basedir}/../forge-gui/">
|
||||||
|
<include name="res/**" />
|
||||||
|
<exclude name="res/cardsfolder/**" />
|
||||||
|
</fileset>
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge-gui-desktop-${project.version}-jar-with-dependencies.jar" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.exe" />
|
||||||
|
<fileset dir="${project.build.directory}/../../adventure-editor/tools" includes="gdx-particle-editor.jar" />
|
||||||
|
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.exe" />
|
||||||
|
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.sh" />
|
||||||
|
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.command" />
|
||||||
|
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.cmd" />
|
||||||
|
<fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor-jar-with-dependencies.jar" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure-mac.sh" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" />
|
||||||
|
<fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target/classes" includes="build.txt" />
|
||||||
|
</copy>
|
||||||
|
<mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
|
||||||
|
<zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge.cmd" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.sh" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-mac.sh" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.command" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.cmd" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.sh" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.command" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.cmd" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.exe" perm="a+rx" />
|
||||||
|
<chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.exe" perm="a+rx" />
|
||||||
|
<zip destfile="${basedir}/target/forge.zip">
|
||||||
|
<zipfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
|
||||||
|
<include name="forge.sh" />
|
||||||
|
<include name="forge.command" />
|
||||||
|
<include name="forge.cmd" />
|
||||||
|
<include name="forge.exe" />
|
||||||
|
<include name="forge-adventure.sh" />
|
||||||
|
<include name="forge-adventure.command" />
|
||||||
|
<include name="forge-adventure.cmd" />
|
||||||
|
<include name="forge-adventure.exe" />
|
||||||
|
<include name="adventure-editor.sh" />
|
||||||
|
<include name="adventure-editor.command" />
|
||||||
|
<include name="adventure-editor.cmd" />
|
||||||
|
<include name="adventure-editor.exe" />
|
||||||
|
</zipfileset>
|
||||||
|
<zipfileset dir="${project.build.directory}/${project.build.finalName}">
|
||||||
|
<include name="**" />
|
||||||
|
<exclude name="forge.sh" />
|
||||||
|
<exclude name="forge.command" />
|
||||||
|
<exclude name="forge.cmd" />
|
||||||
|
<exclude name="forge.exe" />
|
||||||
|
<exclude name="forge-adventure.sh" />
|
||||||
|
<exclude name="forge-adventure.command" />
|
||||||
|
<exclude name="forge-adventure.cmd" />
|
||||||
|
<exclude name="forge-adventure.exe" />
|
||||||
|
<exclude name="adventure-editor.sh" />
|
||||||
|
<exclude name="adventure-editor.command" />
|
||||||
|
<exclude name="adventure-editor.cmd" />
|
||||||
|
<exclude name="adventure-editor.exe" />
|
||||||
|
</zipfileset>
|
||||||
|
</zip>
|
||||||
|
</target>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<version>3.6.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>released-version</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>released-version</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>parse-version</id>
|
||||||
|
<goals>
|
||||||
|
<goal>parse-version</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>attach-distribution</id>
|
||||||
|
<phase>verify</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>attach-artifact</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<artifacts>
|
||||||
|
<artifact>
|
||||||
|
<file>${basedir}/target/${project.build.finalName}.jar</file>
|
||||||
|
<type>jar</type>
|
||||||
|
</artifact>
|
||||||
|
</artifacts>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
4
pom.xml
4
pom.xml
@@ -331,7 +331,7 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<!--plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>flatten-maven-plugin</artifactId>
|
<artifactId>flatten-maven-plugin</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.6.0</version>
|
||||||
@@ -355,7 +355,7 @@
|
|||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin-->
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user