User: rinkrank
  Date: 02/04/27 06:53:35

  Modified:    modules/build Tag: MODULE_REFACTORING_BRANCH build.bat
                        build.xml
  Log:
  -fixed compile errors and added tags everywhere
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +3 -0      xdoclet/modules/build/Attic/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/modules/build/Attic/build.bat,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -w -r1.1.2.1 -r1.1.2.2
  --- build.bat 25 Apr 2002 17:39:14 -0000      1.1.2.1
  +++ build.bat 27 Apr 2002 13:53:35 -0000      1.1.2.2
  @@ -7,8 +7,11 @@
   
   :gotJavaHome
   
  +REM We have to put all jars on ant's classpath to avoid classloader problems
  +
   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%" org.apache.tools.ant.Main %1 %2 %3 %4 
%5 %6 %7 %8 %9
   
  
  
  
  1.1.2.2   +94 -48    xdoclet/modules/build/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/modules/build/Attic/build.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -w -r1.1.2.1 -r1.1.2.2
  --- build.xml 25 Apr 2002 17:39:14 -0000      1.1.2.1
  +++ build.xml 27 Apr 2002 13:53:35 -0000      1.1.2.2
  @@ -1,13 +1,16 @@
   <?xml version="1.0"?>
   
  -<project name="XDoclet" default="main" basedir="..">
  +<project name="XDoclet" default="jar" basedir="..">
   
  -   <property name="name"                     value="xdoclet-modules"/>
  +   <property name="name"                          value="xdoclet-all-modules"/>
      <property name="xdoclet.lib.dir"          value="${basedir}/../lib"/>
      <property name="xdoclet.jar.file"         
value="${basedir}/../core/dist/lib/xdoclet.jar"/>
      <property name="output.dir"               value="${basedir}/build/output"/>
      <property name="output.java.src.dir"      value="${output.dir}/src"/>
      <property name="output.classes.dir"       value="${output.dir}/classes"/>
  +   <property name="output.meta.dir"               
value="${output.classes.dir}/META-INF"/>
  +   <property name="output.lib.dir"                value="${output.dir}/lib"/>
  +   <property name="output.jar.file"               
value="${output.lib.dir}/${name}.jar"/>
   
      <!-- =================================================================== -->
      <!-- Define class path                                                   -->
  @@ -17,6 +20,11 @@
         <pathelement location="${xdoclet.jar.file}"/>
      </path>
   
  +   <patternset id="module-sources">
  +      <include name="**/*.java"/>
  +      <exclude name="**/*.html"/>
  +   </patternset>
  +
      <!-- =================================================================== -->
      <!-- Prepares the source code                                            -->
      <!-- =================================================================== -->
  @@ -26,14 +34,53 @@
         
         <!-- copy all sources to one place -->
         <copy todir="${output.java.src.dir}">
  -         <fileset dir="${basedir}">
  -            <include name="*/src/**/*.java"/>
  -            <include name="**/package.html"/>
  +         <fileset dir="${basedir}/apache/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/bea/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/ejb/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/exolab/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/hp/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/ibm/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/jboss/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/jmx/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/macromedia/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/mvcsoft/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/web/src">
  +            <patternset refid="module-sources"/>
  +         </fileset>
  +         <fileset dir="${basedir}/xdoclet/src">
  +            <patternset refid="module-sources"/>
            </fileset>
         </copy>
      </target>
   
  -   <target name="compile" depends="prepare">
  +   <!-- =================================================================== -->
  +   <!-- Compiles all the modules                                            -->
  +   <!-- =================================================================== -->
  +   <target 
  +      name="compile" 
  +      depends="prepare"
  +      description="Compiles all the modules"
  +   >
         <javac   
            destdir="${output.classes.dir}"
            classpathref="project.class.path"
  @@ -44,51 +91,50 @@
         />
      </target>
      
  -
      <!-- =================================================================== -->
  -   <!-- Builds optional jar. ant-call'ed by optional-jars                   -->
  -   <!-- @param module-name the name of the optional module to output         -->
  +   <!-- Makes one xdoclet.xml describing all modules                        -->
      <!-- =================================================================== -->
  -   <target name="module">
  -
  -      <property name="optional.jar.file"    
value="${optional.jar.dir}/${module-name}-module.jar"/>
  -      <property name="optional.src.dir"     
value="${basedir}/optional/${module-name}"/>
  -      <property name="optional.classes.dir" 
value="${output.dir}/optional/classes/${module-name}"/>
  -
  -      <mkdir dir="${optional.classes.dir}"/>
  -      <mkdir dir="${optional.jar.dir}"/>
  -
  -      <javac
  -         srcdir="${optional.src.dir}"
  -         destdir="${optional.classes.dir}"
  +   <target 
  +      name="xdoclet-xml" 
  +      depends="prepare"
  +      description="Makes one xdoclet.xml describing all modules"
  +   >
  +      <mkdir dir="${output.meta.dir}"/>
  +      
  +      <taskdef
  +         name="xdoclet-bootstrapper"
  +         classname="xdoclet.loader.Bootstrapper"
            classpathref="project.class.path"
  -         debug="on"
  -         deprecation="on"
  -         optimize="off"
         />
  -      <jar jarfile="${optional.jar.file}">
  -         <fileset dir="${optional.classes.dir}"/>
  -         <fileset dir="${optional.src.dir}">
  -            <exclude name="**/*.java"/>
  +      <xdoclet-bootstrapper/>
  +      <xdoclet
  +         destdir="${output.meta.dir}"
  +         classpathref="project.class.path"
  +      >
  +         <fileset dir="${output.java.src.dir}">
  +            <include name="**/*Handler.java" />
  +            <include name="**/*SubTask.java" />
            </fileset>
  -      </jar>
  +
  +         <template
  +            templateFile="xdoclet-xml.xdt"
  +            destinationFile="xdoclet.xml"
  +         />
  +      </xdoclet>
  +
      </target>
   
      <!-- =================================================================== -->
  -   <!-- Builds optional jars                                                -->
  +   <!-- Makes the jar containing all modules                                -->
      <!-- =================================================================== -->
  -   <target name="optional-jars" depends="compile">   
  -      <antcall target="optional-jar">
  -         <param name="module-name" value="weblogic"/>
  -      </antcall>
  -      <!--antcall target="optional-jar">
  -         <param name="module-name" value="jboss"/>
  -      </antcall-->
  -
  -      <copy todir="${samples.dir}/lib">
  -         <fileset dir="${optional.jar.dir}"/>
  -      </copy>
  +   <target 
  +      name="jar" 
  +      depends="compile,xdoclet-xml"
  +      description="Makes the jar containing all modules"
  +   >
  +      <mkdir dir="${output.lib.dir}"/>
  +      <jar jarfile="${output.jar.file}">
  +         <fileset dir="${output.classes.dir}"/>
  +      </jar>
      </target>
  -
  -
   </project>
  
  
  

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to