svn commit: r1421944 - /incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml

[cf...@apache.org]

Author: cframpton
Date: Fri Dec 14 15:46:22 2012
New Revision: 1421944

URL: http://svn.apache.org/viewvc?rev=1421944&view=rev
Log:
For the compile target, set javac source and target options to 1.6.  This will allow us to use FlashBuilder 4.7 with the SDK when the compiler is built with Java 1.7 since FB supports Java 1.6 but not 1.7.  All the other compiler modules set these javac options to either 1.4 or 1.5. 

I chose 1.6 to avoid many warnings of this style:
warning: as of release 5, 'enum' is a keyword, and may not be used as an identifier

but this should be ok since we require a minimum of Java 1.6 according to our README.

Modified:
    incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml

Modified: incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml?rev=1421944&r1=1421943&r2=1421944&view=diff
==============================================================================
--- incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml (original)
+++ incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml Fri Dec 14 15:46:22 2012
@@ -97,7 +97,11 @@ To display the available targets type:
     <property name="debug"              value="off"/>
     <property name="optimize"           value="on"/>
     <property name="deprecation"        value="on"/>
-  
+
+    <!-- Added by Apache Flex -->  
+    <property name="javac.source" value="1.6"/>
+    <property name="javac.target" value="1.6"/>
+
     <property name="src"                value="sources"/>
     <property name="src-internal-codec" value="sources-internal-codec"/>
     <property name="resources"          value="resources"/>
@@ -230,8 +234,10 @@ To display the available targets type:
     <!-- Info ............................................................... -->
     <echo message=" == ${Project} ${completeVersion} build file ================================"/>
     <echo message=""/>
-    <echo message="    JAVA_HOME: ${env.JAVA_HOME}"/>
-    <echo message="    VM:        ${java.vm.version}, ${java.vm.vendor}"/>
+    <echo message="    JAVA_HOME:       ${env.JAVA_HOME}"/>
+    <echo message="    VM:              ${java.vm.version}, ${java.vm.vendor}"/>
+    <echo message="    javac.source:    ${javac.source}"/>
+    <echo message="    javac.target:    ${javac.target}"/>
 
     <property name="init.done" value="true"/>
   </target>
@@ -1009,7 +1015,10 @@ JAVA=/usr/bin/java
   </target>
 
   <target name="compile" depends="init, compile-prepare" unless="compile.done">
-    <javac destdir="${dest}" deprecation="${deprecation}" 
+    <javac destdir="${dest}" 
+           source="${javac.source}" 
+           target="${javac.target}" 
+           deprecation="${deprecation}" 
            debug="${debug}" optimize="${optimize}" encoding="UTF-8">
       <src path="${src}"/>
       <src path="${src-jdk}"/>