avalon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Antoine Lévy-Lambert <anto...@antbuild.com>
Subject [Fwd: [GUMP][PATCH] this should make avalon compile in Gump]
Date Mon, 01 Mar 2004 22:32:21 GMT
Can someone please check in the patch of Stefan ?

Thanks in advance.

Antoine

-------- Original Message --------
Subject: 	[GUMP][PATCH] this should make avalon compile in Gump
Date: 	Mon, 01 Mar 2004 15:26:00 +0100
From: 	Stefan Bodewig <bodewig@apache.org>
Reply-To: 	Gump code and data <general@gump.apache.org>
CC: 	general@gump.apache.org



Hi,

when I looked at the difference between the builds on LSD and those on
gump.covalent.net I was simply searching for the wrong thing, sorry.
Whether framework/target/classes exists at the start of compilation or
not is completely irrelevant as there is never anything getting
compiled to that directory anyway.

The rsync command used by "traditional" Gump doesn't remove
directories that are listed in .cvsignore and thus compiled the tests
against some old classes that have been compiled before you
restructured your build system.  LSD either uses a different rsync
command line or simply has been set up aftre you've changed your
setup.

It turns out that none of the directories listed in <work> entries
actually gets used.  And the ones that are really needed are missing.

The appended patch should fix the problems and enable avalon's build
inside Gump on LSD.

Cheers

        Stefan

--- cache/http___cvs.apache.org_viewcvs.cgi__checkout__avalon_buildsystem_gump-integration_project_avalon.xml.xml
Mon Mar  1 09:19:56 2004
+++ project/avalon.xml	Mon Mar  1 15:16:01 2004
@@ -12,8 +12,11 @@
         because we go from 1 to multiple jars. This is a copied
         descriptor. -->
 
+        <mkdir dir="framework/api/target/classes"/>
+        <mkdir dir="framework/api/target/test-classes"/>
+        <mkdir dir="framework/impl/target/classes"/>
+        <mkdir dir="framework/impl/target/test-classes"/>
         <package>org.apache.avalon</package>
-        <mkdir dir="framework/target/classes"/>
         <ant basedir="framework" target="dist">
             <property name="project.version" value="@@DATE@@"/>
         </ant>
@@ -26,14 +29,14 @@
         <depend project="jakarta-log4j" runtime="true"/>
         <depend project="avalon-logkit" runtime="true"/>
 
-        <work nested="framework/target/classes"/>
-        <work nested="framework/target/api-classes"/>
-        <work nested="framework/target/impl-classes"/>
-        <work nested="framework/target/test-classes"/>
+        <work nested="framework/api/target/classes"/>
+        <work nested="framework/api/target/test-classes"/>
+        <work nested="framework/impl/target/classes"/>
+        <work nested="framework/impl/target/test-classes"/>
 
         <home nested="framework"/>
         <jar id="combined" name="target/avalon-framework-@@DATE@@.jar"/>
-        <javadoc nested="framework/target/docs/apidocs"/>
+        <javadoc nested="framework/api/target/docs/apidocs"/>
 
         <nag from="Gump Integration Build &lt;dev@avalon.apache.org&gt;" to="dev@avalon.apache.org"/>
     </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org





---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org


Mime
View raw message