[jboss-cvs] JBossCache ...

[Manik Surtani]

  User: msurtani
  Date: 06/10/24 13:35:56

  Modified:    JBossCache  build.xml
  Log:
  ommitted unnecessary libs being copied to dist zips
  
  Revision  Changes    Path
  1.144     +28 -37    JBossCache/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/build.xml,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -b -r1.143 -r1.144
  --- build.xml	24 Oct 2006 17:22:06 -0000	1.143
  +++ build.xml	24 Oct 2006 17:35:55 -0000	1.144
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<!-- $Id: build.xml,v 1.143 2006/10/24 17:22:06 msurtani Exp $ -->
  +<!-- $Id: build.xml,v 1.144 2006/10/24 17:35:55 msurtani Exp $ -->
   
   <project default="compile" name="JBossCache">
   
  @@ -290,7 +290,7 @@
   
      <target name="jar-retro" description="Builds JDK 1.4.0-compatible jbosscache.jar" depends="jbossretro, manifest-retro">
         <mkdir dir="${dist.lib}"/>
  -      <jar jarfile="${dist.lib}/jboss-cache-JDK140.jar" manifest="${manifest.file}">
  +      <jar jarfile="${dist.lib}/jbosscache-JDK140.jar" manifest="${manifest.file}">
            <fileset dir="${retro.compile.dir}">
               <include name="org/jboss/cache/**"/>
               <exclude name="org/jboss/cache/aop/**"/>
  @@ -1089,15 +1089,6 @@
            </fileset>
         </copy>
   
  -      <copy todir="${tmp.dir}/tests14" filtering="no">
  -         <fileset dir="${retro.compiletest.dir}">
  -            <include name="**/*.class"/>
  -            <exclude name="**/loader/Bdbje*.class"/>
  -            <exclude name="**/aop/**"/>
  -            <exclude name="**/pojo/**"/>
  -         </fileset>
  -      </copy>      
  -
         <copy todir="${tmp.dir}/tests" filtering="no">
            <fileset dir="${functional.tests.dir.50}">
               <include name="**/*.java"/>
  @@ -1123,13 +1114,8 @@
            </fileset>
            <fileset dir="${dist.lib}">
               <include name="jbosscache.jar"/>
  -            <include name="jbosscache-JDK140.jar"/>
               <include name="pojocache.jar"/>
            </fileset>
  -         <fileset dir="${retro.lib.dir}">
  -            <exclude name="jbossretro.jar" />
  -         </fileset>
  -
         </copy>
   
         <copy todir="${tmp.dir}/docs/javadoc" filtering="no">
  @@ -1174,13 +1160,6 @@
            </fileset>
         </copy>
   
  -      <copy todir="${tmp.dir}/lib">
  -         <fileset dir="${retro.lib.dir}">
  -            <exclude name="jbossretro.jar" />
  -         </fileset>
  -      </copy>
  -
  -
         <delete file="${dist.dir}/jboss-cache-core-${module.version}.zip"/>
         <delete file="${dist.dir}/jboss-cache-core-JDK140-${module.version}.zip"/>
         <delete file="${dist.dir}/jboss-cache-pojo-${module.version}.zip"/>
  @@ -1195,12 +1174,6 @@
            </fileset>
         </chmod>
   
  -      <zip zipfile="${dist.dir}/${module.name}-all-${module.version}.zip">
  -         <zipfileset dir="${tmp.dir}" prefix="${module.name}-all-${module.version}" filemode="755">
  -            <include name="**/**"/>
  -         </zipfileset>
  -      </zip>
  -
         <zip zipfile="${dist.dir}/${module.name}-core-${module.version}.zip">
            <zipfileset dir="${tmp.dir}" prefix="${module.name}-core-${module.version}" filemode="755">
               <include name="**/*"/>
  @@ -1208,10 +1181,7 @@
               <exclude name="org/jboss/cache/pojo/**"/>
               <exclude name="src/**"/>
               <exclude name="pojocache*" />
  -            <exclude name="lib/jboss-cache-JDK140.jar"/>
               <exclude name="lib/pojocache.jar"/>
  -            <exclude name="lib/jbossretro*"/>
  -            <exclude name="lib/jboss-backport*"/>
               <exclude name="lib/jboss-aop*.jar"/>
               <exclude name="lib/trove.jar"/>
               <exclude name="lib/qdox.jar"/>
  @@ -1223,19 +1193,14 @@
               <exclude name="docs/faq-pojo/**"/>
               <exclude name="docs/tutorial-pojo/**"/>
               <exclude name="tests/org/jboss/cache/pojo/**"/>
  -            <exclude name="tests14"/>
            </zipfileset>
         </zip>
   
         <zip zipfile="${dist.dir}/${module.name}-pojo-${module.version}.zip">
            <zipfileset dir="${tmp.dir}" prefix="${module.name}-pojo-${module.version}" filemode="755">
               <exclude name="src/**"/>
  -            <exclude name="lib/jboss-cache-JDK140.jar"/>
  -            <exclude name="lib/jbossretro*"/>
  -            <exclude name="lib/jboss-backport*"/>
               <exclude name="examples/annotated14/**"/>
               <exclude name="docs/javadoc/**"/>
  -            <exclude name="tests14"/>
            </zipfileset>
         </zip>
   
  @@ -1245,6 +1210,32 @@
            </zipfileset>
         </zip>
   
  +      <!-- NOW add the retroweaved stuff into the temp dir -->
  +      <copy todir="${tmp.dir}/tests14" filtering="no">
  +         <fileset dir="${retro.compiletest.dir}">
  +            <include name="**/*.class"/>
  +            <exclude name="**/loader/Bdbje*.class"/>
  +            <exclude name="**/aop/**"/>
  +            <exclude name="**/pojo/**"/>
  +         </fileset>
  +      </copy>
  +
  +      <copy todir="${tmp.dir}/lib">
  +         <fileset dir="${retro.lib.dir}" />
  +      </copy>
  +
  +      <copy todir="${tmp.dir}/lib" filtering="no">
  +         <fileset dir="${dist.lib}">
  +            <include name="jbosscache-JDK140.jar"/>
  +         </fileset>
  +      </copy>
  +
  +      <zip zipfile="${dist.dir}/${module.name}-all-${module.version}.zip">
  +         <zipfileset dir="${tmp.dir}" prefix="${module.name}-all-${module.version}" filemode="755">
  +            <include name="**/**"/>
  +         </zipfileset>
  +      </zip>
  +
         <zip zipfile="${dist.dir}/${module.name}-core-JDK140-${module.version}.zip">
            <zipfileset dir="${tmp.dir}" prefix="${module.name}-core-JDK140-${module.version}" filemode="755">
               <include name="**/*"/>