hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-hivemind/hivebuild dependency.xml jar-module.xml hivedoc-report.xml
Date Sat, 21 Aug 2004 17:43:18 GMT
hlship      2004/08/21 10:43:18

  Modified:    hivebuild dependency.xml jar-module.xml hivedoc-report.xml
  Log:
  Change how the module-lib directory is structured, to allow for artifacts with similar names
to not overrwrite each other.
  
  Revision  Changes    Path
  1.7       +4 -4      jakarta-hivemind/hivebuild/dependency.xml
  
  Index: dependency.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/dependency.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dependency.xml	18 Aug 2004 22:48:23 -0000	1.6
  +++ dependency.xml	21 Aug 2004 17:43:17 -0000	1.7
  @@ -75,15 +75,15 @@
       <attribute name="use" description="Subdirectory to copy to."/>
       
       <sequential>
  -      <mkdir dir="${module.lib.dir}/@{use}"/>
  -      <copy file="@{fromdir}/@{artifact}-@{version}.jar" todir="${module.lib.dir}/@{use}"
verbose="true"/>
  +      <mkdir dir="${module.lib.dir}/@{use}/@{artifact}"/>
  +      <copy file="@{fromdir}/@{artifact}-@{version}.jar" todir="${module.lib.dir}/@{use}/@{artifact}"
verbose="true"/>
         
         <!-- Delete versions in the wrong directory, or out of date versions. -->
         
         <delete verbose="true">
           <fileset dir="${module.lib.dir}">
  -          <exclude name="@{use}/@{artifact}-@{version}.jar"/>
  -          <include name="**/@{artifact}-*.jar"/>
  +          <exclude name="@{use}/@{artifact}/@{artifact}-@{version}.jar"/>
  +          <include name="**/@{artifact}/@{artifact}-*.jar"/>
           </fileset>
         </delete>
         
  
  
  
  1.9       +4 -4      jakarta-hivemind/hivebuild/jar-module.xml
  
  Index: jar-module.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jar-module.xml	18 Aug 2004 22:48:23 -0000	1.8
  +++ jar-module.xml	21 Aug 2004 17:43:17 -0000	1.9
  @@ -30,21 +30,21 @@
   	<!-- The default classpath for compilation is all external package JARs. -->
   	
   	<path id="default.compile.classpath">
  -			<fileset dir="${module.lib.dir}/compile" includes="*.jar"/>
  +			<fileset dir="${module.lib.dir}/compile" includes="**/*.jar"/>
   	</path>
   	
   	<path id="default.test-compile.classpath">
   		<path refid="default.compile.classpath"/>
   		<path location="${java.classes.dir}"/>
  -		<fileset dir="${module.lib.dir}/test" includes="*.jar"/>
  +		<fileset dir="${module.lib.dir}/test" includes="**/*.jar"/>
   	</path>
   	
   	<path id="default.test.classpath">
   		<path refid="default.test-compile.classpath"/>
   		<pathelement location="${test.classes.dir}"/>
       <fileset dir="${module.lib.dir}">
  -      <include name="run/*.jar"/>
  -      <include name="test/*.jar"/>
  +      <include name="run/**/*.jar"/>
  +      <include name="test/**/*.jar"/>
       </fileset>
   		
   		<!-- To pick up any classpath resources. -->
  
  
  
  1.3       +2 -2      jakarta-hivemind/hivebuild/hivedoc-report.xml
  
  Index: hivedoc-report.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/hivedoc-report.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- hivedoc-report.xml	20 Jul 2004 17:27:07 -0000	1.2
  +++ hivedoc-report.xml	21 Aug 2004 17:43:17 -0000	1.3
  @@ -27,7 +27,7 @@
   			<include name="*.jar"/>
   		</fileset>
   		<fileset dir="${external.lib.dir}">
  -			<include name="*.jar"/>
  +			<include name="**/*.jar"/>
   		</fileset>
   	</path>
   	
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org


Mime
View raw message