User: vharcq  
  Date: 02/05/02 11:41:43

  Modified:    core/samples/script Tag: MODULE_REFACTORING_BRANCH Build.bat
                        build.xml
  Log:
  Beginning the samples build refactoruing
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.1   +4 -7      xdoclet/core/samples/script/Build.bat
  
  Index: Build.bat
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/samples/script/Build.bat,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -w -r1.8 -r1.8.2.1
  --- Build.bat 9 Apr 2002 00:07:16 -0000       1.8
  +++ Build.bat 2 May 2002 18:41:43 -0000       1.8.2.1
  @@ -7,13 +7,10 @@
   
   :gotJavaHome
   
  -set _CP_=..\lib\ant.jar
  -set _CP_=%_CP_%;..\lib\crimson.jar
  -set _CP_=%_CP_%;..\lib\jaxp.jar
  -set _CP_=%_CP_%;..\lib\log4j.jar
  -set _CP_=%_CP_%;..\lib\ant.jar
  -
  -"%JAVA_HOME%\bin\java.exe" -classpath 
"%JAVA_HOME%\lib\tools.jar;%_CP_%;%CLASSPATH%" -Dlog4j.configuration=log4j.properties 
org.apache.tools.ant.Main %1 %2 %3 %4 %5
  +set CP=%JAVA_HOME%\lib\tools.jar
  +for %%i in (..\..\..\lib\*.jar) do call appendcp.bat %%i
  +for %%i in (..\..\..\core\dist\lib\*.jar) do call appendcp.bat %%i
   
  +"%JAVA_HOME%\bin\java.exe" -classpath "%CP%" -Dlog4j.configuration=log4j.properties 
org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   :cleanup
  
  
  
  1.83.2.1  +23 -34    xdoclet/core/samples/script/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/samples/script/build.xml,v
  retrieving revision 1.83
  retrieving revision 1.83.2.1
  diff -u -w -r1.83 -r1.83.2.1
  --- build.xml 21 Apr 2002 20:40:13 -0000      1.83
  +++ build.xml 2 May 2002 18:41:43 -0000       1.83.2.1
  @@ -3,22 +3,8 @@
   <project name="XDoclet" default="main" basedir="..">
   
   
  -   <!-- Set up java.class.path -->
  -   <path id="project.class.path">
  -      <!-- LOG4J properties -->
  -      <pathelement path="${basedir}\script" />
  -
  -      <fileset dir="lib">
  -         <include name="**/*.jar" />
  -      </fileset>
  -
  -      <!-- append the external classpath lastly -->
  -      <pathelement path="${java.class.path}" />
  -
  -   </path>
  -
  +    <property name="root.dir"                       value="../.."/>
   
  -   <!-- Init -->
      <target name="init">
   
         <property name="lib.dir" value="lib" />
  @@ -46,6 +32,23 @@
         <property name="build.compiler" value="modern" />
         <property name="classpath" value="" />
   
  +
  +    <path id="project.class.path">
  +        <fileset dir="${root.dir}/lib">
  +            <include name="*.jar" />
  +        </fileset>
  +        <!-- We rely on xdoclet (doc) module during the build -->
  +        <fileset dir="${root.dir}/core/dist/lib">
  +            <include name="xdoclet.jar" />
  +        </fileset>
  +    </path>
  +
  +    <taskdef
  +        name="ejbdoclet"
  +        classname="xdoclet.modules.ejb.EjbDocletTask"
  +        classpathref="project.class.path"
  +    />
  +
         <property name="ejb.dir"               value="${build.dir}/ejb"/>
         <property name="ejb.classes.dir"       value="${ejb.dir}/classes"/>
         <property name="ejb.dd.dir"            value="${ejb.dir}/META-INF"/>
  @@ -63,6 +66,7 @@
         <property name="jboss.tuned.updates" value="true" />
         <property name="jboss.read.only" value="false" />
   
  +
      </target>
   
   
  @@ -99,27 +103,12 @@
      <!-- Run EJBDoclet -->
      <target name="ejbdoclet" depends="prepare">
         
  -      <path id="xdoclet.class.path">
  -         <fileset dir="lib">
  -            <include name="*.jar"/>
  -         </fileset>
  -      </path>
  -
  -      <taskdef
  -         name="xdoclet-bootstrapper"
  -         classname="xdoclet.loader.Bootstrapper"
  -         classpathref="xdoclet.class.path"
  -      />
  -      
  -      <xdoclet-bootstrapper/>
  -      
         <tstamp>
            <format property="TODAY" pattern="d-MM-yy" />
         </tstamp>
   
         <ejbdoclet
  -         fork="true"
  -         classpathref="xdoclet.class.path"
  +         classpathref="project.class.path"
            destdir="${generated.java.dir}"
            mergedir="parent-fake-to-debug"
            excludedtags="@version,@author,@todo"
  
  
  

_______________________________________________________________

Have big pipes? SourceForge.net is looking for download mirrors. We supply
the hardware. You get the recognition. Email Us: [EMAIL PROTECTED]
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to