From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <kawa-return-6135-listarch-kawa=sources.redhat.com@sourceware.org>
Received: (qmail 61702 invoked by alias); 20 Jul 2016 17:18:07 -0000
Mailing-List: contact kawa-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <kawa.sourceware.org>
List-Subscribe: <mailto:kawa-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/kawa/>
List-Post: <mailto:kawa@sourceware.org>
List-Help: <mailto:kawa-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: kawa-owner@sourceware.org
Received: (qmail 59894 invoked by uid 89); 20 Jul 2016 17:18:05 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=0.1 required=5.0 tests=AWL,BAYES_50,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=HTo:U*kawa, H*Ad:U*kawa, H*r:sk:kawa@so, H*c:MHil
X-HELO: mail.theptrgroup.com
Received: from mail.theptrgroup.com (HELO mail.theptrgroup.com) (71.178.251.9) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 20 Jul 2016 17:17:55 +0000
Received: from [10.11.21.62] (unknown [10.11.21.62])	by mail.theptrgroup.com (Postfix) with ESMTPS id B10EA40613	for <kawa@sourceware.org>; Wed, 20 Jul 2016 13:15:45 -0400 (EDT)
From: Jamison Hope <jrh@theptrgroup.com>
Content-Type: multipart/mixed; boundary="Apple-Mail=_3C5598A3-8A7A-4A2A-B9A2-8C442A38FDFD"
Subject: build.xml patch for building under RHEL6
Message-Id: <5DF8F292-6E3C-4A18-BBCC-5F5C77FB5517@theptrgroup.com>
Date: Wed, 20 Jul 2016 17:18:00 -0000
To: kawa list <kawa@sourceware.org>
Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\))
X-IsSubscribed: yes
X-SW-Source: 2016-q3/txt/msg00001.txt.bz2


--Apple-Mail=_3C5598A3-8A7A-4A2A-B9A2-8C442A38FDFD
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii
Content-length: 484

It would appear that <echo file="a/b/c"> isn't guaranteed to work if the
subdirectories "a" and "a/b" don't exist yet.  In particular, when Kawa
is checked out under RHEL 6, building via Ant 1.7.1 and Java 1.6.0_24
(ugh, don't ask) fails with a FileNotFoundException attempting to open
META-INF/services/javax.script.ScriptEngineFactory.

The fix is to <mkdir dir="META-INF/services"/> before the <echo>, as
in the attached patch.

--
Jamison Hope
The PTR Group
www.theptrgroup.com



--Apple-Mail=_3C5598A3-8A7A-4A2A-B9A2-8C442A38FDFD
Content-Disposition: attachment;
	filename=build-xml-j6.patch
Content-Type: application/octet-stream;
	name="build-xml-j6.patch"
Content-Transfer-Encoding: 7bit
Content-length: 1261

Index: build.xml
===================================================================
--- build.xml	(revision 8883)
+++ build.xml	(working copy)
@@ -855,11 +855,13 @@
   </target>
 
   <target name="script-factory-scheme" if="${-needs-scripting-inf}">
+    <mkdir dir="META-INF/services"/>
     <echo message="kawa.standard.SchemeScriptEngineFactory #Scheme&#xA;"
           append="true"
           file="META-INF/services/javax.script.ScriptEngineFactory"/>
   </target>
   <target name="script-factory-xquery" if="${-needs-scripting-inf-xquery}">
+    <mkdir dir="META-INF/services"/>
     <echo message="gnu.xquery.lang.XQueryScriptEngineFactory #XQuery&#xA;"
           append="true"
           file="META-INF/services/javax.script.ScriptEngineFactory"/>
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 8883)
+++ ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2016-07-20  Jamison Hope  <jrh@theptrgroup.com>
+
+	* build.xml (script-factory-scheme, script-factory-xquery): Make
+	sure META-INF/services directory exists before writing to
+	META-INF/services/javax.script.ScriptEngineFactory file.
+
 2016-07-13  Per Bothner  <per@bothner.com>
 
 	Replace use of JFreeSVG with VectorGraphics2D library.

--Apple-Mail=_3C5598A3-8A7A-4A2A-B9A2-8C442A38FDFD--