From: Dominik Stadler <centic@apache.org>
Date: Mon, 7 Mar 2016 08:32:11 +0000 (+0000)
Subject: Fix source rebuilding verification after resulting binaries in dist-folder changed
X-Git-Tag: REL_3_15_BETA2~476
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ebac51fc6adb1c197f7164b71281ffa789888fa4;p=poi.git

Fix source rebuilding verification after resulting binaries in dist-folder changed

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1733878 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/integrationtest/build.xml b/src/integrationtest/build.xml
index 617056c9c5..0b37520985 100644
--- a/src/integrationtest/build.xml
+++ b/src/integrationtest/build.xml
@@ -92,17 +92,27 @@ under the License.
 			<sort>
 				<resources>
 					<fileset dir="${dist}">
-						<include name="poi-3.*.jar" />
-						<include name="poi-ooxml-3.*.jar" />
-						<include name="poi-ooxml-schemas-3.*.jar" />
-						<exclude name="*-javadocs-*" />
-						<exclude name="*-sources-*" />
+						<include name="**/poi-3.*.jar" />
+						<include name="**/poi-ooxml-3.*.jar" />
+                        <include name="**/poi-ooxml-schemas-3.*.jar" />
+                        <exclude name="**/*-javadoc*" />
+						<exclude name="**/*-sources*" />
 					</fileset>
 				</resources>
 			</sort>
         </pathconvert>
 
-        <echo message="Found jar packages at ${jarpackage}"/>
+		<fail message="Did not find jar packages looking in directory ${dist}">
+			<condition>
+				<or>
+					<equals arg1="${jarpackage}" arg2=""/>
+					<not>
+						<isset property="jarpackage"/>
+					</not>
+				</or>
+			</condition>
+		</fail>
+		<echo message="Found jar packages at ${jarpackage}, dist: ${dist}"/>
 
 		<path id="libs">
 			<fileset dir="../../lib">
@@ -119,7 +129,7 @@ under the License.
 		<javac srcdir="../examples/src" destdir="${build}"
 			target="1.6"
             source="1.6"
-            debug="trye"
+            debug="true"
             encoding="ASCII"
             fork="yes"
             includeantruntime="false"
@@ -133,22 +143,22 @@ under the License.
 			<sort>
 				<resources>
 					<fileset dir="${dist}">
-						<include name="poi-3.*.jar" />
-						<include name="poi-ooxml-3.*.jar" />
-						<include name="poi-ooxml-schemas-3.*.jar" />
-						<include name="poi-scratchpad-3.*.jar" />
-						<exclude name="*-javadocs-*" />
-						<exclude name="*-sources-*" />
+                        <include name="**/poi-3.*.jar" />
+                        <include name="**/poi-ooxml-3.*.jar" />
+                        <include name="**/poi-ooxml-schemas-3.*.jar" />
+                        <include name="**/poi-scratchpad-3.*.jar" />
+                        <exclude name="**/*-javadoc*" />
+                        <exclude name="**/*-sources*" />
 					</fileset>
 				</resources>
 			</sort>
         </pathconvert>
 
-		<echo message="Compiling all examples with the additinal scratchpad.jar" />
+		<echo message="Compiling all examples with the additional scratchpad.jar" />
 		<javac srcdir="../examples/src" destdir="${build}"
 			target="1.6"
             source="1.6"
-            debug="trye"
+            debug="true"
             encoding="ASCII"
             fork="yes"
             includeantruntime="false"