Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- minor whitespace and duplicate task (build.meego.changelog) cleanup of mtg ant build file

Browse Source
This commit is contained in:
Rolzad73
2017-01-26 20:05:19 -05:00
parent f077a4e074
commit f2e0da47ed
1 changed files with 76 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/build.xml
+44 -56
View File
@@ -1,67 +1,61 @@
<project name="Wagic"> <project name="Wagic">
<!-- build.properties should contain the values for major, minor and point --> <!-- build.properties should contain the values for major, minor and point -->
<property file="build.properties" /> <property file="build.properties"/>
<property file="build.number.properties" /> <property file="build.number.properties"/>
<property environment="env"/> <property environment="env"/>
<path id="groovy.class.path" > <path id="groovy.class.path">
<fileset dir="${groovy.dir}" /> <fileset dir="${groovy.dir}"/>
</path> </path>
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.class.path" /> <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.class.path"/>
<tstamp> <tstamp>
<format property="TODAY" pattern="EEE, dd-MMM-yyyy HH::mm:ss" /> <format pattern="EEE, dd-MMM-yyyy HH::mm:ss" property="TODAY"/>
</tstamp> </tstamp>
<target name="update.major" > <target name="update.major">
<echo message="incrementing Major Version number by 1" /> <echo message="incrementing Major Version number by 1"/>
<!-- update the build.number.properties file --> <!-- update the build.number.properties file -->
<propertyfile file="build.number.properties" <propertyfile comment="build.number.properties (normally this file is maintained by build.xml)"
comment="build.number.properties (normally this file is maintained by build.xml)"> file="build.number.properties">
<entry key="build.major" type="int" default="0" operation="+" pattern="0" /> <entry default="0" key="build.major" operation="+" pattern="0" type="int"/>
</propertyfile>
</target>
<target name="update.minor" >
<echo message="incrementing minor Version number by 1" />
<!-- update the build.number.properties file -->
<propertyfile file="build.number.properties"
comment="build.number.properties (normally this file is maintained by build.xml)">
<entry key="build.minor" type="int" default="00" operation="+" pattern="00" />
</propertyfile> </propertyfile>
</target> </target>
<target name="update.point" > <target name="update.minor">
<echo message="incrementing point Version number by 1" /> <echo message="incrementing minor Version number by 1"/>
<!-- update the build.number.properties file --> <!-- update the build.number.properties file -->
<propertyfile file="build.number.properties" <propertyfile comment="build.number.properties (normally this file is maintained by build.xml)"
comment="build.number.properties (normally this file is maintained by build.xml)"> file="build.number.properties">
<entry key="build.point" type="int" default="0" operation="+" pattern="0" /> <entry default="00" key="build.minor" operation="+" pattern="00" type="int"/>
</propertyfile> </propertyfile>
</target> </target>
<target name="update" description="Updates the AndroidManifest and Wagic_Version.h with the current version information" > <target name="update.point">
<echo message="incrementing point Version number by 1"/>
<antcall target="build.maemo.changelog" /> <!-- update the build.number.properties file -->
<antcall target="build.meego.changelog" /> <propertyfile comment="build.number.properties (normally this file is maintained by build.xml)"
<antcall target="build.wagic.header" /> file="build.number.properties">
<antcall target="update.android.manifest" /> <entry default="0" key="build.point" operation="+" pattern="0" type="int"/>
</propertyfile>
</target> </target>
<target name="update.android.manifest" description="Updates the AndroidManifest.xml with the current version information" > <target name="update" description="Updates the AndroidManifest and Wagic_Version.h with the current version information">
<antcall target="build.maemo.changelog"/>
<antcall target="build.wagic.header"/>
<antcall target="update.android.manifest"/>
</target>
<groovy src="${basedir}/updateAndroidManifest.groovy" classpathref="groovy.class.path" > <target name="update.android.manifest" description="Updates the AndroidManifest.xml with the current version information">
<arg value="Android/AndroidManifest.xml" /> <groovy classpathref="groovy.class.path" src="${basedir}/updateAndroidManifest.groovy">
<arg value="Android/AndroidManifest.xml"/>
</groovy> </groovy>
</target> </target>
<target name="build.wagic.header" description="Create the Wagic_Version.h file" > <target name="build.wagic.header" description="Create the Wagic_Version.h file">
<echo message="Creating Wagic_Version.h" /> <echo message="Creating Wagic_Version.h"/>
<echo file="${basedir}/include/Wagic_Version.h" > <echo file="${basedir}/include/Wagic_Version.h">
/* /*
This file was auto-generated by ant build script on ${TODAY} This file was auto-generated by ant build script on ${TODAY}
To make changes please edit the ant build script, otherwise your changes will be lost To make changes please edit the ant build script, otherwise your changes will be lost
@@ -86,32 +80,26 @@ Author: Michael Nguyen
#define VERSION_TOSTRING(a) #a #define VERSION_TOSTRING(a) #a
#define VERSION_STRINGIFY(a) VERSION_TOSTRING(a) #define VERSION_STRINGIFY(a) VERSION_TOSTRING(a)
#define WAGIC_VERSION VERSION_GAME(WAGIC_VERSION_MAJOR, WAGIC_VERSION_MEDIUM, WAGIC_VERSION_MINOR, WAGIC_VERSION_REVISION) #define WAGIC_VERSION VERSION_GAME(WAGIC_VERSION_MAJOR, WAGIC_VERSION_MEDIUM,
#define WAGIC_RESOURCE_VERSION VERSION_FILE(WAGIC_VERSION_MAJOR, WAGIC_VERSION_MEDIUM, WAGIC_VERSION_MINOR) WAGIC_VERSION_MINOR, WAGIC_VERSION_REVISION)
#define WAGIC_RESOURCE_VERSION VERSION_FILE(WAGIC_VERSION_MAJOR, WAGIC_VERSION_MEDIUM,
WAGIC_VERSION_MINOR)
#define WAGIC_VERSION_STRING VERSION_STRINGIFY(WAGIC_VERSION) #define WAGIC_VERSION_STRING VERSION_STRINGIFY(WAGIC_VERSION)
#define WAGIC_CORE_VERSION_STRING "core_" VERSION_STRINGIFY(WAGIC_RESOURCE_VERSION) #define WAGIC_CORE_VERSION_STRING "core_" VERSION_STRINGIFY(WAGIC_RESOURCE_VERSION)
#define WAGIC_RESOURCE_NAME "Wagic-core.zip" #define WAGIC_RESOURCE_NAME "Wagic-core.zip"
#define WAGIC_RELEASE_NAME "${env.RELEASE_NAME}" #define WAGIC_RELEASE_NAME "${env.RELEASE_NAME}"
#define WAGIC_RESOURCE_URL "https://github.com/WagicProject/wagic/releases/download/" WAGIC_RELEASE_NAME "/" WAGIC_RESOURCE_NAME #define WAGIC_RESOURCE_URL "https://github.com/WagicProject/wagic/releases/download/"
WAGIC_RELEASE_NAME "/" WAGIC_RESOURCE_NAME
#endif #endif
</echo> </echo>
</target> </target>
<target name="build.maemo.changelog" description="Create the maemo changelog file" >
<echo message="Creating maemo changelog" />
<echo file="${basedir}/debian/changelog" >
wagic (${build.major}.${build.minor}.${build.point}maemo0) unstable; urgency=low
* {replace with some kickass changelog} <target name="build.maemo.changelog" description="Create the maemo changelog file">
-- Xawotihs ${TODAY} <echo message="Creating maemo changelog"/>
<echo file="${basedir}/debian/changelog">
</echo> wagic (${build.major}.${build.minor}.${build.point}maemo0) unstable; urgency=low
</target>
<target name="build.meego.changelog" description="Create the meego changelog file" >
<echo message="Creating meego changelog" />
<echo file="${basedir}/debian_harmattan/changelog" >
wagic (${build.major}.${build.minor}.${build.point}meego0) unstable; urgency=low
* {replace with some kickass changelog} * {replace with some kickass changelog}
-- Xawotihs ${TODAY} -- Xawotihs ${TODAY}