Refactor build.xml

This commit is contained in:
Ian Craggs 2014-04-04 23:39:38 +01:00
parent 8c628eef5b
commit 72fe69eaa3
1 changed files with 8 additions and 7 deletions

View File

@ -69,11 +69,10 @@
</target>
<target name="runAtest">
<echo message="LD_LIBRARY_PATH ${output.folder}/lib" />
<exec executable="./${aTest}" failonerror="true" dir="${output.folder}/test" >
<arg value="--connection" />
<arg value="tcp://${test.hostname}:${test.port}" />
<env key="LD_LIBRARY_PATH" path="${output.folder}/lib" />
<env key="LD_LIBRARY_PATH" path="${output.folder}" />
</exec>
</target>
@ -81,7 +80,7 @@
<exec executable="./${aTest}" failonerror="true" dir="${output.folder}/test" >
<arg value="--hostname" />
<arg value="${test.hostname}" />
<env key="LD_LIBRARY_PATH" path="${output.folder}/lib" />
<env key="LD_LIBRARY_PATH" path="${output.folder}" />
</exec>
</target>
@ -126,6 +125,11 @@
</then>
</if>
</then>
</if>
</target>
<target name="package">
<mkdir dir="${output.folder}/include"/>
<copy overwrite="true" todir="${output.folder}/include">
<fileset dir="src" includes="MQTTClient.h,MQTTAsync.h,MQTTClientPersistence.h"/>
@ -163,9 +167,6 @@
<arg value="lib"/>
<arg value="bin"/>
</exec>
</then>
</if>
</target>
<target name="copy">
@ -184,7 +185,7 @@
</if>
</target>
<target name="full" depends="init, version, build, test, doc, copy" />
<target name="full" depends="init, version, build, test, doc, package, copy" />
</project>