Commit 7ab54a91 authored by Ian Craggs's avatar Ian Craggs

Omit SSL build

parent b7f00aa2
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<property name="libname.ssl" value="mqttv3cs" /> <property name="libname.ssl" value="mqttv3cs" />
<property name="libname.async" value="mqttv3a" /> <property name="libname.async" value="mqttv3a" />
<property name="libname.async.ssl" value="mqttv3as" /> <property name="libname.async.ssl" value="mqttv3as" />
<property name="ssl" value="no" />
<target name="init"> <target name="init">
<tstamp> <tstamp>
...@@ -61,6 +62,9 @@ ...@@ -61,6 +62,9 @@
<arg value="${output.filename}" /> <arg value="${output.filename}" />
</exec> </exec>
<if>
<equals arg1="${ssl}" arg2="yes" />
<then>
<!-- SSL, synchronous library --> <!-- SSL, synchronous library -->
<property name="output.ssl.filename" value="${output.folder}/lib${libname.ssl}.so" /> <property name="output.ssl.filename" value="${output.folder}/lib${libname.ssl}.so" />
<exec executable="gcc" failonerror="true"> <exec executable="gcc" failonerror="true">
...@@ -69,6 +73,7 @@ ...@@ -69,6 +73,7 @@
<exec executable="strip" failonerror="true"> <exec executable="strip" failonerror="true">
<arg value="${output.ssl.filename}" /> <arg value="${output.ssl.filename}" />
</exec> </exec>
</then>
<!-- non-SSL, asynchronous library --> <!-- non-SSL, asynchronous library -->
<property name="output.async.filename" value="${output.folder}/lib${libname.async}.so" /> <property name="output.async.filename" value="${output.folder}/lib${libname.async}.so" />
...@@ -79,6 +84,9 @@ ...@@ -79,6 +84,9 @@
<arg value="${output.async.filename}" /> <arg value="${output.async.filename}" />
</exec> </exec>
<if>
<equals arg1="${ssl}" arg2="yes" />
<then>
<!-- SSL, asynchronous library --> <!-- SSL, asynchronous library -->
<property name="output.async.ssl.filename" value="${output.folder}/lib${libname.async.ssl}.so" /> <property name="output.async.ssl.filename" value="${output.folder}/lib${libname.async.ssl}.so" />
<exec executable="gcc" failonerror="true"> <exec executable="gcc" failonerror="true">
...@@ -87,6 +95,7 @@ ...@@ -87,6 +95,7 @@
<exec executable="strip" failonerror="true"> <exec executable="strip" failonerror="true">
<arg value="${output.async.ssl.filename}" /> <arg value="${output.async.ssl.filename}" />
</exec> </exec>
</then>
<!-- MQTTVersion --> <!-- MQTTVersion -->
<property name="output.async.ssl.filename" value="${output.folder}/lib${libname.async.ssl}.so" /> <property name="output.async.ssl.filename" value="${output.folder}/lib${libname.async.ssl}.so" />
...@@ -108,8 +117,8 @@ ...@@ -108,8 +117,8 @@
</exec> --> </exec> -->
<!-- Build tests --> <!-- Build tests -->
<foreach target="onecompile" param="aFile" list="test1,test3"/> <foreach target="onecompile" param="aFile" list="test1"/>
<foreach target="asynccompile" param="aFile" list="test4,test5"/> <foreach target="asynccompile" param="aFile" list="test4"/>
</then> </then>
<elseif> <elseif>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment