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

[raju@openlaszlo.org]

Author: raju
Date: 2007-08-03 13:59:36 -0700 (Fri, 03 Aug 2007)
New Revision: 5923

Modified:
   labs/lzproject/trunk/build.xml
Log:
Comments translated into English.
copy-local target removed.


Modified: labs/lzproject/trunk/build.xml
===================================================================
--- labs/lzproject/trunk/build.xml	2007-08-03 20:59:49 UTC (rev 5922)
+++ labs/lzproject/trunk/build.xml	2007-08-03 20:59:36 UTC (rev 5923)
@@ -2,31 +2,35 @@
 <!--
 	Build file for LZProject application
 -->
-<project name="OL4 blueprint app" default="copy-local-tomcat" basedir=".">
+<project name="OL4 blueprint app" default="build" basedir=".">
 
 	<description>LZProject OpenLaszlo 4.0 blueprint application</description>
 
 	<loadfile property="copyright" srcFile="copyright.txt"/>
 
-	<!-- Property Datei einbinden -->
+	<!-- Include property files with my settings -->
 	<property file="my.ant.properties" />
 
-	<!-- Umgebungsvariablen -->
+	<!-- Environment vars -->
 	<property environment="env"/>
 
-	<!-- Name der Webappliktion / WAR-Datei -->
+	<!-- name of Java web application / WAR-file
+             in case of SOLO war the char sequence "-SOLO" is added -->
 	<property name="webapp.name" value="blueprint" />
 
-	<!-- Marker, die vor dem Deployment in den LZX und JSP ersetzt werden -->
+	<!-- Markers in the LZX files like @copyright@ which will be replaced -->
 	<property name="marker.copyright" value="copyright" />
 	<property name="marker.webapp" value="webapp_name" />
 
-	<!-- OpenLaszlo -->
+	<!-- OpenLaszlo version used.
+             To compile the application, a version OpenLaszlo servlet distribution
+             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.2" />
+	<property name="openlaszlo.version" value="-4.0.3" />
 	<property name="openlaszlo.home" value="${openlaszlo.dir}/openlaszlo${openlaszlo.version}" />
 
-	<!-- Standarverzeichnisse -->
+	<!-- Default directories  -->
 	<property name="build.dir" location="builder" />
 	<property name="conf.dir" location="conf" />
 	<property name="derby.dir" location="derby" />
@@ -40,9 +44,9 @@
 	<property name="xdoclet.dir" location="xdoclet" />
 	<property name="lzx.dir" location="lzx" />
 	<property name="lzx.temp" location="temp\${lzx.dir}" />
-    <property name="lzx.lzxdocsdir" location="temp/lzproject/lzdocs"/>
+        <property name="lzx.lzxdocsdir" location="temp/lzproject/lzdocs"/>
 
-	<!-- Generierte Verzeichnisse -->
+	<!-- Generated directories -->
 	<property name="javadoc.dir" location="temp/lzproject/javadocs" />
 	<property name="temp.dir" location="temp" />
 	<property name="webapp.dir" location="${build.dir}/webapp" />
@@ -76,7 +80,7 @@
 		<pathelement location="${catalina-ant.jar}"/>
 	</path>
 
-	<!-- CLASSPATH für XDoclet Tasks -->
+	<!-- CLASSPATH for XDoclet Tasks -->
 	<path id="xdoclet.classpath">
 		<fileset dir="${lib.dir}" includes="*.jar" />
 		<fileset dir="${externalLib.dir}" includes="*.jar" />
@@ -84,7 +88,7 @@
 		<fileset dir="${xdoclet.dir}" includes="*.jar"/>
 	</path>
 
-	<!-- CLASSPATH für Laszlo Compiler -->
+	<!-- CLASSPATH for Laszlo compiler lzc -->
 	<path id="laszlo.compiler.classpath">
 		<pathelement location="${openlaszlo.home}/WEB-INF/lps/server/build"/>
 		<pathelement location="${openlaszlo.home}/WEB-INF/classes"/>
@@ -92,7 +96,7 @@
 		<fileset dir="${openlaszlo.home}/WEB-INF/lib" includes="**/*.jar"/>
 	</path>
 
-	<!-- Alle temporären Daten löschen -->
+	<!-- Delete all temporary and generated files and folders -->
 	<target name="clean">
 		<echo message="${ant.version}" />
 		<delete dir="${build.dir}" />
@@ -104,7 +108,7 @@
 		<delete dir="${webapp.war.dir}" />
 	</target>
 
-	<!-- Alle temporären Verzeichnisse erstellen -->
+	<!-- Create all temporary directories -->
 	<target name="init" depends="clean">
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${javadoc.dir}" />
@@ -148,6 +152,7 @@
 				<filter token="${marker.copyright}" value="${copyright}" />
 			</filterset>
 		</copy>
+                <!-- Now copy the files where don't have to check for markers -->
 		<copy todir="${temp.dir}">
 			<fileset dir="${lzx.dir}"  casesensitive="no">
 				<include name="**/*.css" />
@@ -161,52 +166,6 @@
 		</copy>
 	</target>
 
-	<!-- LZX Dateien und JSP in den ${tomcat.home} Ordner kopieren -->
-	<target name="copy-local-tomcat">
-		<echo message="Copying LZX files to ${tomcat.home}/webapps/${webapp.name}" />
-		<echo message="Replacing @${marker.webapp}@ with ${webapp.name} in all copied files" />
-		<copy todir="${tomcat.home}/webapps/${webapp.name}">
-			<fileset dir="${lzx.dir}" casesensitive="no">
-				<include name="**/*.lzx" />
-				<include name="**/*.xml" />
-				<include name="**/*.jsp" />
-				<include name="**/*.html" />
-				<include name="**/*.js" />
-				<exclude name="**/*.css" />
-				<exclude name="**/*.gif" />
-				<exclude name="**/*.jpg" />
-				<exclude name="**/*.png" />
-				<exclude name="**/*.swf" />
-				<exclude name="**/*.ttf" />
-				<exclude name="**/__SOLO_html/**" />
-				<exclude name="**/__PROXIED_html/**" />			</fileset>
-			<filterset>
-				<!-- If you use the webapp name inside LZX, just place this marker there
-				     and it will be replaced: @webapp_name@ -->
-				<filter token="${marker.webapp}" value="${webapp.name}" />
-				<!-- Copyright-Informationen einfügen -->
-				<filter token="${marker.copyright}" value="${copyright}" />
-			</filterset>
-		</copy>
-		<!-- use the HTML files for proxied deployment for local testing -->
-		<copy todir="${tomcat.home}/webapps/${webapp.name}/lzproject">
-			<fileset dir="${lzx.dir}/lzproject/__PROXIED_html" casesensitive="no">
-				<include name="*.html" />
-			</fileset>
-		</copy>
-		<copy todir="${tomcat.home}/webapps/${webapp.name}">
-			<fileset dir="${lzx.dir}" casesensitive="no">
-				<include name="**/*.css" />
-				<include name="**/*.gif" />
-				<include name="**/*.jpg" />
-				<include name="**/*.png" />
-				<include name="**/*.swf" />
-				<include name="**/*.mp3" />
-				<include name="**/*.ttf" />
-			</fileset>
-		</copy>
-	</target>
-
 	<!-- Compile Java classes -->
 	<target name="compile" depends="copy-files-temp">
 		<echo message="Starting compilation ..." />
@@ -252,7 +211,7 @@
 	</target>
 
 	<!-- Build -->
-	<target name="build" depends="make-war" description="Complete build">
+	<target name="build" depends="make-solo-war" description="Complete build">
 		<echo message="Building LZProject OL 4.0 app..." />
 	</target>