vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Whitespace fixes in build.xml 

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13401 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Florian Schmaus 2013-01-21 10:35:20 +00:00 committed by flow
parent 767d93894e
commit 5b7b13c43f
1 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
build/build.xml
View File

@ -28,7 +28,7 @@
<property name="version.major" value="3" /> <property name="version.major" value="3" />
<property name="version.minor" value="3" /> <property name="version.minor" value="3" />
<property name="version.revision" value="0" /> <property name="version.revision" value="0" />
<property name="version.extra" value="SNAPSHOT" /> <property name="version.extra" value="SNAPSHOT" />
<if> <if>
<equals arg1="${version.extra}" arg2=""/> <equals arg1="${version.extra}" arg2=""/>
@ -58,8 +58,8 @@
<property name="test.dir" value="${basedir}/test" /> <property name="test.dir" value="${basedir}/test" />
<property name="test-unit.dir" value="${basedir}/test-unit" /> <property name="test-unit.dir" value="${basedir}/test-unit" />
<property name="resources.dir" value="${basedir}/build/resources" /> <property name="resources.dir" value="${basedir}/build/resources" />
<property name="jingle.extension.merge.lib.dir" value="${basedir}/jingle/extension/build/merge" /> <property name="jingle.extension.merge.lib.dir" value="${basedir}/jingle/extension/build/merge" />
<property name="jingle.extension.lib.dir" value="${basedir}/jingle/extension/build/lib" /> <property name="jingle.extension.lib.dir" value="${basedir}/jingle/extension/build/lib" />
<!-- Test props - override these defaults in the properties file or in command line --> <!-- Test props - override these defaults in the properties file or in command line -->
<property name="test.host" value="localhost" /> <property name="test.host" value="localhost" />
@ -109,9 +109,9 @@
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
</classpath> </classpath>
</javac> </javac>
<mkdir dir="${compile.dir}/jingle/extension" /> <mkdir dir="${compile.dir}/jingle/extension" />
<javac <javac
destdir="${compile.dir}/jingle/extension" destdir="${compile.dir}/jingle/extension"
includeAntRuntime="no" includeAntRuntime="no"
debug="on" debug="on"
@ -120,18 +120,18 @@
> >
<src path="${basedir}/jingle/extension/source" /> <src path="${basedir}/jingle/extension/source" />
<classpath> <classpath>
<fileset dir="${merge.lib.dir}"> <fileset dir="${merge.lib.dir}">
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
<fileset dir="${jingle.extension.lib.dir}"> <fileset dir="${jingle.extension.lib.dir}">
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
<fileset dir="${jingle.extension.merge.lib.dir}"> <fileset dir="${jingle.extension.merge.lib.dir}">
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
<pathelement path="${compile.dir}"/> <pathelement path="${compile.dir}"/>
</classpath> </classpath>
</javac> </javac>
</target> </target>
<!-- compile-test --> <!-- compile-test -->
@ -154,15 +154,15 @@
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
<fileset dir="${basedir}/build"> <fileset dir="${basedir}/build">
<include name="junit-4.10.jar"/> <include name="4.10.jar"/>
<include name="mockito-all-1.8.2.jar"/> <include name="mockito-all-1.8.2.jar"/>
<include name="powermock-mockito-1.3.5-full.jar"/> <include name="powermock-mockito-1.3.5-full.jar"/>
</fileset> </fileset>
<fileset dir ="${basedir}/build/build"> <fileset dir ="${basedir}/build/build">
<include name="xmlunit.jar"/> <include name="xmlunit.jar"/>
<include name="java-xmlbuilder-0.3.jar" /> <include name="java-xmlbuilder-0.3.jar" />
</fileset> </fileset>
<pathelement location="${compile.dir}" /> <pathelement location="${compile.dir}" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -176,8 +176,8 @@
includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml"> includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml">
<zipfileset src="${merge.lib.dir}/xpp.jar"/> <zipfileset src="${merge.lib.dir}/xpp.jar"/>
</jar> </jar>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${basedir}/build/build/biz.aQute.bnd.jar"/> <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${basedir}/build/build/biz.aQute.bnd.jar"/>
<bndwrap jars="${jar.dest.dir}/smack.jar" output="${jar.dest.dir}/smack.jar" /> <bndwrap jars="${jar.dest.dir}/smack.jar" output="${jar.dest.dir}/smack.jar" />
<jar file="${jar.dest.dir}/smack.jar" update="true"> <jar file="${jar.dest.dir}/smack.jar" update="true">
<manifest> <manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack" /> <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack" />
@ -193,7 +193,7 @@
</manifest> </manifest>
<zipfileset src="${merge.lib.dir}/jzlib.jar"/> <zipfileset src="${merge.lib.dir}/jzlib.jar"/>
</jar> </jar>
<bndwrap jars="${jar.dest.dir}/smackx.jar" output="${jar.dest.dir}/smackx.jar" /> <bndwrap jars="${jar.dest.dir}/smackx.jar" output="${jar.dest.dir}/smackx.jar" />
<jar file="${jar.dest.dir}/smackx.jar" update="true"> <jar file="${jar.dest.dir}/smackx.jar" update="true">
<manifest> <manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext" /> <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext" />
@ -211,13 +211,13 @@
<attribute name="Class-Path" value="smack.jar" /> <attribute name="Class-Path" value="smack.jar" />
</manifest> </manifest>
</jar> </jar>
<bndwrap jars="${jar.dest.dir}/smackx-debug.jar" output="${jar.dest.dir}/smackx-debug.jar" /> <bndwrap jars="${jar.dest.dir}/smackx-debug.jar" output="${jar.dest.dir}/smackx-debug.jar" />
<jar file="${jar.dest.dir}/smackx-debug.jar" update="true"> <jar file="${jar.dest.dir}/smackx-debug.jar" update="true">
<manifest> <manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-debug" /> <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-debug" />
</manifest> </manifest>
</jar> </jar>
<jar destfile="${jar.dest.dir}/smackx-jingle.jar" <jar destfile="${jar.dest.dir}/smackx-jingle.jar"
basedir="${compile.dir}/jingle/extension" basedir="${compile.dir}/jingle/extension"
includes="org/jivesoftware/smackx/**/*.class"> includes="org/jivesoftware/smackx/**/*.class">
<manifest> <manifest>
@ -225,7 +225,7 @@
</manifest> </manifest>
<zipfileset src="${jingle.extension.merge.lib.dir}/jstun.jar"/> <zipfileset src="${jingle.extension.merge.lib.dir}/jstun.jar"/>
</jar> </jar>
<bndwrap jars="${jar.dest.dir}/smackx-jingle.jar" output="${jar.dest.dir}/smackx-jingle.jar" /> <bndwrap jars="${jar.dest.dir}/smackx-jingle.jar" output="${jar.dest.dir}/smackx-jingle.jar" />
<jar file="${jar.dest.dir}/smackx-jingle.jar" update="true"> <jar file="${jar.dest.dir}/smackx-jingle.jar" update="true">
<manifest> <manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-jingle" /> <attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-jingle" />
@ -329,8 +329,8 @@
<include name="powermock-mockito-1.3.5-full.jar"/> <include name="powermock-mockito-1.3.5-full.jar"/>
</fileset> </fileset>
<fileset dir ="${basedir}/build/build"> <fileset dir ="${basedir}/build/build">
<include name="xmlunit.jar"/> <include name="xmlunit.jar"/>
<include name="java-xmlbuilder-0.3.jar" /> <include name="java-xmlbuilder-0.3.jar" />
</fileset> </fileset>
<fileset dir="${jar.dest.dir}"> <fileset dir="${jar.dest.dir}">
<include name="smack-test.jar"/> <include name="smack-test.jar"/>
@ -355,7 +355,6 @@
<!-- test-unit --> <!-- test-unit -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="test-unit" depends="compile, jar-test" unless="no.test"> <target name="test-unit" depends="compile, jar-test" unless="no.test">
<junit printsummary="on" <junit printsummary="on"
fork="true" fork="true"
haltonfailure="false" haltonfailure="false"
@ -372,8 +371,8 @@
<include name="powermock-mockito-1.3.5-full.jar"/> <include name="powermock-mockito-1.3.5-full.jar"/>
</fileset> </fileset>
<fileset dir ="${basedir}/build/build"> <fileset dir ="${basedir}/build/build">
<include name="xmlunit.jar"/> <include name="xmlunit.jar"/>
<include name="java-xmlbuilder-0.3.jar" /> <include name="java-xmlbuilder-0.3.jar" />
</fileset> </fileset>
<fileset dir="${jar.dest.dir}"> <fileset dir="${jar.dest.dir}">
<include name="smack-test.jar"/> <include name="smack-test.jar"/>
@ -417,26 +416,26 @@
<ant antfile="${basedir}/build/release.xml" /> <ant antfile="${basedir}/build/release.xml" />
</target> </target>
<!-- checkcode --> <!-- checkcode -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="checkcode" > <target name="checkcode" >
<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"> <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
<classpath> <classpath>
<pathelement location="${basedir}/build/pmd.jar" /> <pathelement location="${basedir}/build/pmd.jar" />
<pathelement location="${basedir}/build/asm.jar" /> <pathelement location="${basedir}/build/asm.jar" />
<pathelement location="${basedir}/build/jaxen.jar" /> <pathelement location="${basedir}/build/jaxen.jar" />
</classpath> </classpath>
</taskdef> </taskdef>
<pmd shortFilenames="true"> <pmd shortFilenames="true">
<ruleset>migrating</ruleset> <ruleset>migrating</ruleset>
<ruleset>finalizers</ruleset> <ruleset>finalizers</ruleset>
<formatter type="html" toFile="target/pmd_report.html" toConsole="true" /> <formatter type="html" toFile="target/pmd_report.html" toConsole="true" />
<fileset dir="source/"> <fileset dir="source/">
<include name="**/*.java" /> <include name="**/*.java" />
</fileset> </fileset>
</pmd> </pmd>
</target> </target>
<!-- release-exists --> <!-- release-exists -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="release-exists" > <target name="release-exists" >
@ -447,14 +446,14 @@
<!-- clean --> <!-- clean -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="clean" description="Deletes all generated content."> <target name="clean" description="Deletes all generated content.">
<delete dir="${javadoc.dest.dir}" /> <delete dir="${javadoc.dest.dir}" />
<delete dir="${compile.dir}" /> <delete dir="${compile.dir}" />
<delete dir="${compile.test.dir}" /> <delete dir="${compile.test.dir}" />
<delete file="${basedir}/smack.jar" /> <delete file="${basedir}/smack.jar" />
<delete file="${basedir}/smackx.jar" /> <delete file="${basedir}/smackx.jar" />
<delete file="${basedir}/smackx-debug.jar" /> <delete file="${basedir}/smackx-debug.jar" />
<delete file="${basedir}/smack-test.jar" /> <delete file="${basedir}/smack-test.jar" />
<delete file="${basedir}/smackx-jingle.jar" /> <delete file="${basedir}/smackx-jingle.jar" />
<delete dir="${basedir}/target" /> <delete dir="${basedir}/target" />
</target> </target>