[WebMacro-cvs] webmacro build.xml,1.34,1.35 WebMacro.defaults,1.42,NONE

[<lan...@us...>]

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

Modified Files:
	build.xml 
Removed Files:
	WebMacro.defaults 
Log Message:
doc improvements;
moved sources to src-optional;
implemented build policy: build with webmacro.defaults.classic but with a property switch be able to build with webmacro.defaults.minimal

Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** build.xml	12 Jun 2003 00:17:48 -0000	1.34
--- build.xml	3 Aug 2003 21:01:48 -0000	1.35
***************
*** 18,22 ****
          Remove all temporary files created during build process
      compile
!         Compile all source files
      jar
          Create "webmacro.jar"
--- 18,24 ----
          Remove all temporary files created during build process
      compile
!         Compile all principal source files
!     compile-optional
!         Compiles all optional source files
      jar
          Create "webmacro.jar"
***************
*** 41,45 ****
      </target>
  
!     <property name="version"        value="1.1final" />
      <property name="app.name"       value="webmacro" />
      <property name="tmpdir"         value="tmp" />
--- 43,48 ----
      </target>
  
!     <property name="version"        value="2.0b1" />
!     <property name="wm-style"       value="classic" /> <!-- can be .minimal to get webmacro.defaults.minimal -->
      <property name="app.name"       value="webmacro" />
      <property name="tmpdir"         value="tmp" />
***************
*** 123,136 ****
          <copy todir="${classes}">
              <fileset dir="${tmpdir}" includes="**/*.properties" />
!             <fileset dir="." includes="WebMacro.defaults"/>
          </copy>
          <touch file="${classes}/WM-VERSION-${version}" />
      </target>
  
      <target name="compile-examples" depends="compile">
          <filter token="VERSION" value="${version}" />
          <filter token="BUILD_DATE" value="${TODAY}" />
          <javac srcdir="${examples}" destdir="${examples}/WEB-INF/classes"
-             excludes="**/advanced/*.java"
              debug="on" optimize="off" deprecation="off">
              <classpath refid="class.path" />
--- 126,150 ----
          <copy todir="${classes}">
              <fileset dir="${tmpdir}" includes="**/*.properties" />
!             <fileset dir="." includes="WebMacro.defaults.${wm-type}"/>
          </copy>
          <touch file="${classes}/WM-VERSION-${version}" />
      </target>
  
+     <target name="compile-optional" depends="compile">
+         <filter token="VERSION" value="${version}" />
+         <filter token="BUILD_DATE" value="${TODAY}" />
+                 <copy todir="${tmpdir}" filtering="true">
+             <fileset dir="src-optional" />
+         </copy>
+         <javac srcdir="${tmpdir}" destdir="${classes}"
+             debug="on" optimize="off" deprecation="off">
+             <classpath refid="class.path" />
+         </javac>
+     </target>
+ 
      <target name="compile-examples" depends="compile">
          <filter token="VERSION" value="${version}" />
          <filter token="BUILD_DATE" value="${TODAY}" />
          <javac srcdir="${examples}" destdir="${examples}/WEB-INF/classes"
              debug="on" optimize="off" deprecation="off">
              <classpath refid="class.path" />

--- WebMacro.defaults DELETED ---