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 hivebuild.properties hivedoc-report.xml jar-module.properties
Date Tue, 20 Jul 2004 17:27:08 GMT
hlship      2004/07/20 10:27:08

  Modified:    hivebuild dependency.xml jar-module.xml hivebuild.properties
                        hivedoc-report.xml jar-module.properties
  Log:
  Rework some parts of hivebuild for bette reuse outside of HiveMind.
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-hivemind/hivebuild/dependency.xml
  
  Index: dependency.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/dependency.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dependency.xml	11 Jul 2004 17:14:43 -0000	1.1
  +++ dependency.xml	20 Jul 2004 17:27:07 -0000	1.2
  @@ -124,7 +124,7 @@
   		
   		<sequential>
   			<safe-copy
  -					file="${jar.target.dir}/@{name}-@{version}.@{extension}"
  +					file="${project.target.dir}/@{name}-@{version}.@{extension}"
   					dir="${module.lib.dir}/@{use}"/>					
   		</sequential>	
   	</macrodef>
  
  
  
  1.2       +9 -11     jakarta-hivemind/hivebuild/jar-module.xml
  
  Index: jar-module.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jar-module.xml	11 Jul 2004 17:14:43 -0000	1.1
  +++ jar-module.xml	20 Jul 2004 17:27:07 -0000	1.2
  @@ -1,5 +1,4 @@
   <?xml version="1.0"?>
  -<!-- $Id$ -->
   <!-- 
      Copyright 2004 The Apache Software Foundation
   
  @@ -31,22 +30,19 @@
   	<!-- The default classpath for compilation is all external package JARs. -->
   	
   	<path id="default.compile.classpath">
  -			<fileset dir="${module.lib.dir}/compile">
  -				<include name="*.jar"/>	
  -			</fileset>
  +			<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">
  -			<include name="*.jar"/>	
  -		</fileset>
  +		<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}/run" includes="*.jar"/>
   		
   		<!-- To pick up any classpath resources. -->
   		
  @@ -222,15 +218,14 @@
   		
   		<fail unless="module.name" message="Property module.name must be set."/>
   		
  -		<property name="complete-jar-path" value="${jar.target.dir}/${module.name}-${project.version}.jar"/>
  +		<property name="complete-jar-path" value="${module.install.dir}/${module.name}-${project.version}.jar"/>
   		
  -		<mkdir dir="${jar.target.dir}"/>
  +		<mkdir dir="${module.install.dir}"/>
   		
   		<announce message="Packaging as ${complete-jar-path} ..."/>
   
   		<jar
  -				destfile="${complete-jar-path}"
  -				index="yes">
  +				destfile="${complete-jar-path}" index="yes">
   				<fileset dir="${descriptor.src.dir}"/>
   				<fileset dir="${java.classes.dir}"/>
   		</jar>
  @@ -271,4 +266,7 @@
   	<target name="install" depends="jar" 
   		description="Synonym for 'jar' invoked by the containing project."/>
   			
  +  <target name="clean-libs" description="Delete module's library directory (useful when
dependencies have been changed).">
  +    <delete dir="${module.lib.dir}" quiet="true"/>
  +  </target>
   </project>
  
  
  
  1.2       +0 -5      jakarta-hivemind/hivebuild/hivebuild.properties
  
  Index: hivebuild.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/hivebuild.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hivebuild.properties	11 Jul 2004 17:14:43 -0000	1.1
  +++ hivebuild.properties	20 Jul 2004 17:27:07 -0000	1.2
  @@ -95,11 +95,6 @@
   
   descriptor.src.dir=${src.dir}/descriptor
   
  -# Directory into which packaged JARs (or other archives) should be copied.
  -# This may be overriden when creating a distribution.
  -
  -jar.target.dir=${project.target.dir}
  -
   # Note: project.version is defined in ${root.dir}/version.properties
   
   # Project-level directory for documentation. Modules copy into this directory,
  
  
  
  1.2       +9 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hivedoc-report.xml	11 Jul 2004 17:14:43 -0000	1.1
  +++ hivedoc-report.xml	20 Jul 2004 17:27:07 -0000	1.2
  @@ -35,13 +35,20 @@
   	<macrodef name="hivedoc-report">
   		<attribute name="doc-path-id" default="default.hivedoc.classpath"
   				description="Path defining the files to obtain deployment descriptors from."/>
  -		
  +						
   		<attribute name="taskdef-path-id" default="default.hivedoc.classpath"
   				description="Path containing the master HiveMind module, which contains the Ant tasks."/>
   				
   		<sequential>
   			<announce message="Building Master Registry ..."/>
   
  +      <!-- The doc-path has to include the master module, which is also the source of
  +           the taskdefs. -->
  +           
  +<pathconvert property="hivedoc.path.text" refid="@{doc-path-id}" pathsep=" - "/>
  +<echo>HiveDoc classpath: ${hivedoc.path.text}</echo>
  +
  +           
   			<taskdef resource="hivemind-tasks.properties">
   				<classpath refid="@{taskdef-path-id}"/>	
   			</taskdef>
  
  
  
  1.2       +3 -0      jakarta-hivemind/hivebuild/jar-module.properties
  
  Index: jar-module.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jar-module.properties	11 Jul 2004 17:14:43 -0000	1.1
  +++ jar-module.properties	20 Jul 2004 17:27:07 -0000	1.2
  @@ -40,4 +40,7 @@
   module.javac-test.source=${module.javac.source}
   module.javac-test.listfiles=${module.javac.listfiles}
   
  +# Directorty into which the module's jar should be installed.
  +
  +module.install.dir=${project.target.dir}
   
  
  
  

---------------------------------------------------------------------
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