vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 20:12:07 +01:00
Code Issues Releases Wiki Activity

Untabify build.xml

Browse source 
Only non-semantic whitespace fixes
This commit is contained in:
Florian Schmaus 2014-02-06 09:45:26 +01:00
parent 68a570b4fe
commit c4edd1f27c
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
build/build.xml
View file

@ -29,33 +29,33 @@
<property name="version.minor" value="4" /> <property name="version.minor" value="4" />
<property name="version.revision" value="0" /> <property name="version.revision" value="0" />
<property name="version.extra" value="" /> <property name="version.extra" value="" />
<var name="mutable-version" value="${version.major}.${version.minor}.${version.revision}"/> <var name="mutable-version" value="${version.major}.${version.minor}.${version.revision}"/>
<var name="mutable-experimental-version" value="0.1"/> <var name="mutable-experimental-version" value="0.1"/>
<if> <if>
<length string="${version.extra}" when="greater" length="0"/> <length string="${version.extra}" when="greater" length="0"/>
<then> <then>
<var name="mutable-version" value="${mutable-version}.${version.extra}"/> <var name="mutable-version" value="${mutable-version}.${version.extra}"/>
<var name="mutable-experimental-version" value="${mutable-experimental-version}.${version.extra}" /> <var name="mutable-experimental-version" value="${mutable-experimental-version}.${version.extra}" />
</then> </then>
</if> </if>
<if> <if>
<equals arg1="${dailybuild}" arg2="true" /> <equals arg1="${dailybuild}" arg2="true" />
<then> <then>
<tstamp> <tstamp>
<format property="build.date" pattern="yyyyMMdd" locale="en"/> <format property="build.date" pattern="yyyyMMdd" locale="en"/>
</tstamp> </tstamp>
<var name="mutable-version" value="${mutable-version}-${build.date}" /> <var name="mutable-version" value="${mutable-version}-${build.date}" />
<var name="mutable-experimental-version" value="${mutable-experimental-version}-${build.date}" /> <var name="mutable-experimental-version" value="${mutable-experimental-version}-${build.date}" />
</then> </then>
</if> </if>
<property name="version" value="${mutable-version}" /> <property name="version" value="${mutable-version}" />
<property name="experimental.version" value="${mutable-experimental-version}" /> <property name="experimental.version" value="${mutable-experimental-version}" />
<property name="bundle.name" value="org.igniterealtime.smack" /> <property name="bundle.name" value="org.igniterealtime.smack" />
<property file="${basedir}/build/build.properties" /> <property file="${basedir}/build/build.properties" />
<property name="compile.dir" value="${basedir}/target/classes" /> <property name="compile.dir" value="${basedir}/target/classes" />
<property name="compile.test.dir" value="${basedir}/target/classes-test" /> <property name="compile.test.dir" value="${basedir}/target/classes-test" />
@ -140,7 +140,7 @@
</classpath> </classpath>
</javac> </javac>
<mkdir dir="${compile.dir}/workgroup" /> <mkdir dir="${compile.dir}/workgroup" />
<javac <javac
destdir="${compile.dir}/workgroup" destdir="${compile.dir}/workgroup"
includeAntRuntime="no" includeAntRuntime="no"
@ -157,7 +157,7 @@
</classpath> </classpath>
</javac> </javac>
<mkdir dir="${compile.dir}/experimental" /> <mkdir dir="${compile.dir}/experimental" />
<javac <javac
destdir="${compile.dir}/experimental" destdir="${compile.dir}/experimental"
includeAntRuntime="no" includeAntRuntime="no"
@ -214,7 +214,7 @@
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/jul.properties" /> <copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/jul.properties" />
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/smack-config.xml" /> <copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/smack-config.xml" />
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/core.providers" /> <copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/core.providers" />
<property name="smack.jar.name" value="${jar.dest.dir}/smack-${version}.jar" /> <property name="smack.jar.name" value="${jar.dest.dir}/smack-${version}.jar" />
<jar destfile="${smack.jar.name}" <jar destfile="${smack.jar.name}"
basedir="${compile.dir}" basedir="${compile.dir}"
includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml, **/core.providers, **/jul.properties"> includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml, **/core.providers, **/jul.properties">
@ -228,8 +228,8 @@
<attribute name="Bundle-Version" value="${version}" /> <attribute name="Bundle-Version" value="${version}" />
</manifest> </manifest>
</jar> </jar>
<property name="smackx.jar.name" value="${jar.dest.dir}/smackx-${version}.jar" /> <property name="smackx.jar.name" value="${jar.dest.dir}/smackx-${version}.jar" />
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/extension.providers" /> <copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/extension.providers" />
<jar destfile="${smackx.jar.name}" <jar destfile="${smackx.jar.name}"
basedir="${compile.dir}" basedir="${compile.dir}"
@ -248,9 +248,9 @@
<attribute name="Fragment-Host" value="${bundle.name};bundle-version=${version}" /> <attribute name="Fragment-Host" value="${bundle.name};bundle-version=${version}" />
</manifest> </manifest>
</jar> </jar>
<property name="debug.jar.name" value="${jar.dest.dir}/smackx-debug-${version}.jar" /> <property name="debug.jar.name" value="${jar.dest.dir}/smackx-debug-${version}.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"/>
</fileset> </fileset>
@ -270,8 +270,8 @@
<attribute name="Fragment-Host" value="${bundle.name};bundle-version=${version}" /> <attribute name="Fragment-Host" value="${bundle.name};bundle-version=${version}" />
</manifest> </manifest>
</jar> </jar>
<property name="jingle.jar.name" value="${jar.dest.dir}/smackx-jingle-${version}.jar" /> <property name="jingle.jar.name" value="${jar.dest.dir}/smackx-jingle-${version}.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">
@ -289,7 +289,7 @@
</manifest> </manifest>
</jar> </jar>
<property name="workgroup.jar.name" value="${jar.dest.dir}/smackx-workgroup-${version}.jar" /> <property name="workgroup.jar.name" value="${jar.dest.dir}/smackx-workgroup-${version}.jar" />
<copy todir="${compile.dir}/workgroup/META-INF" file="${basedir}/workgroup/resources/META-INF/workgroup.providers" /> <copy todir="${compile.dir}/workgroup/META-INF" file="${basedir}/workgroup/resources/META-INF/workgroup.providers" />
<jar destfile="${workgroup.jar.name}" <jar destfile="${workgroup.jar.name}"
basedir="${compile.dir}/workgroup" basedir="${compile.dir}/workgroup"
@ -307,7 +307,7 @@
</manifest> </manifest>
</jar> </jar>
<property name="experimental.jar.name" value="${jar.dest.dir}/smackx-experimental-${experimental.version}.jar" /> <property name="experimental.jar.name" value="${jar.dest.dir}/smackx-experimental-${experimental.version}.jar" />
<copy todir="${compile.dir}/experimental/META-INF" file="${basedir}/experimental/resources/META-INF/experimental.providers" /> <copy todir="${compile.dir}/experimental/META-INF" file="${basedir}/experimental/resources/META-INF/experimental.providers" />
<jar destfile="${experimental.jar.name}" <jar destfile="${experimental.jar.name}"
basedir="${compile.dir}/experimental" basedir="${compile.dir}/experimental"
@ -326,7 +326,7 @@
</jar> </jar>
<!-- <!--
<delete file="${compile.dir}/META-INF/smack-config.xml" /> <delete file="${compile.dir}/META-INF/smack-config.xml" />
<delete file="${compile.dir}/META-INF/*.providers" /> <delete file="${compile.dir}/META-INF/*.providers" />
<delete> <delete>
<fileset dir="${compile.dir}/images"> <fileset dir="${compile.dir}/images">