Changeset 35695 for gs3-extensions

Timestamp:

2021-10-24T16:59:13+13:00 (2 years ago)

Author:

davidb

Message:

Changes to fit in with Release Kit settting JAVACFLAGS

File:

• gs3-extensions/solr/trunk/src/build.xml (modified) (3 diffs)

gs3-extensions/solr/trunk/src/build.xml

@@ -2 +2 @@
 <project name="gs3-solr-ext" default="usage" basedir=".">
 
+  <property environment="env"/>
+  
   <!-- DIRECTORY LOCATIONS -->
   <!-- local ext paths -->
@@ -36 +38 @@
   <property name="tomcat.lib.dir" value="${tomcat.dir}/lib"/>
   <property name="tomcat.context.dir" value="${tomcat.dir}/conf/Catalina/localhost"/>
-    
+
+  <condition property="compile.javac.flags" value="${env.JAVACFLAGS}" else="-source 1.6 -target 1.6">
+    <isset property="env.JAVACFLAGS"/>
+  </condition>
         
   <path id="compile.classpath">
@@ -142 +147 @@
     <mkdir dir="${build.home}"/>
     <javac srcdir="${src.home}" destdir="${build.home}" debug="true"
-       includeantruntime="false"
-           source="1.6" target="1.6">
+       includeantruntime="false">
+      <compilerarg line="${compile.javac.flags}"/>
       <classpath>
     <path refid="compile.classpath"/>