[PATCH] build.xml fix for ScriptEngineFactory classes

[Jamison Hope <jrh@theptrgroup.com>]

[-- Attachment #1: Type: text/plain, Size: 660 bytes --]

It would appear that since -select-java-non-android is invoked via
antcall, which acts like a sub-shell, definitions within that target do
not persist.  So then when these properties are referenced in other
targets, the Wrong Thing happens.  In particular, the Java 6
ScriptEngineFactory classes are not built in the java-classes and
xml-classes targets because the definition of has-java6 has gone out of
scope.

The attached patch moves the definitions of the has-java{2,4,5,6,7,8}
properties out of the -select-java-non-android target up to top-level.

Unrelatedly, it adds gnu/q2/lang/ to java-classes.

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



[-- Attachment #2: build-xml.patch --]
[-- Type: application/octet-stream, Size: 2309 bytes --]

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 8470)
+++ ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2015-05-19  Jamison Hope  <jrh@theptrgroup.com>
+
+	* build.xml (has-java{2,4,5,6,7,8}): Move out of
+	-select-java-non-android up to top level so that they are defined
+	in the initial Ant environment.
+	(java-classes): Add q2.
+
 2015-05-13  Per Bothner  <per@bothner.com>
 
 	* compile: New file, from gnulib, used by autoconf.
Index: build.xml
===================================================================
--- build.xml	(revision 8470)
+++ build.xml	(working copy)
@@ -286,7 +286,14 @@
     -->
 
   </target>
-  
+
+  <available property="has-java2" classname="java.lang.ThreadLocal"/>
+  <available property="has-java4" classname="java.lang.CharSequence"/>
+  <available property="has-java5" classname="java.lang.Appendable"/>
+  <available property="has-java6" classname="javax.script.AbstractScriptEngine"/>
+  <available property="has-java7" classname="java.lang.invoke.MethodHandle"/>
+  <available property="has-java8" classname="java.util.stream.Stream"/>
+
   <target name="select-java1" depends="build-settings">
     <pathconvert property="fileList" pathSep=" " dirSep="${file.separator}">
       <path><fileset refid="build.selectjava"/></path>
@@ -406,12 +413,6 @@
   </target>
 
   <target name="-select-java-non-android" unless="${enable-android}">
-    <available property="has-java2" classname="java.lang.ThreadLocal"/>
-    <available property="has-java4" classname="java.lang.CharSequence"/>
-    <available property="has-java5" classname="java.lang.Appendable"/>
-    <available property="has-java6" classname="javax.script.AbstractScriptEngine"/>
-    <available property="has-java7" classname="java.lang.invoke.MethodHandle"/>
-    <available property="has-java8" classname="java.util.stream.Stream"/>
     <antcall target="-maybe-select-java1"/>
     <antcall target="-maybe-select-java2"/>
     <antcall target="-maybe-select-java4"/>
@@ -512,6 +513,7 @@
       <include name="gnu/lists/"/>
       <include name="gnu/mapping/"/>
       <include name="gnu/math/"/>
+      <include name="gnu/q2/lang/"/>
       <include name="gnu/text/"/>
       <include name="kawa/lang/"/>
       <include name="kawa/standard/"/>