Author: ben
Date: 2007-11-16 11:58:11 -0800 (Fri, 16 Nov 2007)
New Revision: 7306

Modified:
   openlaszlo/trunk/build.xml
Log:
Change 20071115-ben-m by [EMAIL PROTECTED] on 2007-11-15 15:35:49 PST
    in /Users/ben/src/svn/openlaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Back out r7183, which broke the windows build

New Features:

Bugs Fixed: (unfiled) windows build hangs

Technical Reviewer: ptw
QA Reviewer: mkratt (pending)

Documentation:
When I tried to make the doc only build once, I took out the
guard against building doc on windows: 
unless="skip.doc"

I'm now just backing out that change, so we're back to building
doc twice on linux machines, but at least we won't
fail the windows build anymore. This is a problem at all because 
the doc build hangs on windows. It would be nice if I would
fix the doc build on windows. 

Release Notes:

Details:
    

Tests:
Let a nightly build start of trunk. The windows build should
complete with a binary installer. 



Modified: openlaszlo/trunk/build.xml
===================================================================
--- openlaszlo/trunk/build.xml  2007-11-16 19:20:06 UTC (rev 7305)
+++ openlaszlo/trunk/build.xml  2007-11-16 19:58:11 UTC (rev 7306)
@@ -530,7 +530,6 @@
       <copy todir="tools" file="${webapp-lps-home}/schema/lzx.rng" />
       <copy todir="tools" file="${webapp-lps-home}/schema/lzx.xsd" />
 
-      <echo message="benbenben: yo! in main build file target is build, gonna 
call server/ target build." />
       <ant dir="${webapp-lps-home}/server" target="build" />
       <copy todir="${LPS_HOME}/WEB-INF/lib" 
file="${webapp-lps-home}/server/lib/${lps.jar}" />
       <ant target="build-classes" />
@@ -593,11 +592,11 @@
   <!--================  Target [doc] ==============-->
   <target name="doc" 
       description="Build documentation"
-      depends="init" unless="doc.build.done">
+      depends="init" unless="skip.doc">
 
       <!-- Build the docs -->
       <ant dir="docs/src" />
-      <property name="doc.build.done" value="true" /> 
+      
   </target>
 
   <!--================  Target [test] ==============-->


_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins

Reply via email to