You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2008/06/12 05:39:13 UTC
svn commit: r666946 - in /cocoon/branches/BRANCH_2_1_X/tools/targets:
compile-build.xml init-build.xml
Author: joerg
Date: Wed Jun 11 20:39:13 2008
New Revision: 666946
URL: http://svn.apache.org/viewvc?rev=666946&view=rev
Log:
With minimum Java raised to 1.4.2 it is no longer necessary to have JDK-specific source directories.
Modified:
cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml?rev=666946&r1=666945&r2=666946&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml Wed Jun 11 20:39:13 2008
@@ -24,7 +24,7 @@
<!-- compilation parts used by all targets -->
<presetdef name="cocoon.javac">
- <javac
+ <javac
debug="${compiler.debug}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
@@ -38,7 +38,7 @@
<macrodef name="cocoon.compile">
<attribute name="destdir"/>
<attribute name="srcdir"/>
- <attribute name="classpathref" default="classpath"/>
+ <attribute name="classpathref" default="classpath"/>
<sequential>
<mkdir dir="@{destdir}"/>
<!-- copy those files that need to be in the classpath -->
@@ -66,9 +66,10 @@
<target name="compile-core" depends="compile-mocks, clover.on">
<cocoon.compile srcdir="${java}"
destdir="${build.dest}"/>
+ <!-- No JDK specific classes at the moment
<echo>Compiling jdk ${used.vm} core classes</echo>
<cocoon.compile srcdir="${jdk.java}"
- destdir="${build.dest}"/>
+ destdir="${build.dest}"/> -->
</target>
<!-- compiles deprecated code -->
@@ -158,7 +159,7 @@
<attribute name="name"/>
<attribute name="dir"/>
<attribute name="index" default="false"/>
- <attribute name="update" default="yes"/>
+ <attribute name="update" default="yes"/>
<sequential>
<jar jarfile="${build}/@{name}.jar" update="@{update}" index="@{index}">
<fileset dir="@{dir}">
@@ -167,7 +168,7 @@
</jar>
</sequential>
</macrodef>
-
+
<!-- optionally add source files to the core jar -->
<macrodef name="cocoon.package-sources">
<attribute name="name"/>
@@ -190,7 +191,7 @@
</if>
</sequential>
</macrodef>
-
+
<!-- packages everything -->
<target name="package"
depends="package-core, package-deprecated, package-testcase"/>
@@ -205,7 +206,7 @@
<cocoon.package-sources name="${name}"
dir="${java}"/>
-
+
</target>
<!-- package deprecated code -->
@@ -214,7 +215,7 @@
<jar jarfile="${build}/${name}-deprecated.jar" index="true">
<fileset dir="${build.deprecated}"/>
</jar>
-
+
<cocoon.package-sources name="${name}-deprecated"
dir="${deprecated.src}"/>
</target>
@@ -227,7 +228,7 @@
<exclude name="htmlunit/**"/>
</fileset>
</jar>
-
+
<cocoon.package-sources name="${name}-testcase"
dir="${test}"/>
</target>
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml?rev=666946&r1=666945&r2=666946&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Wed Jun 11 20:39:13 2008
@@ -36,18 +36,20 @@
<or>
<equals arg1="1.1" arg2="${ant.java.version}"/>
<equals arg1="1.2" arg2="${ant.java.version}"/>
+ <equals arg1="1.3" arg2="${ant.java.version}"/>
</or>
</not>
</condition>
- <fail unless="target.vm">Please use a JVM 1.3 or superior to compile cocoon ${version}</fail>
+ <fail unless="target.vm">Please use a JVM 1.4.2 or superior to compile cocoon ${version}</fail>
<condition property="used.vm" value="${target.vm}" else="1.4">
<or>
- <equals arg1="1.3" arg2="${target.vm}"/>
<equals arg1="1.4" arg2="${target.vm}"/>
</or>
</condition>
+ <!-- No JDK specific classes at the moment
<property name="jdk.java" value="${src}${file.separator}jdk${used.vm}${file.separator}java"/>
+ -->
<!-- The location of tools.jar, relative to the JAVA_HOME home. -->
<property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
Re: svn commit: r666946 - in /cocoon/branches/BRANCH_2_1_X/tools/targets:
compile-build.xml init-build.xml
Posted by Joerg Heinicke <jo...@gmx.de>.
That's why I just wrapped the stuff in comments rather than taking it
out completely :)
Joerg
On 12.06.2008 02:51, Ralph Goers wrote:
> Until we need to take advantage of some Java 1.5 feature ;-)
>
> joerg@apache.org wrote:
>> URL: http://svn.apache.org/viewvc?rev=666946&view=rev
>> Log:
>> With minimum Java raised to 1.4.2 it is no longer necessary to have
>> JDK-specific source directories.
Re: svn commit: r666946 - in /cocoon/branches/BRANCH_2_1_X/tools/targets:
compile-build.xml init-build.xml
Posted by Ralph Goers <Ra...@dslextreme.com>.
Until we need to take advantage of some Java 1.5 feature ;-)
joerg@apache.org wrote:
> URL: http://svn.apache.org/viewvc?rev=666946&view=rev
> Log:
> With minimum Java raised to 1.4.2 it is no longer necessary to have JDK-specific source directories.
>