Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-23 06:42:05 +01:00
Code Issues Releases Wiki Activity

Added version info to the release build zip/tar file

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13865 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2014-01-19 17:24:41 +00:00
parent 962bd277f1
commit 9c9eb3efe2
2 changed files with 32 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/build.xml
View file

@ -26,9 +26,9 @@
<!-- Smack Version --> <!-- Smack Version -->
<property name="version.major" value="3" /> <property name="version.major" value="3" />
<property name="version.minor" value="3" /> <property name="version.minor" value="4" />
<property name="version.revision" value="1" /> <property name="version.revision" value="0" />
<property name="version.extra" value="" /> <property name="version.extra" value="SNAPSHOT" />
<if> <if>
<equals arg1="${version.extra}" arg2=""/> <equals arg1="${version.extra}" arg2=""/>
@ -42,7 +42,7 @@
<property name="version" <property name="version"
value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/> value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/>
<property name="version.filename" <property name="version.filename"
value="${version.major}_${version.minor}_${version.revision}_${version.extra}"/> value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/>
</else> </else>
</if> </if>
<tstamp> <tstamp>
@ -205,7 +205,7 @@
</manifest> </manifest>
</jar> </jar>
<property name="debug.jar.name" value="${jar.dest.dir}/smack-debug.jar" /> <property name="debug.jar.name" value="${jar.dest.dir}/smackx-debug.jar" />
<copy todir="${compile.dir}/images"> <copy todir="${compile.dir}/images">
<fileset dir="${basedir}/build/resources/images"> <fileset dir="${basedir}/build/resources/images">
<include name="*.png"/> <include name="*.png"/>
@ -225,7 +225,7 @@
</manifest> </manifest>
</jar> </jar>
<property name="jingle.jar.name" value="${jar.dest.dir}/smack-jingle.jar" /> <property name="jingle.jar.name" value="${jar.dest.dir}/smackx-jingle.jar" />
<jar destfile="${jingle.jar.name}" <jar destfile="${jingle.jar.name}"
basedir="${compile.dir}/jingle/extension" basedir="${compile.dir}/jingle/extension"
includes="org/jivesoftware/smackx/**/*.class"> includes="org/jivesoftware/smackx/**/*.class">

121
build/release.xml
View file

@ -32,25 +32,21 @@
<equals arg1="${dailybuild}" arg2="true" /> <equals arg1="${dailybuild}" arg2="true" />
<then> <then>
<tstamp> <tstamp>
<format property="build.date" pattern="yyyy-MM-dd" locale="en"/> <format property="build.date" pattern="yyyyMMdd" locale="en"/>
</tstamp> </tstamp>
<property name="release.name" value="smack-${build.date}" /> <property name="release.name" value="smack-${version.filename}-${build.date}" />
<property name="release-dev.name" value="smack_src_${build.date}" />
</then> </then>
<else> <else>
<property name="release.name" value="smack_${version.filename}" /> <property name="release.name" value="smack-${version.filename}" />
<property name="release-dev.name" value="smack_src_${version.filename}" />
</else> </else>
</if> </if>
<property name="release.dir" value="${basedir}/target/release/${release.name}" /> <property name="release.dir" value="${basedir}/target/release/${release.name}" />
<property name="release.samples.dir" value="${release.dir}/samples" /> <property name="release.samples.dir" value="${release.dir}/samples" />
<property name="release-dev.dir" value="${basedir}/target/release/${release-dev.name}" />
<property name="release-dev.samples.dir" value="${release-dev.name}/samples" />
<!-- create release dirs --> <!-- create release dirs -->
<mkdir dir="${release.dir}" /> <mkdir dir="${release.dir}" />
<mkdir dir="${release.samples.dir}" /> <mkdir dir="${release.samples.dir}" />
<mkdir dir="${release-dev.dir}" />
<mkdir dir="${release-dev.dir.samples}/samples" />
<!-- Copy smack.jar --> <!-- Copy smack.jar -->
<copy todir="${release.dir}"> <copy todir="${release.dir}">
<fileset dir="${jar.dest.dir}" includes="smack.jar" /> <fileset dir="${jar.dest.dir}" includes="smack.jar" />
@ -62,77 +58,19 @@
<fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" /> <fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" />
<fileset dir="${basedir}/build/resources/META-INF" includes="smack-config.xml" /> <fileset dir="${basedir}/build/resources/META-INF" includes="smack-config.xml" />
</copy> </copy>
<copy todir="${release-dev.dir}">
<fileset dir="${jar.dest.dir}" includes="smack.jar" />
<fileset dir="${jar.dest.dir}" includes="smackx.jar" />
<fileset dir="${jar.dest.dir}" includes="smackx-debug.jar" />
<fileset dir="${jar.dest.dir}" includes="smackx-jingle.jar" />
</copy>
<copy todir="${release-dev.samples.dir}">
<fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" />
<fileset dir="${basedir}/build/resources/META-INF" includes="smack-config" />
</copy>
<!-- Copy build dir -->
<copy todir="${release-dev.dir}/build">
<fileset dir="${basedir}/build">
<include name="ant*" />
<include name="junit.jar" />
<include name="build.xml" />
<include name="README.html" />
<include name="lib/*.jar" />
<include name="merge/*.jar" />
<include name="build/*.jar" />
</fileset>
</copy>
<copy todir="${release-dev.dir}/jingle/extension/build">
<fileset dir="${basedir}/jingle/extension/build">
<include name="ant*" />
<include name="junit.jar" />
<include name="build.xml" />
<include name="README.html" />
<include name="lib/*.jar" />
<include name="merge/*.jar" />
</fileset>
</copy>
<!-- Copy Javadocs --> <!-- Copy Javadocs -->
<copy todir="${release.dir}/javadoc"> <copy todir="${release.dir}/javadoc">
<fileset dir="${basedir}/target/javadoc" includes="**/*.*" /> <fileset dir="${basedir}/target/javadoc" includes="**/*.*" />
</copy> </copy>
<copy todir="${release-dev.dir}/javadoc">
<fileset dir="${basedir}/target/javadoc" includes="**/*.*" />
</copy>
<!-- Copy documentation --> <!-- Copy documentation -->
<copy todir="${release.dir}/documentation"> <copy todir="${release.dir}/documentation">
<fileset dir="${basedir}/documentation" includes="**/*.*" /> <fileset dir="${basedir}/documentation" includes="**/*.*" />
</copy> </copy>
<copy todir="${release-dev.dir}/documentation">
<fileset dir="${basedir}/documentation" includes="**/*.*" />
</copy>
<!-- Copy source -->
<copy todir="${release-dev.dir}/source">
<fileset dir="${basedir}/source" includes="**/*.java" />
<fileset dir="${basedir}/source" includes="**/*.html" />
</copy>
<copy todir="${release-dev.dir}/jingle/extension/source">
<fileset dir="${basedir}/jingle/extension/source" includes="**/*.java" />
<fileset dir="${basedir}/jingle/extension/source" includes="**/*.html" />
</copy>
<copy todir="${release-dev.dir}/test">
<fileset dir="${basedir}/test" includes="**/*.java" />
</copy>
<!-- Copy resources -->
<copy todir="${release-dev.dir}/build/resources">
<fileset dir="${basedir}/build/resources" includes="META-INF/core.providers" />
<fileset dir="${basedir}/build/resources" includes="META-INF/extension.providers" />
<fileset dir="${basedir}/build/resources" includes="META-INF/sample.providers" />
<fileset dir="${basedir}/build/resources" includes="META-INF/jul.properties" />
<fileset dir="${basedir}/build/resources" includes="META-INF/smack-config.xml" />
</copy>
<copy todir="${release-dev.dir}/build/resources/images">
<fileset dir="${basedir}/build/resources/images">
<include name="*.png"/>
</fileset>
</copy>
<!-- Copy readme.html and changelog.html --> <!-- Copy readme.html and changelog.html -->
<copy todir="${release.dir}"> <copy todir="${release.dir}">
<fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" /> <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
@ -141,28 +79,8 @@
<filter token="version" value="${version}"/> <filter token="version" value="${version}"/>
</filterset> </filterset>
</copy> </copy>
<copy todir="${release-dev.dir}">
<fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
<filterset>
<filter token="builddate" value="${builddate}"/>
<filter token="version" value="${version}"/>
</filterset>
</copy>
<!-- Package --> <!-- Package -->
<if>
<equals arg1="${dailybuild}" arg2="true" />
<then>
<zip destfile="${basedir}/target/release/${release-dev.name}.zip"
basedir="${release-dev.dir}/.."
includes="${release-dev.name}/**/*.*"
/>
<tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
basedir="${release-dev.dir}/.."
includes="${release-dev.name}/**/*.*"
compression="gzip"
/>
</then>
<else>
<zip destfile="${basedir}/target/release/${release.name}.zip" <zip destfile="${basedir}/target/release/${release.name}.zip"
basedir="${release.dir}/.." basedir="${release.dir}/.."
includes="${release.name}/**/*.*" includes="${release.name}/**/*.*"
@ -172,26 +90,11 @@
includes="${release.name}/**/*.*" includes="${release.name}/**/*.*"
compression="gzip" compression="gzip"
/> />
<zip destfile="${basedir}/target/release/${release-dev.name}.zip"
basedir="${release-dev.dir}/.."
includes="${release-dev.name}/**/*.*"
/>
<tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
basedir="${release-dev.dir}/.."
includes="${release-dev.name}/**/*.*"
compression="gzip"
/>
</else>
</if>
<echo> <echo>
----------------------------------------------- -----------------------------------------------
Release made, testing Ant targets of release... Release made
----------------------------------------------- -----------------------------------------------
</echo> </echo>
<!-- call the release tester -->
<antcall target="test" />
</target> </target>
<!-- test --> <!-- test -->