User: rinkrank
  Date: 02/05/23 18:06:07

  Modified:    core     Tag: MODULE_REFACTORING_BRANCH build.xml
  Log:
  improved build procedure related to externalizer, thanks to ModuleLoader's new 
ability to load unjarred modules
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.16  +47 -25    xdoclet/core/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/Attic/build.xml,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -w -r1.1.2.15 -r1.1.2.16
  --- build.xml 23 May 2002 22:25:05 -0000      1.1.2.15
  +++ build.xml 24 May 2002 01:06:07 -0000      1.1.2.16
  @@ -36,6 +36,11 @@
               </and>
                </condition>
   
  +        <!-- Checks if the core xdoclet.jar is uptodate -->
  +        <uptodate property="xdoclet.jar.uptodate" targetfile="${xdoclet.jar}">
  +            <srcfiles dir="${core.src.dir}"/>
  +        </uptodate>
  +
           <filterset id="xdoclet.filters">
               <filter token="VERSION" value="${version}" />
               <filter token="DATE" value="${TODAY}" />
  @@ -55,8 +60,16 @@
           <mkdir dir="${dist.dir}" />
           <mkdir dir="${dist.lib.dir}"/>
   
  +        <copy todir="${core.classes.dir}">
  +            <fileset dir="${core.src.dir}" includes="**/*.properties" />
  +            <fileset dir="${core.src.dir}" includes="META-INF/xdoclet.xml" />
  +        </copy>
  +
       </target>
   
  +    <!-- =================================================================== -->
  +    <!-- Builds xjavadoc                                                     -->
  +    <!-- =================================================================== -->
       <target name="build-xjavadoc" if="xjavadoc.build.needed">
           <!-- build xjavadoc -->
           <echo message="XJavadoc sources are available and newer than xjavadoc.jar. 
Building xjavadoc..."/>
  @@ -65,6 +78,9 @@
           </ant>
       </target>
   
  +    <!-- =================================================================== -->
  +    <!-- Cleans xjavadoc                                                     -->
  +    <!-- =================================================================== -->
       <target name="clean-xjavadoc" if="xjavadoc.build.needed">
           <ant dir="${xjavadoc.dir}" target="clean" inheritAll="false"/>
       </target>
  @@ -142,11 +158,7 @@
       <!-- =================================================================== -->
       <!-- Creates the jar archives                                            -->
       <!-- =================================================================== -->
  -    <target name="jar" depends="compile">
  -
  -        <copy todir="${core.classes.dir}">
  -            <fileset dir="${core.src.dir}" includes="**/*.properties" />
  -        </copy>
  +    <target name="jar" depends="compile,externalizer">
   
           <jar jarfile="${xdoclet.jar}" basedir="${core.classes.dir}"/>
   
  @@ -155,14 +167,11 @@
       <!-- =================================================================== -->
       <!-- Creates the distribution                                            -->
       <!-- =================================================================== -->
  -    <target name="dist" depends="prepare">
  +    <target name="dist" depends="jar">
   
  -        <echo>*** Building core... ***</echo>
  +        <!--echo>*** Building core... ***</echo>
           <ant target="jar"/>
           <echo>*** Building core done. ***</echo>
  -        <echo>*** Building xdoclet module... ***</echo>
  -        <ant dir="${modules.dir}/xdoclet"/>
  -        <echo>*** Building xdoclet module done. ***</echo>
   
           <echo>*** Running externalizer on core... ***</echo>
           <ant target="externalizer"/>
  @@ -177,7 +186,7 @@
           <copy todir="${dist.src.dir}">
               <fileset dir="${core.src.dir}"/>
           </copy>
  -        <echo>*** Copying sources done. ***</echo>
  +        <echo>*** Copying sources done. ***</echo-->
   
       </target>
   
  @@ -196,8 +205,11 @@
       <!-- Runs externalizer, it generates Messages.properties files for each  -->
       <!-- package.                                                            -->
       <!-- =================================================================== -->
  -    <target name="externalizer" depends="prepare">
  -
  +    <target 
  +        name="externalizer" 
  +        depends="build-externalizer"
  +        unless="xdoclet.jar.uptodate"
  +    >
           <!-- Define classpath required for running externalizer -->
           <path id="externalizer.class.path">
               <pathelement location="${commons-logging.jar}"/>
  @@ -207,6 +219,7 @@
                   <!-- include previously built jars -->
                   <include name="*.jar"/>
               </fileset>
  +            <pathelement location="${core.classes.dir}"/>
           </path>
   
                <!-- Define the xdoclet task -->
  @@ -226,6 +239,15 @@
   
           </xdoclet>
   
  +    </target>
  +
  +    <!-- =================================================================== -->
  +    <!-- Builds the xdoclet module, which contains the externalizer          -->
  +    <!-- =================================================================== -->
  +    <target name="build-externalizer" depends="compile">
  +        <echo>*** Building xdoclet module... ***</echo>
  +        <ant dir="${modules.dir}/xdoclet"/>
  +        <echo>*** Building xdoclet module done. ***</echo>
       </target>
   
   </project>
  
  
  

_______________________________________________________________

Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm

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

Reply via email to