Here's a proposed addition to your diff. Approved with this change.
@@ -409,8 +412,7 @@
</target>
<!--=============== Target [js2doctest] =================-->
- <target name="js2doctest" depends="build,js2docrng"
- if="megatest.do">
+ <target name="js2doctest" depends="build,js2docrng">
<!-- first unit/integration tests -->
<junit haltonfailure="true" printsummary="withOutAndErr"
showoutput="true" fork="yes">
<formatter type="plain" usefile="false"/>
@@ -462,7 +464,7 @@
<!--=============== Target [test] ====================-->
<!-- build and run the tests -->
<!-- XXX For now, we only have minimal things here -->
- <target name="test" depends="build,js2doctest"
+ <target name="test" depends="build"
description="Run tests" if="megatest.do">
<junit haltonfailure="true" printsummary="withOutAndErr"
showoutput="true" fork="yes">
<formatter type="plain" usefile="false"/>
On Nov 18, 2006, at 9:38 PM, Jim Grandy wrote:
Argh, sorry. I'll come back with a better patch shortly -- I think
this will still fail if megatest runs.
jim
On Nov 17, 2006, at 6:22 PM, Benjamin Shine wrote:
Change 20061117-ben-5 by [EMAIL PROTECTED]
on 2006-11-17 18:16:23 PST
in /home/ben/src/svn/openlaszlo/branches/legals
Summary:
New Features:
Bugs Fixed:
Technical Reviewer: jgrandy (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
The js2doc tools require Java 1.5 for a few methods in
org.w3c.dom.Document
Open Laszlo is supposed to build correctly in Java 1.4. So, for
now, we should
not try to compile the js2doc tools in the main build.
A fix for now: in WEB-INF/lps/server/build.xml, the compile target
tries to
compile everything in org/openlaszlo/**. I added an exclude to
exclude the
js2doc classes from this compilation step. This makes the build
succeed in a
jdk 1.4.2 environment.
+ <!-- don't try to compile the js2doc tools with source=1.4.
They require jdk 1.5. [bshine 11.17.2006] -->
+ <exclude name="org/openlaszlo/js2doc/**" />
Release Notes:
Details:
Tests:
Files:
M WEB-INF/lps/server/build.xml
