[Laszlo-checkins] r5974 - labs/lzproject/trunk

[raju@openlaszlo.org]

Author: raju
Date: 2007-08-09 04:10:00 -0700 (Thu, 09 Aug 2007)
New Revision: 5974

Modified:
   labs/lzproject/trunk/build.xml
Log:
Deactivated lzxdoc task due to the problems with 4Suite package and OS X.
Var openlaszlo.version is now taken out of my.ant.properties file.


Modified: labs/lzproject/trunk/build.xml
===================================================================
--- labs/lzproject/trunk/build.xml	2007-08-09 09:58:19 UTC (rev 5973)
+++ labs/lzproject/trunk/build.xml	2007-08-09 11:10:00 UTC (rev 5974)
@@ -27,8 +27,8 @@
              has to be unzipped into the openlaszlo folder,
              e.g. ./openlaszo/opernlaszlo-4.0.3 -->
 	<property name="openlaszlo.dir" location="openlaszlo" />
-	<property name="openlaszlo.version" value="-4.0.3" />
-	<property name="openlaszlo.home" value="${openlaszlo.dir}/openlaszlo${openlaszlo.version}" />
+	<!-- OpenLaszlo version has to be set in my.properties property file -->
+	<property name="openlaszlo.home" value="${openlaszlo.dir}/${openlaszlo.version}" />
 
 	<!-- Default directories  -->
 	<property name="build.dir" location="builder" />
@@ -232,7 +232,7 @@
 	</target>
 
 	<!-- Generate WAR file containing OpenLaszlo and LZProject -->
-	<target name="make-war" depends="make-webxml,lzxdoc,javadoc,make-java-source-zip">
+	<target name="make-war" depends="make-webxml,javadoc,make-java-source-zip">
 		<echo message="Making WAR file:" />
 		<echo message="Using web.xml at ${webapp.webinf.dir}/web.xml" />
 		<echo message="Adding classes from ${openlaszlo.home}/WEB-INF/classes" />
@@ -293,7 +293,7 @@
 	</target>
 
 	<!-- Generate WAR file containing SOLO LZProject -->
-	<target name="make-solo-war" depends="make-webxml,lzxdoc,javadoc,make-java-source-zip,compile-for-solo,copy-dhtml-solo-files">
+	<target name="make-solo-war" depends="make-webxml,javadoc,make-java-source-zip,compile-for-solo,copy-dhtml-solo-files">
 		<echo message="Making WAR file with SOLO LZProject application with OpenLaszlo server:" />
 		<echo message="Using web.xml at ${webapp.webinf.dir}/web.xml" />
 		<!-- now copy the SOLO DHTML wrapper -->
@@ -326,7 +326,16 @@
 			</fileset>
 		</war>
 	</target>
+  <target name="doc"
+      description="Build documentation"
+      depends="init" unless="skip.doc">
 
+      <!-- Build the docs -->
+      <ant dir="docbook" />
+
+  </target>
+
+
 	<!-- deploy proxied WAR -->
 	<target name="deploy-war" depends="make-war">
 		<taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask" classpathref="compile.classpath"/>