[WebMacro-cvs] wiki build.xml,1.8.2.1,1.8.2.2

[<dat...@us...>]

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

Modified Files:
      Tag: christian
	build.xml 
Log Message:
Simplified build file; running 'ant' will create default wiki web application plus *.war file for easy deployment.
To build another config, override site.name with 'ant -Dsite.name=www.webmacro.org'

Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/wiki/build.xml,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** build.xml	18 Sep 2002 18:14:57 -0000	1.8.2.1
--- build.xml	17 Feb 2003 18:35:12 -0000	1.8.2.2
***************
*** 1,71 ****
! <project name="wiki" default="install" basedir=".">
!    <property name="site.name" value="reference.arinso.de" />
! 	<property name="dir.install" value="/C:/" />
! 	<property name="app.name" value="wiki" />
! 	<property name="dir.class" value="./class" />
! 	<property name="dir.src"   value="./src" />
! 	<property name="dir.lib"   value="./lib" />
! 	<property name="dir.lib.build"   value="./lib.build" />
! 
! 	<property name="file.jar"  value="./wiki.jar" />
! 
! 	<path id="path.class">
! 		<fileset dir="${dir.lib}">
! 			<include name="*.jar" />
! 			<include name="*.zip" />
! 		</fileset>
! 		<fileset dir="${dir.lib.build}">
! 			<include name="*.jar" />
! 			<include name="*.zip" />
! 		</fileset>
! 	</path>
! 
  
! 	<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">
! 		<!--
  		<javacc 
  			 target="${dir.src}/org/tcdi/opensource/wiki/parser/wiki.jj" 
  			 javacchome="." 
  		/>
! 		-->
! 		<javac  destdir="${dir.class}"
  			debug="on"
  			optimize="on"
! 			deprecation="on"
! 		>
  			<src path="${dir.src}" />
! 			<classpath refid="path.class" />
  		</javac>
  	</target>
  
! 	<target name="jar" depends="prepare,compile">
! 		<jar 	jarfile="${file.jar}"
! 			basedir="${dir.class}"
! 		/>
! 	</target>
! 
!         <target name="verify.dir.install" unless="dir.install">
!         	<fail message="Please define dir.install" />
!         </target>
!         <target name="verify.site.name" unless="site.name">
! 		<fail message="Please specify the site.name to install" />
! 	</target>
! 
! 	<target name="install" depends="verify.dir.install,verify.site.name,prepare,compile,jar">
! 		<ant antfile="build.xml" 
!                      inheritAll="false"
!                      dir="builds/${site.name}/">
! 			<property name="dir.install" value="${dir.install}" />
! 		</ant>
  	</target>
- 
  </project>
--- 1,59 ----
! <project name="wiki" default="jar" basedir=".">
!    <property name="site.name.default" value="default" />
!    <property name="site.name" value="${site.name.default}" />
!    <property name="build" value="builds" />
! 	<property name="dir.src" value="src" />
! 	<property name="dir.resource" value="resources" />
!    
! 	<property name="dir.lib"   value="lib" />
  
! 	<target name="init">
!       <tstamp />
! 		<mkdir dir="${build}/${site.name}/WEB-INF/classes" />
  	</target>
  
  	<target name="clean">
! 		<delete dir="${build}" />
  	</target>
+    
+    <target name="copy" depends="init">
+       <copy todir="${build}/${site.name}">
+          <fileset dir="${dir.resource}/${site.name.default}"/>
+       </copy>
+       <copy todir="${build}/${site.name}" overwrite="true">
+          <fileset dir="${dir.resource}/${site.name}"/>
+       </copy>
+    </target>
  
!    <target name="javacc" depends="copy" if="compile_cc">
  		<javacc 
  			 target="${dir.src}/org/tcdi/opensource/wiki/parser/wiki.jj" 
  			 javacchome="." 
  		/>
!    </target>
! 	
!    <target name="compile" depends="copy">
!       <property name="build.classes" value="${build}${file.separator}${site.name}${file.separator}WEB-INF${file.separator}classes" />
! 		<delete file="${build}/${site.name}/WEB-INF/lib/wiki.jar"/>
!       <javac destdir="${build.classes}"
  			debug="on"
  			optimize="on"
! 			deprecation="on" >
  			<src path="${dir.src}" />
! 			<classpath>
!             <fileset dir="${dir.lib}">
!                <include name="*.jar" />
!             </fileset>
!             <fileset dir="${build}/${site.name}/WEB-INF/lib">
!                <include name="*.jar" />
!             </fileset>
!          </classpath>
  		</javac>
  	</target>
  
! 	<target name="jar" depends="compile">
! 		<jar jarfile="${build}${file.separator}${site.name}${file.separator}WEB-INF${file.separator}lib${file.separator}wiki.jar" basedir="${build.classes}" />
!       <delete dir="${build.classes}"/>
!       <jar jarfile="${build}${file.separator}${site.name}.war" basedir="${build}${file.separator}${site.name}"/>
  	</target>
  </project>