svn commit: r797940 - in /commons/proper/codec/trunk: build.xml default.properties

[se...@apache.org]

Author: sebb
Date: Sun Jul 26 14:32:18 2009
New Revision: 797940

URL: http://svn.apache.org/viewvc?rev=797940&view=rev
Log:
Add Java source and target settings to compilation and manifest

Modified:
    commons/proper/codec/trunk/build.xml
    commons/proper/codec/trunk/default.properties

Modified: commons/proper/codec/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/build.xml?rev=797940&r1=797939&r2=797940&view=diff
==============================================================================
--- commons/proper/codec/trunk/build.xml (original)
+++ commons/proper/codec/trunk/build.xml Sun Jul 26 14:32:18 2009
@@ -51,7 +51,9 @@
         <tstamp/>
     </target>
     <target name="compile" depends="static" description="Compile shareable components">
-        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
+        <javac srcdir="${source.home}" destdir="${build.home}/classes"
+            source="${compile.source}" target="${compile.target}"
+        	debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
             <classpath refid="compile.classpath"/>
         </javac>
         <copy todir="${build.home}/classes" filtering="on">
@@ -110,6 +112,8 @@
                 <attribute name="Implementation-Version" value="${component.version}"/> 
                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
                 <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            	<attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
+            	<attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
             </manifest>
         </jar>
     </target>
@@ -180,7 +184,9 @@
     </target>
     <!-- ========== Unit Test Targets ========================================= -->
     <target name="compile.tests" depends="compile" description="Compile unit test cases">
-        <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
+        <javac srcdir="${test.home}" destdir="${build.home}/tests"
+        	source="${compile.source}" target="${compile.target}"
+        	debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
             <classpath refid="test.classpath"/>
         </javac>
         <copy todir="${build.home}/tests" filtering="on">

Modified: commons/proper/codec/trunk/default.properties
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/default.properties?rev=797940&r1=797939&r2=797940&view=diff
==============================================================================
--- commons/proper/codec/trunk/default.properties (original)
+++ commons/proper/codec/trunk/default.properties Sun Jul 26 14:32:18 2009
@@ -62,6 +62,10 @@
 # Should Java compilations set the 'optimize' compiler option?
 compile.optimize = true
 
+# Java version settings
+compile.source = 1.4
+compile.target = 1.4
+
 # Should all tests fail if one does?
 test.failonerror = true