diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index 51126b97dc2..96cb1b62994 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -93,7 +93,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.6.0 released-version @@ -353,170 +353,6 @@ - - windows-linux-release - - - - com.akathist.maven.plugins.launch4j - launch4j-maven-plugin - 2.5.1 - - - l4j-gui - package - - launch4j - - - gui - ${project.build.directory}/forge.exe - ${project.build.finalName}-jar-with-dependencies.jar - true - forge - src/main/config/forge.ico - - forge.view.Main - false - anything - - - 17 - true - 4096 - - ${mandatory.java.args} - - - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - Forge - Forge - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0 - - Forge - forge - forge.exe - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 3.0.0 - - - org.apache.ant - ant-nodeps - 1.8.1 - - - - - win-linux-app-bundle - pre-integration-test - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.6.0 - - - released-version - validate - - released-version - - - - parse-version - - parse-version - - - - attach-distribution - post-integration-test - - attach-artifact - - - - - ${project.build.directory}/${project.build.finalName}.tar.bz2 - tar.bz2 - - - - - - - - - - windows-linux @@ -578,113 +414,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - 3.0.0 - - - org.apache.ant - ant-nodeps - 1.8.1 - - - - - win-linux-app-bundle - pre-integration-test - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - org.codehaus.mojo build-helper-maven-plugin @@ -712,8 +441,8 @@ - ${project.build.directory}/${project.build.finalName}.tar.bz2 - tar.bz2 + ${basedir}/../forge-installer/target/forge.zip + zip diff --git a/forge-installer/ReadMeForge.txt b/forge-installer/ReadMeForge.txt new file mode 100644 index 00000000000..1d03a043109 --- /dev/null +++ b/forge-installer/ReadMeForge.txt @@ -0,0 +1,29 @@ +What is Forge? + +Forge is a "Rules Engine" for the game Magic: the Gathering. +Forge is not related in any way with Wizards of the Coast. +Forge is open source software released under the GNU Public License. + +Adventure Mode + +Forge now has an Adventure Mode, along with the Classic deck building and match game modes with AI. + +Adventure is baked into the Android/Mobile release of Forge, and as a separate executable already provided in the Desktop release package. + +Java Requirement + +Forge Requires Java to run, please make sure you have Java installed on your machine prior to attempting to run. + +Choices: + +Option 1: Java JDK +Download - https://www.oracle.com/java/technologies/downloads/ + +Option 2: Alternate OpenJDK Distribution (JDK 17 LTS or higher) + +Liberica JDK +Download - https://bell-sw.com/pages/downloads/#jdk-17-lts + +Adoptium +Download - https://adoptium.net/temurin/releases/?version=17 + diff --git a/forge-installer/ic_launcher.png b/forge-installer/ic_launcher.png new file mode 100644 index 00000000000..ad7c6ed96bb Binary files /dev/null and b/forge-installer/ic_launcher.png differ diff --git a/forge-installer/libs/default-dir.txt b/forge-installer/libs/default-dir.txt new file mode 100644 index 00000000000..085649f055b --- /dev/null +++ b/forge-installer/libs/default-dir.txt @@ -0,0 +1 @@ +$project.build.finalName$ \ No newline at end of file diff --git a/forge-installer/libs/eng.xml b/forge-installer/libs/eng.xml new file mode 100644 index 00000000000..3ab2ebbaebf --- /dev/null +++ b/forge-installer/libs/eng.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forge-installer/libs/install.xml b/forge-installer/libs/install.xml new file mode 100644 index 00000000000..22514262e1b --- /dev/null +++ b/forge-installer/libs/install.xml @@ -0,0 +1,63 @@ + + + + $project.build.finalName$ + $month.date$ + https://card-forge.github.io/forge/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/forge-installer/pom.xml b/forge-installer/pom.xml new file mode 100644 index 00000000000..8d15ee239f1 --- /dev/null +++ b/forge-installer/pom.xml @@ -0,0 +1,245 @@ + + 4.0.0 + + + forge + forge + ${revision} + + + forge-installer + pom + Forge Installer + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + + + timestamp-property + initialize + + timestamp-property + + + + month.date + MM.dd + + + + regex-property + initialize + + regex-property + + + + snapshot-version + ${revision} + -SNAPSHOT + -SNAPSHOT-${month.date} + false + + + + + + org.codehaus.izpack + izpack-maven-plugin + 5.2.3 + + + post-integration-test + + izpack + + + + ${project.basedir}/target + ${project.basedir}/target/install.xml + ${project.basedir}/target + ${project.build.finalName} + + + + + + org.codehaus.izpack + izpack-panel + 5.2.3 + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + initialize + + replace + + + + + ${project.basedir}/libs + default-dir.txt, install.xml, eng.xml + ${project.basedir}/target + . + false + + + $project.build.finalName$ + ${project.build.finalName} + + + $month.date$ + ${month.date} + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.0.0 + + + org.apache.ant + ant-nodeps + 1.8.1 + + + + + izpack-prepare + initialize + + + + + + + + + + + run + + + + win-linux-app-bundle + pre-integration-test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + + + \ No newline at end of file diff --git a/forge-installer/side.png b/forge-installer/side.png new file mode 100644 index 00000000000..4bff2946814 Binary files /dev/null and b/forge-installer/side.png differ diff --git a/pom.xml b/pom.xml index 819b030bf5b..3269ec913c2 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,7 @@ forge-lda adventure-editor forge-gui-android + forge-installer