User: vharcq  
  Date: 02/04/29 14:44:06

  Modified:    modules/script Tag: MODULE_REFACTORING_BRANCH
                        build-common.xml build.xml
  Log:
  Include temapltes files in xdoclet-modules.jar
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +21 -19    xdoclet/modules/script/Attic/build-common.xml
  
  Index: build-common.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/modules/script/Attic/build-common.xml,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -w -r1.1.2.4 -r1.1.2.5
  --- build-common.xml  29 Apr 2002 19:54:56 -0000      1.1.2.4
  +++ build-common.xml  29 Apr 2002 21:44:06 -0000      1.1.2.5
  @@ -126,20 +126,22 @@
      <!-- =================================================================== -->
      <target name="jar" depends="compile,xdoclet-xml">
   
  -<!-- TODO when moved
         <copy todir="${output.classes.dir}">
  -         <fileset dir="${resources.dir}"/>
  +            <fileset dir="${src.dir}">
  +                <include name="**/resources/*.xdt" />
  +                <include name="**/resources/*.j" />
  +            </fileset>
         </copy>
   
  -      <copy todir="${output.classes.dir}">
  -         <fileset dir="${config.dir}" />
  -      </copy>
  --->
         <jar  jarfile="${output.lib.dir}/${jar.prefix}${module-name}.jar">
  -        <fileset    dir="${output.classes.dir}"
  -                    includes="**/*.class"/>
  -        <fileset    dir="${output.meta.dir}" 
  -                    includes="**/*.xml"/>
  +            <fileset    dir="${output.classes.dir}">
  +                <include name="**/*.class" />
  +                <include name="**/*.xdt" />
  +                <include name="**/*.j" />
  +            </fileset>
  +            <fileset    dir="${output.meta.dir}"> 
  +                <include name="**/*.xml" />
  +            </fileset>
         </jar>
   
      </target>
  
  
  
  1.1.2.5   +21 -18    xdoclet/modules/script/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/modules/script/Attic/build.xml,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -w -r1.1.2.4 -r1.1.2.5
  --- build.xml 29 Apr 2002 19:54:56 -0000      1.1.2.4
  +++ build.xml 29 Apr 2002 21:44:06 -0000      1.1.2.5
  @@ -20,9 +20,6 @@
           <fileset dir="${root.dir}/lib">
               <include name="*.jar" />
           </fileset>
  -        <fileset dir="${root.dir}/core/dist/lib">
  -            <include name="xdoclet.jar" />
  -        </fileset>
           <!-- We rely on xdoclet (doc) module during the build -->
           <fileset dir="${root.dir}/core/dist/lib">
               <include name="xdoclet.jar" />
  @@ -37,6 +34,8 @@
   
       <patternset id="module-sources">
           <include name="**/*.java"/>
  +        <include name="**/*.xdt"/>
  +        <include name="**/*.j"/>
           <exclude name="**/*.html"/>
       </patternset>
   
  @@ -82,11 +81,9 @@
            <fileset dir="${basedir}/web/src">
               <patternset refid="module-sources"/>
            </fileset>
  -         <!--
            <fileset dir="${basedir}/xdoclet/src">
               <patternset refid="module-sources"/>
            </fileset>
  -         -->
         </copy>
      </target>
   
  @@ -140,12 +137,18 @@
      <!-- =================================================================== -->
      <target 
         name="jar" 
  -      depends="compile,xdoclet-xml,all-modules"
  +        depends="compile,xdoclet-xml"
         description="Makes the jar containing all modules"
      >
  +        <!-- depends="compile,xdoclet-xml,all-modules" -->
         <mkdir dir="${output.lib.dir}"/>
  +      
         <jar jarfile="${output.jar.file}">
            <fileset dir="${output.classes.dir}"/>
  +            <fileset dir="${output.java.src.dir}">
  +                <include name="**/resources/*.xdt" />
  +                <include name="**/resources/*.j" />
  +            </fileset>
         </jar>
      </target>
      
  
  
  

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

Reply via email to