mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-23 06:42:05 +01:00
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
flow
parent
767d93894e
commit
5b7b13c43f
1 changed files with 46 additions and 47 deletions
|
|
@ -28,7 +28,7 @@
|
|||
<property name="version.major" value="3" />
|
||||
<property name="version.minor" value="3" />
|
||||
<property name="version.revision" value="0" />
|
||||
<property name="version.extra" value="SNAPSHOT" />
|
||||
<property name="version.extra" value="SNAPSHOT" />
|
||||
|
||||
<if>
|
||||
<equals arg1="${version.extra}" arg2=""/>
|
||||
|
|
@ -58,8 +58,8 @@
|
|||
<property name="test.dir" value="${basedir}/test" />
|
||||
<property name="test-unit.dir" value="${basedir}/test-unit" />
|
||||
<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.lib.dir" value="${basedir}/jingle/extension/build/lib" />
|
||||
<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" />
|
||||
|
||||
<!-- Test props - override these defaults in the properties file or in command line -->
|
||||
<property name="test.host" value="localhost" />
|
||||
|
|
@ -109,9 +109,9 @@
|
|||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
</classpath>
|
||||
</javac>
|
||||
<mkdir dir="${compile.dir}/jingle/extension" />
|
||||
<javac
|
||||
</javac>
|
||||
<mkdir dir="${compile.dir}/jingle/extension" />
|
||||
<javac
|
||||
destdir="${compile.dir}/jingle/extension"
|
||||
includeAntRuntime="no"
|
||||
debug="on"
|
||||
|
|
@ -120,18 +120,18 @@
|
|||
>
|
||||
<src path="${basedir}/jingle/extension/source" />
|
||||
<classpath>
|
||||
<fileset dir="${merge.lib.dir}">
|
||||
<fileset dir="${merge.lib.dir}">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
<fileset dir="${jingle.extension.lib.dir}">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
<fileset dir="${jingle.extension.merge.lib.dir}">
|
||||
<fileset dir="${jingle.extension.merge.lib.dir}">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
<pathelement path="${compile.dir}"/>
|
||||
<pathelement path="${compile.dir}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- compile-test -->
|
||||
|
|
@ -154,15 +154,15 @@
|
|||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
<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="powermock-mockito-1.3.5-full.jar"/>
|
||||
</fileset>
|
||||
<fileset dir ="${basedir}/build/build">
|
||||
<include name="xmlunit.jar"/>
|
||||
<include name="java-xmlbuilder-0.3.jar" />
|
||||
<include name="xmlunit.jar"/>
|
||||
<include name="java-xmlbuilder-0.3.jar" />
|
||||
</fileset>
|
||||
<pathelement location="${compile.dir}" />
|
||||
<pathelement location="${compile.dir}" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
|
@ -176,8 +176,8 @@
|
|||
includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml">
|
||||
<zipfileset src="${merge.lib.dir}/xpp.jar"/>
|
||||
</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" />
|
||||
<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" />
|
||||
<jar file="${jar.dest.dir}/smack.jar" update="true">
|
||||
<manifest>
|
||||
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack" />
|
||||
|
|
@ -193,7 +193,7 @@
|
|||
</manifest>
|
||||
<zipfileset src="${merge.lib.dir}/jzlib.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">
|
||||
<manifest>
|
||||
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext" />
|
||||
|
|
@ -211,13 +211,13 @@
|
|||
<attribute name="Class-Path" value="smack.jar" />
|
||||
</manifest>
|
||||
</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">
|
||||
<manifest>
|
||||
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-debug" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<jar destfile="${jar.dest.dir}/smackx-jingle.jar"
|
||||
<jar destfile="${jar.dest.dir}/smackx-jingle.jar"
|
||||
basedir="${compile.dir}/jingle/extension"
|
||||
includes="org/jivesoftware/smackx/**/*.class">
|
||||
<manifest>
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
</manifest>
|
||||
<zipfileset src="${jingle.extension.merge.lib.dir}/jstun.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">
|
||||
<manifest>
|
||||
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-jingle" />
|
||||
|
|
@ -329,8 +329,8 @@
|
|||
<include name="powermock-mockito-1.3.5-full.jar"/>
|
||||
</fileset>
|
||||
<fileset dir ="${basedir}/build/build">
|
||||
<include name="xmlunit.jar"/>
|
||||
<include name="java-xmlbuilder-0.3.jar" />
|
||||
<include name="xmlunit.jar"/>
|
||||
<include name="java-xmlbuilder-0.3.jar" />
|
||||
</fileset>
|
||||
<fileset dir="${jar.dest.dir}">
|
||||
<include name="smack-test.jar"/>
|
||||
|
|
@ -355,7 +355,6 @@
|
|||
<!-- test-unit -->
|
||||
<!-- ======================================================================================= -->
|
||||
<target name="test-unit" depends="compile, jar-test" unless="no.test">
|
||||
|
||||
<junit printsummary="on"
|
||||
fork="true"
|
||||
haltonfailure="false"
|
||||
|
|
@ -372,8 +371,8 @@
|
|||
<include name="powermock-mockito-1.3.5-full.jar"/>
|
||||
</fileset>
|
||||
<fileset dir ="${basedir}/build/build">
|
||||
<include name="xmlunit.jar"/>
|
||||
<include name="java-xmlbuilder-0.3.jar" />
|
||||
<include name="xmlunit.jar"/>
|
||||
<include name="java-xmlbuilder-0.3.jar" />
|
||||
</fileset>
|
||||
<fileset dir="${jar.dest.dir}">
|
||||
<include name="smack-test.jar"/>
|
||||
|
|
@ -417,26 +416,26 @@
|
|||
<ant antfile="${basedir}/build/release.xml" />
|
||||
</target>
|
||||
|
||||
<!-- checkcode -->
|
||||
<!-- ======================================================================================= -->
|
||||
<target name="checkcode" >
|
||||
<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
|
||||
<classpath>
|
||||
<pathelement location="${basedir}/build/pmd.jar" />
|
||||
<pathelement location="${basedir}/build/asm.jar" />
|
||||
<pathelement location="${basedir}/build/jaxen.jar" />
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<pmd shortFilenames="true">
|
||||
<ruleset>migrating</ruleset>
|
||||
<ruleset>finalizers</ruleset>
|
||||
<formatter type="html" toFile="target/pmd_report.html" toConsole="true" />
|
||||
<fileset dir="source/">
|
||||
<include name="**/*.java" />
|
||||
</fileset>
|
||||
</pmd>
|
||||
</target>
|
||||
|
||||
<!-- checkcode -->
|
||||
<!-- ======================================================================================= -->
|
||||
<target name="checkcode" >
|
||||
<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
|
||||
<classpath>
|
||||
<pathelement location="${basedir}/build/pmd.jar" />
|
||||
<pathelement location="${basedir}/build/asm.jar" />
|
||||
<pathelement location="${basedir}/build/jaxen.jar" />
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<pmd shortFilenames="true">
|
||||
<ruleset>migrating</ruleset>
|
||||
<ruleset>finalizers</ruleset>
|
||||
<formatter type="html" toFile="target/pmd_report.html" toConsole="true" />
|
||||
<fileset dir="source/">
|
||||
<include name="**/*.java" />
|
||||
</fileset>
|
||||
</pmd>
|
||||
</target>
|
||||
|
||||
<!-- release-exists -->
|
||||
<!-- ======================================================================================= -->
|
||||
<target name="release-exists" >
|
||||
|
|
@ -447,14 +446,14 @@
|
|||
<!-- clean -->
|
||||
<!-- ======================================================================================= -->
|
||||
<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.test.dir}" />
|
||||
<delete file="${basedir}/smack.jar" />
|
||||
<delete file="${basedir}/smackx.jar" />
|
||||
<delete file="${basedir}/smackx-debug.jar" />
|
||||
<delete file="${basedir}/smack-test.jar" />
|
||||
<delete file="${basedir}/smackx-jingle.jar" />
|
||||
<delete file="${basedir}/smackx-jingle.jar" />
|
||||
<delete dir="${basedir}/target" />
|
||||
</target>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue