Return-Path: 
 <commits-return-7574-apmail-poi-commits-archive=poi.apache.org@poi.apache.org>
X-Original-To: apmail-poi-commits-archive@minotaur.apache.org
Delivered-To: apmail-poi-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BFE9318B04
	for <apmail-poi-commits-archive@minotaur.apache.org>;
 Mon,  7 Mar 2016 08:32:14 +0000 (UTC)
Received: (qmail 66523 invoked by uid 500); 7 Mar 2016 08:32:14 -0000
Delivered-To: apmail-poi-commits-archive@poi.apache.org
Received: (qmail 66486 invoked by uid 500); 7 Mar 2016 08:32:14 -0000
Mailing-List: contact commits-help@poi.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@poi.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@poi.apache.org>
List-Post: <mailto:commits@poi.apache.org>
List-Id: <commits.poi.apache.org>
Reply-To: dev@poi.apache.org
Delivered-To: mailing list commits@poi.apache.org
Received: (qmail 66474 invoked by uid 99); 7 Mar 2016 08:32:14 -0000
Received: from pnap-us-west-generic-nat.apache.org (HELO
 spamd3-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Mar 2016 08:32:14 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org)
 with ESMTP id CACB218009C
	for <commits@poi.apache.org>; Mon,  7 Mar 2016 08:32:13 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 0.671
X-Spam-Level: 
X-Spam-Status: No, score=0.671 tagged_above=-999 required=6.31
	tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329]
	autolearn=disabled
Received: from mx1-lw-us.apache.org ([10.40.0.8])
	by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new,
 port 10024)
	with ESMTP id Hns_gZVwT4Nm for <commits@poi.apache.org>;
	Mon,  7 Mar 2016 08:32:12 +0000 (UTC)
Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org
 [209.188.14.139])
	by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP
 id 8433B5FB1B
	for <commits@poi.apache.org>; Mon,  7 Mar 2016 08:32:12 +0000 (UTC)
Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6])
	by mailrelay1-us-west.apache.org (ASF Mail Server at
 mailrelay1-us-west.apache.org) with ESMTP id D3C55E056F
	for <commits@poi.apache.org>; Mon,  7 Mar 2016 08:32:11 +0000 (UTC)
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org)
 with ESMTP id D0F4C3A05EF
	for <commits@poi.apache.org>; Mon,  7 Mar 2016 08:32:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1733878 - /poi/trunk/src/integrationtest/build.xml
Date: Mon, 07 Mar 2016 08:32:11 -0000
To: commits@poi.apache.org
From: centic@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20160307083211.D0F4C3A05EF@svn01-us-west.apache.org>

Author: centic
Date: Mon Mar  7 08:32:11 2016
New Revision: 1733878

URL: http://svn.apache.org/viewvc?rev=1733878&view=rev
Log:
Fix source rebuilding verification after resulting binaries in dist-folder changed

Modified:
    poi/trunk/src/integrationtest/build.xml

Modified: poi/trunk/src/integrationtest/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/build.xml?rev=1733878&r1=1733877&r2=1733878&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/build.xml (original)
+++ poi/trunk/src/integrationtest/build.xml Mon Mar  7 08:32:11 2016
@@ -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"



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org