You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lenya.apache.org by Josias Thöny <jo...@wyona.com> on 2006/08/22 16:28:56 UTC
Re: svn commit: r433597 - in /lenya/trunk/src:
resources/build/modules2build.xsl targets/compile-build.xml
targets/docs-build.xml targets/properties-build.xml targets/test-build.xml
Hi Andreas,
> On Tue, 2006-08-22 at 11:19 +0000, andreas@apache.org wrote:
> Author: andreas
> Date: Tue Aug 22 04:19:29 2006
> New Revision: 433597
>
> URL: http://svn.apache.org/viewvc?rev=433597&view=rev
> Log:
> Added an entry in the build.properties file that allows setting the -source compiler option to either 1.4 or 1.5. This fixes bug #40280. Thanks to Paloma Gomez for the patch.
Is it now required to add the property "src.java.version" to
(local.)build.properties?
I'm asking because you didn't commit a change to build.properties.
Josias
> Modified:
> lenya/trunk/src/resources/build/modules2build.xsl
> lenya/trunk/src/targets/compile-build.xml
> lenya/trunk/src/targets/docs-build.xml
> lenya/trunk/src/targets/properties-build.xml
> lenya/trunk/src/targets/test-build.xml
>
> Modified: lenya/trunk/src/resources/build/modules2build.xsl
> URL: http://svn.apache.org/viewvc/lenya/trunk/src/resources/build/modules2build.xsl?rev=433597&r1=433596&r2=433597&view=diff
> ==============================================================================
> --- lenya/trunk/src/resources/build/modules2build.xsl (original)
> +++ lenya/trunk/src/resources/build/modules2build.xsl Tue Aug 22 04:19:29 2006
> @@ -159,7 +159,7 @@
> deprecation="${{deprecation}}"
> target="${{target.vm}}"
> nowarn="${{nowarn}}"
> - source="1.4">
> + source="${{src.java.version}}">
> <src path="{$src}/java/src"/>
> <classpath refid="module.classpath.{$id}"/>
> </javac>
> @@ -282,7 +282,7 @@
> deprecation="${{deprecation}}"
> target="${{target.vm}}"
> nowarn="${{nowarn}}"
> - source="1.4">
> + source="${{java.version}}">
> <src path="{$src}/java/test"/>
> <classpath refid="module.test-classpath.{$id}"/>
> </javac>
> @@ -323,4 +323,4 @@
> </xsl:template>
>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
> Modified: lenya/trunk/src/targets/compile-build.xml
> URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/compile-build.xml?rev=433597&r1=433596&r2=433597&view=diff
> ==============================================================================
> --- lenya/trunk/src/targets/compile-build.xml (original)
> +++ lenya/trunk/src/targets/compile-build.xml Tue Aug 22 04:19:29 2006
> @@ -55,7 +55,7 @@
> deprecation="${deprecation}"
> target="${target.vm}"
> nowarn="${nowarn}"
> - source="1.4">
> + source="${src.java.version}">
> <src path="${compile.src.dir}"/>
> <classpath refid="${compile.classpath}"/>
> </javac>
>
> Modified: lenya/trunk/src/targets/docs-build.xml
> URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/docs-build.xml?rev=433597&r1=433596&r2=433597&view=diff
> ==============================================================================
> --- lenya/trunk/src/targets/docs-build.xml (original)
> +++ lenya/trunk/src/targets/docs-build.xml Tue Aug 22 04:19:29 2006
> @@ -53,7 +53,7 @@
> doctitle="${Name}"
> bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."
> stylesheetfile="${src.resource.dir}/javadoc.css"
> - source="1.4">
> + source="${src.java.version}">
> <!-- sources -->
> <sourcepath>
> <pathelement path="${src.java.api.dir}"/>
>
> Modified: lenya/trunk/src/targets/properties-build.xml
> URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/properties-build.xml?rev=433597&r1=433596&r2=433597&view=diff
> ==============================================================================
> --- lenya/trunk/src/targets/properties-build.xml (original)
> +++ lenya/trunk/src/targets/properties-build.xml Tue Aug 22 04:19:29 2006
> @@ -32,7 +32,7 @@
> <property file="build.properties"/>
>
> <condition property="local.properties.in.sync">
> - <equals arg1="${build.properties.version}" arg2="416750"/>
> + <equals arg1="${build.properties.version}" arg2="433561"/>
> </condition>
>
> <fail unless="local.properties.in.sync" message="It seems that your local.build.properties is NOT in sync with build.properties! The file build.properties has probably been modified by some Apache Lenya developer. Re-copy build.properties to local.build.properties and re-set your local properties to get the two files back in sync. Please apologize any inconvenience."/>
>
> Modified: lenya/trunk/src/targets/test-build.xml
> URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/test-build.xml?rev=433597&r1=433596&r2=433597&view=diff
> ==============================================================================
> --- lenya/trunk/src/targets/test-build.xml (original)
> +++ lenya/trunk/src/targets/test-build.xml Tue Aug 22 04:19:29 2006
> @@ -94,7 +94,7 @@
> deprecation="{deprecation}"
> target="${target.vm}"
> fork="true"
> - source="1.4">
> + source="${src.java.version}">
> <classpath refid="classpath.test"/>
> </javac>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
> For additional commands, e-mail: commits-help@lenya.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r433597 - in /lenya/trunk/src: resources/build/modules2build.xsl
targets/compile-build.xml targets/docs-build.xml targets/properties-build.xml
targets/test-build.xml
Posted by Andreas Hartmann <an...@apache.org>.
Josias Thöny wrote:
> Hi Andreas,
>
>> On Tue, 2006-08-22 at 11:19 +0000, andreas@apache.org wrote:
>> Author: andreas
>> Date: Tue Aug 22 04:19:29 2006
>> New Revision: 433597
>>
>> URL: http://svn.apache.org/viewvc?rev=433597&view=rev
>> Log:
>> Added an entry in the build.properties file that allows setting the -source compiler option to either 1.4 or 1.5. This fixes bug #40280. Thanks to Paloma Gomez for the patch.
>
> Is it now required to add the property "src.java.version" to
> (local.)build.properties?
> I'm asking because you didn't commit a change to build.properties.
Sorry, I forgot to commit the file. Thanks for the pointer!
-- Andreas
--
Andreas Hartmann
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
andreas.hartmann@wyona.com andreas@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org