Return-Path: 
 <dev-return-61169-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 9124 invoked from network); 28 Oct 2004 12:41:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 28 Oct 2004 12:41:03 -0000
Received: (qmail 23397 invoked by uid 500); 28 Oct 2004 12:40:47 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 23321 invoked by uid 500); 28 Oct 2004 12:40:46 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 23282 invoked by uid 99); 28 Oct 2004 12:40:45 -0000
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received-SPF: pass (hermes.apache.org: local policy)
Received: from [62.96.16.111] (HELO bodewig.bost.de) (62.96.16.111)
  by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 28 Oct 2004 05:40:45 -0700
Received: (from bodewig@localhost)
	by bodewig.bost.de (8.11.6/8.11.6) id i9SCeeK19827;
	Thu, 28 Oct 2004 14:40:40 +0200
X-Authentication-Warning: bodewig.bost.de: bodewig set sender to
 bodewig@bost.de using -f
To: dev@ant.apache.org
Subject: <javac.preset>
X-Draft-From: ("nnfolder:mail.jakarta-ant" "")
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 28 Oct 2004 14:40:40 +0200
Message-ID: <m3mzy7vwvr.fsf@bodewig.bost.de>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) XEmacs/21.4 (Security Through
 Obscurity, linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Hi,

can anybody please refresh my memory why we are setting the source
attribute on javac only conditionally?

I've changed build.xml (see below) to always use the source attribute
and it compiles fine with JDK 1.2 to 1.5.

Stefan

Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.437
diff -u -r1.437 build.xml
--- build.xml	28 Oct 2004 09:38:24 -0000	1.437
+++ build.xml	28 Oct 2004 12:33:25 -0000
@@ -376,28 +376,6 @@
 
   <!--
        ===================================================================
-         Set up a preset def for javac depending on
-         the java version
-       ===================================================================
-  -->
-
-  <target name="javac.preset" depends="javac.preset.1.5+,javac.preset.1.5-"/>
-  <target name="javac.preset.1.5+" depends="check_for_optional_packages"
-          if="jdk1.5+">
-    <presetdef name="javac.preset">
-      <javac source="${javac.source}"/>
-    </presetdef>
-  </target>
-  <target name="javac.preset.1.5-" depends="check_for_optional_packages"
-          unless="jdk1.5+">
-    <presetdef name="javac.preset">
-      <javac/>
-    </presetdef>
-  </target>
-
-
-  <!--
-       ===================================================================
          Check to see what optional dependencies are available
        ===================================================================
   -->
@@ -642,17 +620,18 @@
        ===================================================================
   -->
   <target name="build"
-          depends="prepare, check_for_optional_packages, javac.preset"
+          depends="prepare, check_for_optional_packages"
           description="--> compiles the source code">
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.classes}"/>
     <mkdir dir="${build.lib}"/>
 
-    <javac.preset srcdir="${java.dir}"
+    <javac srcdir="${java.dir}"
            destdir="${build.classes}"
            debug="${debug}"
            deprecation="${deprecation}"
            target="${javac.target}"
+           source="${javac.source}"
            optimize="${optimize}" >
       <classpath refid="classpath"/>
 
@@ -701,7 +680,7 @@
           </or>
         </not>
       </selector>
-    </javac.preset>
+    </javac>
 
     <copy todir="${build.classes}">
       <fileset dir="${java.dir}">
@@ -1406,15 +1385,16 @@
   <target name="compile-tests" depends="build" if="junit.present">
     <mkdir dir="${build.tests}"/>
 
-    <javac.preset srcdir="${tests.dir}"
+    <javac srcdir="${tests.dir}"
            destdir="${build.tests}"
            debug="${debug}"
            target="${javac.target}"
+           source="${javac.source}"
            deprecation="${deprecation}" >
       <classpath refid="tests-classpath"/>
 
       <selector refid="conditional-patterns"/>
-    </javac.preset>
+    </javac>
 
     <!-- Used by AntlibTest.testAntlibResource: -->
     <jar jarfile="${build.tests}/org/apache/tools/ant/taskdefs/test2-antlib.jar">

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org