[WebMacro-cvs] wiki build.xml,1.8,1.9

[<dr...@us...>]

Update of /cvsroot/webmacro/wiki
In directory sc8-pr-cvs1:/tmp/cvs-serv18187

Modified Files:
	build.xml 
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists. 
- removed some debug output in SavePageAction.java


Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/wiki/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml	15 Oct 2001 06:39:57 -0000	1.8
--- build.xml	27 Nov 2002 07:06:31 -0000	1.9
***************
*** 1,2 ****
--- 1,5 ----
+ <!--
+     set the JAVACC_HOME environment variable to where you installed JavaCC
+ -->
  <project name="wiki" default="compile" basedir=".">
  	<property name="app.name" value="wiki" />
***************
*** 4,9 ****
--- 7,16 ----
  	<property name="dir.src"   value="./src" />
  	<property name="dir.lib"   value="./lib" />
+     <property environment='ENV' />
  
  	<property name="file.jar"  value="./wiki.jar" />
+     <property name="javacc.home" value="${ENV.JAVACC_HOME}" />
+ 
+     <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" />
  
  	<path id="path.class">
***************
*** 16,28 ****
  
  	<target name="prepare">
  		<mkdir dir="${dir.class}" />
  	</target>
  
! 	<target name="clean">
  		<delete dir="${dir.class}" />
  		<delete file="${file.jar}" />
  	</target>
  
! 	<target name="compile" depends="prepare">
  		<javac  destdir="${dir.class}"
  			debug="on"
--- 23,43 ----
  
  	<target name="prepare">
+         <available property="javacc.present" classname="COM.sun.labs.javacc.Main"
+             classpath="${javacc.home}/JavaCC.zip" />
+ 
  		<mkdir dir="${dir.class}" />
  	</target>
  
!  	<target name="clean">
  		<delete dir="${dir.class}" />
  		<delete file="${file.jar}" />
  	</target>
  
!     <target name="precompile" depends="prepare" if='javacc.present'>
!         <javacc target="src/org/tcdi/opensource/wiki/parser/wiki.jj"
!             javacchome="${javacc.home}" />
!     </target>
! 
! 	<target name="compile" depends="prepare,precompile">
  		<javac  destdir="${dir.class}"
  			debug="on"
***************
*** 36,40 ****
  
  	<target name="jar" depends="prepare,compile">
! 		<jar 	jarfile="${file.jar}"
  			basedir="${dir.class}"
  		/>
--- 51,55 ----
  
  	<target name="jar" depends="prepare,compile">
! 		<jar jarfile="${file.jar}"
  			basedir="${dir.class}"
  		/>
***************
*** 49,53 ****
  
  	<target name="install" depends="verify.dir.install,verify.site.name,prepare,compile,jar">
! 		<ant antfile="build.xml" 
                       inheritAll="false"
                       dir="builds/${site.name}/">
--- 64,68 ----
  
  	<target name="install" depends="verify.dir.install,verify.site.name,prepare,compile,jar">
! 		<ant antfile="build.xml"
                       inheritAll="false"
                       dir="builds/${site.name}/">