[maven-release-plugin] prepare release forge-1.6.17

This commit is contained in:
Blacksmith
2018-10-15 15:42:12 +00:00
committed by Agetian
parent 1078960545
commit 41287d30c9
10 changed files with 150 additions and 229 deletions

View File

@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-ai</artifactId> <artifactId>forge-ai</artifactId>

View File

@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-core</artifactId> <artifactId>forge-core</artifactId>

View File

@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-game</artifactId> <artifactId>forge-game</artifactId>

View File

@@ -1,5 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -20,7 +19,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-gui-android</artifactId> <artifactId>forge-gui-android</artifactId>
@@ -215,7 +214,7 @@
<inherited>true</inherited> <inherited>true</inherited>
<configuration> <configuration>
<removeExistingSignatures>true</removeExistingSignatures> <removeExistingSignatures>true</removeExistingSignatures>
<archiveDirectory/> <archiveDirectory />
<includes> <includes>
<include>${project.build.directory}/${project.build.finalName}.apk</include> <include>${project.build.directory}/${project.build.finalName}.apk</include>
</includes> </includes>
@@ -278,29 +277,22 @@
<configuration> <configuration>
<target> <target>
<copy todir="${project.build.directory}/res"> <copy todir="${project.build.directory}/res">
<fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
<fileset dir="${basedir}/../forge-gui/release-files/" <fileset dir="${basedir}/../forge-gui/release-files/" includes="CONTRIBUTORS.txt" />
includes="CONTRIBUTORS.txt"/> <fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
<fileset dir="${basedir}/../forge-gui/release-files/" <fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
includes="INSTALLATION.txt"/> <fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
<fileset dir="${basedir}/../forge-gui/release-files/" <fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt" />
includes="ISSUES.txt"/> <fileset dir="${basedir}/../forge-gui-mobile-dev/" includes="sentry.properties" />
<fileset dir="${basedir}/../forge-gui/release-files/"
includes="CHANGES.txt"/>
<fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt"/>
<fileset dir="${basedir}/../forge-gui-mobile-dev/"
includes="sentry.properties"/>
<fileset dir="${basedir}/../forge-gui/"> <fileset dir="${basedir}/../forge-gui/">
<include name="res/**"/> <include name="res/**" />
<exclude name="res/cardsfolder/**"/> <exclude name="res/cardsfolder/**" />
</fileset> </fileset>
</copy> </copy>
<mkdir dir="${project.build.directory}/res/res/cardsfolder"/> <mkdir dir="${project.build.directory}/res/res/cardsfolder" />
<zip destfile="${project.build.directory}/res/res/cardsfolder/cardsfolder.zip" <zip destfile="${project.build.directory}/res/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
basedir="${basedir}/../forge-gui/res/cardsfolder" level="1"/> <zip destfile="${project.build.directory}/assets.zip" basedir="${project.build.directory}/res" level="1" />
<zip destfile="${project.build.directory}/assets.zip" <delete dir="${project.build.directory}/res" />
basedir="${project.build.directory}/res" level="1"/>
<delete dir="${project.build.directory}/res"/>
</target> </target>
</configuration> </configuration>
<goals> <goals>
@@ -346,22 +338,16 @@
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<target> <target>
<ftp action="mkdir" password="${cardforge.pass}" server="${cardforge.server}" <ftp action="mkdir" password="${cardforge.pass}" server="${cardforge.server}" userid="${cardforge.user}" passive="true" remotedir="maven/releases/forge/forge-gui-android/${alpha-version}/" />
userid="${cardforge.user}" passive="true" <ftp password="${cardforge.pass}" server="${cardforge.server}" userid="${cardforge.user}" passive="true" remotedir="maven/releases/forge/forge-gui-android/${alpha-version}/">
remotedir="maven/releases/forge/forge-gui-android/${alpha-version}/"/>
<ftp password="${cardforge.pass}" server="${cardforge.server}"
userid="${cardforge.user}" passive="true"
remotedir="maven/releases/forge/forge-gui-android/${alpha-version}/">
<fileset dir="${project.build.directory}"> <fileset dir="${project.build.directory}">
<include name="${project.build.finalName}-signed-aligned.apk"/> <include name="${project.build.finalName}-signed-aligned.apk" />
<include name="assets.zip"/> <include name="assets.zip" />
</fileset> </fileset>
</ftp> </ftp>
<ftp password="${cardforge.pass}" server="${cardforge.server}" <ftp password="${cardforge.pass}" server="${cardforge.server}" userid="${cardforge.user}" passive="true" remotedir="maven/releases/forge/forge-gui-android/">
userid="${cardforge.user}" passive="true"
remotedir="maven/releases/forge/forge-gui-android/">
<fileset dir="${project.build.directory}/classes"> <fileset dir="${project.build.directory}/classes">
<include name="version.txt"/> <include name="version.txt" />
</fileset> </fileset>
</ftp> </ftp>
</target> </target>

View File

@@ -1,11 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-gui-desktop</artifactId> <artifactId>forge-gui-desktop</artifactId>
@@ -275,46 +274,38 @@
<configuration> <configuration>
<target> <target>
<!-- Windows/Linux archive --> <!-- Windows/Linux archive -->
<mkdir dir="${project.build.directory}/${project.build.finalName}"/> <mkdir dir="${project.build.directory}/${project.build.finalName}" />
<copy todir="${project.build.directory}/${project.build.finalName}"> <copy todir="${project.build.directory}/${project.build.finalName}">
<fileset dir="${project.build.directory}" includes="forge.sh"/> <fileset dir="${project.build.directory}" includes="forge.sh" />
<fileset dir="${project.build.directory}" includes="forge.command"/> <fileset dir="${project.build.directory}" includes="forge.command" />
<fileset dir="${basedir}/../forge-gui/" <fileset dir="${basedir}/../forge-gui/" includes="forge.profile.properties.example" />
includes="forge.profile.properties.example"/> <fileset dir="${basedir}/" includes="sentry.properties" />
<fileset dir="${basedir}/" includes="sentry.properties"/> <fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
<fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="README.txt" />
<fileset dir="${basedir}/../forge-gui/" includes="README.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt" />
<fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt"/>
<fileset dir="${basedir}/../forge-gui/"> <fileset dir="${basedir}/../forge-gui/">
<include name="res/**"/> <include name="res/**" />
<exclude name="res/cardsfolder/**"/> <exclude name="res/cardsfolder/**" />
</fileset> </fileset>
<fileset dir="${project.build.directory}" includes="forge.exe"/> <fileset dir="${project.build.directory}" includes="forge.exe" />
<fileset dir="${project.build.directory}" <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
includes="${project.build.finalName}-jar-with-dependencies.jar"/>
</copy> </copy>
<mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder"/> <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
<zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
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.sh" <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
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.command" <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
perm="a+rx"/> <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
<chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" <include name="forge.sh" />
perm="a+rx"/> <include name="forge.command" />
<tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" <include name="forge.exe" />
compression="bzip2">
<tarfileset filemode="755"
dir="${project.build.directory}/${project.build.finalName}">
<include name="forge.sh"/>
<include name="forge.command"/>
<include name="forge.exe"/>
</tarfileset> </tarfileset>
<tarfileset dir="${project.build.directory}/${project.build.finalName}"> <tarfileset dir="${project.build.directory}/${project.build.finalName}">
<include name="**"/> <include name="**" />
<exclude name="forge.sh"/> <exclude name="forge.sh" />
<exclude name="forge.command"/> <exclude name="forge.command" />
<exclude name="forge.exe"/> <exclude name="forge.exe" />
</tarfileset> </tarfileset>
</tar> </tar>
</target> </target>
@@ -437,53 +428,41 @@
<configuration> <configuration>
<target> <target>
<!-- Windows/Linux archive --> <!-- Windows/Linux archive -->
<mkdir dir="${project.build.directory}/${project.build.finalName}"/> <mkdir dir="${project.build.directory}/${project.build.finalName}" />
<copy todir="${project.build.directory}/${project.build.finalName}"> <copy todir="${project.build.directory}/${project.build.finalName}">
<fileset dir="${project.build.directory}" includes="forge.sh"/> <fileset dir="${project.build.directory}" includes="forge.sh" />
<fileset dir="${project.build.directory}" includes="forge.command"/> <fileset dir="${project.build.directory}" includes="forge.command" />
<fileset dir="${basedir}/../forge-gui/" <fileset dir="${basedir}/../forge-gui/" includes="forge.profile.properties.example" />
includes="forge.profile.properties.example"/> <fileset dir="${basedir}/" includes="sentry.properties" />
<fileset dir="${basedir}/" includes="sentry.properties"/> <fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
<fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="MANUAL.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/" <fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
includes="CONTRIBUTORS.txt"/> <fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
<fileset dir="${basedir}/../forge-gui/release-files/" <fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
includes="INSTALLATION.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/"> <fileset dir="${basedir}/../forge-gui/">
<include name="res/**"/> <include name="res/**" />
<exclude name="res/cardsfolder/**"/> <exclude name="res/cardsfolder/**" />
</fileset> </fileset>
<fileset dir="${project.build.directory}" includes="forge.exe"/> <fileset dir="${project.build.directory}" includes="forge.exe" />
<fileset dir="${project.build.directory}" <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
includes="${project.build.finalName}-jar-with-dependencies.jar"/>
</copy> </copy>
<mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder"/> <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
<zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
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.sh" <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
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.command" <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
perm="a+rx"/> <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
<chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" <include name="forge.sh" />
perm="a+rx"/> <include name="forge.command" />
<tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" <include name="forge.exe" />
compression="bzip2">
<tarfileset filemode="755"
dir="${project.build.directory}/${project.build.finalName}">
<include name="forge.sh"/>
<include name="forge.command"/>
<include name="forge.exe"/>
</tarfileset> </tarfileset>
<tarfileset dir="${project.build.directory}/${project.build.finalName}"> <tarfileset dir="${project.build.directory}/${project.build.finalName}">
<include name="**"/> <include name="**" />
<exclude name="forge.sh"/> <exclude name="forge.sh" />
<exclude name="forge.command"/> <exclude name="forge.command" />
<exclude name="forge.exe"/> <exclude name="forge.exe" />
</tarfileset> </tarfileset>
</tar> </tar>
</target> </target>
@@ -561,61 +540,41 @@
<phase>pre-integration-test</phase> <phase>pre-integration-test</phase>
<configuration> <configuration>
<target> <target>
<mkdir dir="${project.build.directory}/${project.build.finalName}-osx"/> <mkdir dir="${project.build.directory}/${project.build.finalName}-osx" />
<copy todir="${project.build.directory}/${project.build.finalName}-osx"> <copy todir="${project.build.directory}/${project.build.finalName}-osx">
<fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
<fileset dir="${basedir}/../forge-gui/release-files/" <fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
includes="CHANGES.txt"/> <fileset dir="${basedir}/../forge-gui/release-files/" includes="CONTRIBUTORS.txt" />
<fileset dir="${basedir}/../forge-gui/release-files/" <fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
includes="CONTRIBUTORS.txt"/> <fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
<fileset dir="${basedir}/../forge-gui/release-files/" <fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt" />
includes="ISSUES.txt"/> <fileset dir="${basedir}/" includes="sentry.properties" />
<fileset dir="${basedir}/../forge-gui/release-files/"
includes="INSTALLATION.txt"/>
<fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt"/>
<fileset dir="${basedir}/" includes="sentry.properties"/>
</copy> </copy>
<taskdef name="bundleapp" <taskdef name="bundleapp" classpath="${basedir}/../forge-gui/${configSourceDirectory}/appbundler-1.0-custom.jar" classname="com.oracle.appbundler.AppBundlerTask" />
classpath="${basedir}/../forge-gui/${configSourceDirectory}/appbundler-1.0-custom.jar" <bundleapp outputdirectory="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" displayname="${project.name}" shortversion="${project.version}" identifier="forge.view.Main" icon="${basedir}/${configSourceDirectory}/Forge.icns" applicationCategory="public.app-category.games" mainclassname="forge.view.Main">
classname="com.oracle.appbundler.AppBundlerTask"/> <classpath file="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar" />
<bundleapp <classpath file="${basedir}/../forge-gui/forge.profile.properties.example" />
outputdirectory="${project.build.directory}/${project.build.finalName}-osx" <option value="-Dapple.laf.useScreenMenuBar=true" />
name="${project.name}" displayname="${project.name}" <option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
shortversion="${project.version}" identifier="forge.view.Main" <option value="-Dcom.apple.macos.useScreenMenuBar=true" />
icon="${basedir}/${configSourceDirectory}/Forge.icns" <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Forge" />
applicationCategory="public.app-category.games" <option value="-Dcom.apple.smallTabs=true" />
mainclassname="forge.view.Main"> <option value="-Xmx1024M" />
<classpath <option value="-Dapp.dir=$APP_ROOT/Contents/Resources/" />
file="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar"/>
<classpath file="${basedir}/../forge-gui/forge.profile.properties.example"/>
<option value="-Dapple.laf.useScreenMenuBar=true"/>
<option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
<option value="-Dcom.apple.mrj.application.apple.menu.about.name=Forge"/>
<option value="-Dcom.apple.smallTabs=true"/>
<option value="-Xmx1024M"/>
<option value="-Dapp.dir=$APP_ROOT/Contents/Resources/"/>
</bundleapp> </bundleapp>
<copy todir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res"> <copy todir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res">
<fileset dir="${basedir}/../forge-gui/res" excludes="**/cardsfolder/**"/> <fileset dir="${basedir}/../forge-gui/res" excludes="**/cardsfolder/**" />
</copy> </copy>
<mkdir dir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder"/> <mkdir dir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder" />
<zip destfile="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder/cardsfolder.zip" <zip destfile="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
basedir="${basedir}/../forge-gui/res/cardsfolder" level="1"/> <symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" resource="/Applications" />
<symlink <exec executable="${basedir}/../forge-gui/${configSourceDirectory}/create-dmg" failonerror="false">
link="${project.build.directory}/${project.build.finalName}-osx/Applications" <arg line="--volname ${project.name}-${project.version} --background ${basedir}/../forge-gui/${configSourceDirectory}/backgroundImage.jpg --window-size 700 419 --icon-size 64 --icon ${forge.file.name} 141 283 --icon ${applications.file.name} 452 283 --icon ${changes.file.name} 645 80 --icon ${license.file.name} 645 200 --icon ${readme.file.name} 645 320 ${project.build.directory}/${project.build.finalName}.dmg ${project.build.directory}/${project.build.finalName}-osx" />
resource="/Applications"/>
<exec executable="${basedir}/../forge-gui/${configSourceDirectory}/create-dmg"
failonerror="false">
<arg line="--volname ${project.name}-${project.version} --background ${basedir}/../forge-gui/${configSourceDirectory}/backgroundImage.jpg --window-size 700 419 --icon-size 64 --icon ${forge.file.name} 141 283 --icon ${applications.file.name} 452 283 --icon ${changes.file.name} 645 80 --icon ${license.file.name} 645 200 --icon ${readme.file.name} 645 320 ${project.build.directory}/${project.build.finalName}.dmg ${project.build.directory}/${project.build.finalName}-osx"/>
</exec> </exec>
<tar basedir="${project.build.directory}" <tar basedir="${project.build.directory}" includes="${project.build.finalName}.dmg" destfile="${project.build.directory}/${project.build.finalName}-osx.tar.bz2" compression="bzip2" />
includes="${project.build.finalName}.dmg"
destfile="${project.build.directory}/${project.build.finalName}-osx.tar.bz2"
compression="bzip2"/>
<!--<symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" action="delete" /> --> <!--<symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" action="delete" /> -->
<exec executable="rm" failonerror="false"> <exec executable="rm" failonerror="false">
<arg line="-f ${project.build.directory}/${project.build.finalName}-osx/Applications"/> <arg line="-f ${project.build.directory}/${project.build.finalName}-osx/Applications" />
</exec> </exec>
</target> </target>
</configuration> </configuration>
@@ -695,54 +654,38 @@
<phase>pre-integration-test</phase> <phase>pre-integration-test</phase>
<configuration> <configuration>
<target> <target>
<mkdir dir="${project.build.directory}/${project.build.finalName}-osx"/> <mkdir dir="${project.build.directory}/${project.build.finalName}-osx" />
<copy todir="${project.build.directory}/${project.build.finalName}-osx"> <copy todir="${project.build.directory}/${project.build.finalName}-osx">
<fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
<fileset dir="${basedir}/../forge-gui/" includes="README.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="README.txt" />
<fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt"/> <fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt" />
<fileset dir="${basedir}/" includes="sentry.properties"/> <fileset dir="${basedir}/" includes="sentry.properties" />
</copy> </copy>
<taskdef name="bundleapp" <taskdef name="bundleapp" classpath="${basedir}/../forge-gui/${configSourceDirectory}/appbundler-1.0-custom.jar" classname="com.oracle.appbundler.AppBundlerTask" />
classpath="${basedir}/../forge-gui/${configSourceDirectory}/appbundler-1.0-custom.jar" <bundleapp outputdirectory="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" displayname="${project.name}" shortversion="${project.version}" identifier="forge.view.Main" icon="${basedir}/${configSourceDirectory}/Forge.icns" applicationCategory="public.app-category.games" mainclassname="forge.view.Main">
classname="com.oracle.appbundler.AppBundlerTask"/> <classpath file="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar" />
<bundleapp <classpath file="${basedir}/../forge-gui/forge.profile.properties.example" />
outputdirectory="${project.build.directory}/${project.build.finalName}-osx" <option value="-Dapple.laf.useScreenMenuBar=true" />
name="${project.name}" displayname="${project.name}" <option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
shortversion="${project.version}" identifier="forge.view.Main" <option value="-Dcom.apple.macos.useScreenMenuBar=true" />
icon="${basedir}/${configSourceDirectory}/Forge.icns" <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Forge" />
applicationCategory="public.app-category.games" <option value="-Dcom.apple.smallTabs=true" />
mainclassname="forge.view.Main"> <option value="-Xmx1024M" />
<classpath <option value="-Dapp.dir=$APP_ROOT/Contents/Resources/" />
file="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar"/>
<classpath file="${basedir}/../forge-gui/forge.profile.properties.example"/>
<option value="-Dapple.laf.useScreenMenuBar=true"/>
<option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
<option value="-Dcom.apple.mrj.application.apple.menu.about.name=Forge"/>
<option value="-Dcom.apple.smallTabs=true"/>
<option value="-Xmx1024M"/>
<option value="-Dapp.dir=$APP_ROOT/Contents/Resources/"/>
</bundleapp> </bundleapp>
<copy todir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res"> <copy todir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res">
<fileset dir="${basedir}/../forge-gui/res" excludes="**/cardsfolder/**"/> <fileset dir="${basedir}/../forge-gui/res" excludes="**/cardsfolder/**" />
</copy> </copy>
<mkdir dir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder"/> <mkdir dir="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder" />
<zip destfile="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder/cardsfolder.zip" <zip destfile="${project.build.directory}/${project.build.finalName}-osx/Forge.app/Contents/Resources/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
basedir="${basedir}/../forge-gui/res/cardsfolder" level="1"/> <symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" resource="/Applications" />
<symlink <exec executable="${basedir}/../forge-gui/${configSourceDirectory}/create-dmg" failonerror="false">
link="${project.build.directory}/${project.build.finalName}-osx/Applications" <arg line="--volname ${project.name}-${project.version} --background ${basedir}/../forge-gui/${configSourceDirectory}/backgroundImage.jpg --window-size 700 419 --icon-size 64 --icon ${forge.file.name} 141 283 --icon ${applications.file.name} 452 283 --icon ${changes.file.name} 645 80 --icon ${license.file.name} 645 200 --icon ${readme.file.name} 645 320 ${project.build.directory}/${project.build.finalName}.dmg ${project.build.directory}/${project.build.finalName}-osx" />
resource="/Applications"/>
<exec executable="${basedir}/../forge-gui/${configSourceDirectory}/create-dmg"
failonerror="false">
<arg line="--volname ${project.name}-${project.version} --background ${basedir}/../forge-gui/${configSourceDirectory}/backgroundImage.jpg --window-size 700 419 --icon-size 64 --icon ${forge.file.name} 141 283 --icon ${applications.file.name} 452 283 --icon ${changes.file.name} 645 80 --icon ${license.file.name} 645 200 --icon ${readme.file.name} 645 320 ${project.build.directory}/${project.build.finalName}.dmg ${project.build.directory}/${project.build.finalName}-osx"/>
</exec> </exec>
<tar basedir="${project.build.directory}" <tar basedir="${project.build.directory}" includes="${project.build.finalName}.dmg" destfile="${project.build.directory}/${project.build.finalName}-osx.tar.bz2" compression="bzip2" />
includes="${project.build.finalName}.dmg"
destfile="${project.build.directory}/${project.build.finalName}-osx.tar.bz2"
compression="bzip2"/>
<!--<symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" action="delete" /> --> <!--<symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" action="delete" /> -->
<exec executable="rm" failonerror="false"> <exec executable="rm" failonerror="false">
<arg line="-f ${project.build.directory}/${project.build.finalName}-osx/Applications"/> <arg line="-f ${project.build.directory}/${project.build.finalName}-osx/Applications" />
</exec> </exec>
</target> </target>
</configuration> </configuration>

View File

@@ -1,5 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -13,7 +12,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-gui-ios</artifactId> <artifactId>forge-gui-ios</artifactId>

View File

@@ -1,11 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-gui-mobile-dev</artifactId> <artifactId>forge-gui-mobile-dev</artifactId>

View File

@@ -1,11 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-gui-mobile</artifactId> <artifactId>forge-gui-mobile</artifactId>

View File

@@ -1,11 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
</parent> </parent>
<artifactId>forge-gui</artifactId> <artifactId>forge-gui</artifactId>

13
pom.xml
View File

@@ -1,12 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>forge</groupId> <groupId>forge</groupId>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Forge Parent</name> <name>Forge Parent</name>
<version>1.6.17-SNAPSHOT</version> <version>1.6.17</version>
<description> <description>
Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules. Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules.
@@ -176,7 +175,7 @@
<scm> <scm>
<connection>scm:git:ssh://git@git.cardforge.org/core-developers/forge.git</connection> <connection>scm:git:ssh://git@git.cardforge.org/core-developers/forge.git</connection>
<developerConnection>scm:git:ssh://git@git.cardforge.org/core-developers/forge.git</developerConnection> <developerConnection>scm:git:ssh://git@git.cardforge.org/core-developers/forge.git</developerConnection>
<tag>HEAD</tag> <tag>forge-1.6.17</tag>
</scm> </scm>
<mailingLists> <mailingLists>
@@ -376,7 +375,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore/> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
@@ -390,7 +389,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<execute/> <execute />
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
@@ -403,7 +402,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<execute/> <execute />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>