fix for 2.3.4 and missing nosql
diff --git a/antbuild.xml b/antbuild.xml
index e37d576..aa37446 100644
--- a/antbuild.xml
+++ b/antbuild.xml
@@ -105,7 +105,14 @@
<condition property="nosql.install.file" value="${installer.dir}/${date}/${nosql.install.zip}">
<available file="${installer.dir}/${date}/${nosql.install.zip}"/>
</condition>
- <fail message="Invalid '-Ddate=' or '-Dhash'. Cannot find '${nosql.install.zip}'." unless="nosql.install.file"/>
+ <condition property="nosql.missing">
+ <and>
+ <not> <equals arg1="${version}" arg2="2.3.4"/> </not>
+ <not> <isset property="nosql.install.file"/> </not>
+ </and>
+ </condition>
+
+ <fail message="Invalid '-Ddate=' or '-Dhash'. Cannot find '${nosql.install.zip}'." unless="nosql.missing"/>
<!-- assumes will be doing full p2 setup therefore probably from nightly loc -->
<condition property="p2.archive.zip" value="${installer.dir}/${date}/${p2.archive.presigned.zip}"
else="${installer.dir}/${date}/${p2.archive.signed.zip}">
@@ -151,7 +158,7 @@
<echo message="category.qualifier ='${category.qualifier}'"/>
<echo message=" ---"/>
<echo message="bundle.install.file ='${bundle.install.file}'"/>
- <echo message="nosql.install.file ='${nosql.install.file}'"/>
+ <echo message="nosql.install.file ='${nosql.install.file}'"/>
<echo message="p2.archive.zip ='${p2.archive.zip}'"/>
<echo message=" ---"/>
<echo message="p2.SDK.install.dir ='${p2.SDK.install.dir}'"/>
@@ -175,7 +182,7 @@
<!-- Test for needed resources -->
<available file="${bundle.install.file}" property="bundle.installer.exist"/>
- <available file="${nosql.install.file}" property="nosql.installer.exist"/>
+ <available file="${nosql.install.file}" property="nosql.installer.exist"/>
<available file="${p2.SDK.plugin.dir}" property="sdk.install.exist"/>
<available file="${regen.composite.script}" property="regen.script.exist"/>
@@ -193,7 +200,7 @@
<and>
<isset property="signing.archive.exist"/>
<isset property="bundle.installer.exist"/>
- <isset property="nosql.installer.exist"/>
+ <not> <isset property="nosql.missing"/> </not>
</and>
</condition>
</target>
@@ -217,7 +224,7 @@
<include name="**/*.jar"/>
</patternset>
</unzip>
- <unzip dest="${p2.bundle.dir}" src="${nosql.install.file}">
+ <unzip dest="${p2.bundle.dir}" src="${nosql.install.file}" failonerror="false">
<patternset>
<include name="**/*.jar"/>
</patternset>
