Nachziehen r1696 aus release 2.0: Build System erweitert um Parameter für Zielversion (ticket 1260): compile.target=1.x in die Datei local.build.properties eintragen.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1698 8810af33-2d31-482b-a856-94f89814c4df

tools-ng/common/xsl/build-template.xsl

@@ -164,6 +164,8 @@
     <property value="off" name="compile.deprecation"/>
     <property value="off" name="compile.verbose"/>
     <property value="off" name="compile.nowarn"/>
+    <!-- By default build target for the JVM version used by the actual build system -->
+    <property value="${{ant.java.version}}" name="compile.target"/>
 
     <property value="rulesets/design.xml,rulesets/imports.xml"
                name="pmd.rulesets"/>
@@ -557,6 +559,8 @@
         <!-- Usually true by default setting, main work is done here! -->
         <xsl:if test="$hassrcdir">
           <mkdir dir="{$name}/${{build.src.dir}}"/>
+          <echo message="Build system version: ${{ant.java.version}} " />
+          <echo message="Compile target version: ${{compile.target}} " />
           <xsl:if test="$jdodirs">
             <if>
               <not>
@@ -2230,6 +2234,7 @@
       deprecation="${{compile.deprecation}}"
       verbose="${{compile.verbose}}"
       nowarn="${{compile.nowarn}}"
+      target="${{compile.target}}"
       destdir="{$destdir}"
       classpathref="{$classpathref}">
       <src refid="{$srcpathref}"/>

tools-ng/ecdc/conf/build.properties

@@ -43,6 +43,10 @@ compile.deprecation=off
 compile.verbose=off
 compile.nowarn=on
 
+# Optionally specifiy version of target JVM.
+# By default the version of the build system is determined and used as target.
+#compile.target=1.6
+
 # These properties are specific to Jikes
 build.compiler.emacs=off
 build.compiler.pedantic=off

tools-ng/ecdc/local.build.properties

@@ -28,8 +28,6 @@
 
 # Set to Eclipse JDT batch compiler (requires ecj.jar) 
 #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter 
-#ant.build.javac.source=1.6 
-#ant.build.javac.target=1.6 
 
 # These properties apply to Javac and Jikes
 #compile.debug=on
@@ -38,6 +36,10 @@
 #compile.verbose=off
 #compile.nowarn=on
 
+# Optionally specifiy version of target JVM.
+# By default the version of the build system is determined and used as target.
+#compile.target=1.6
+
 # These properties are specific to Jikes
 #build.compiler.emacs=off
 #build.compiler.pedantic=off