cvs commit: gump/project avalon-tools.xml

2004-08-08 Thread mcconnell
mcconnell2004/08/08 02:06:09

  Modified:project  avalon-tools.xml
  Log:
  Change from sysproperty to property because sysproperties get overriden my gump's 
workspace merge process whcih means we loose the property value setting declared in 
the project.  Gump's ant builder assigns properties *after* the workspace merge which 
menas our setting overrides gumps overide.
  
  Revision  ChangesPath
  1.26  +1 -1  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- avalon-tools.xml  3 Aug 2004 08:08:08 -   1.25
  +++ avalon-tools.xml  8 Aug 2004 09:06:09 -   1.26
  @@ -49,7 +49,7 @@
 !-- for magic --
 property name=magic.home reference=home project=magic/
 property name=gump.signature value=@@DATE@@/
  -  sysproperty name=build.sysclasspath value=last/ !-- testing --
  +  property name=build.sysclasspath value=last/ !-- testing --
 !-- external references --
 depend property=gump.resource.ant project=ant id=ant/
 depend property=gump.resource.junit project=junit/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-09 Thread bodewig
bodewig 2004/07/09 00:43:04

  Modified:project  avalon-tools.xml
  Log:
  Make unit tests work with 'plain' instead of 'black' magic
  
  Revision  ChangesPath
  1.22  +4 -1  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- avalon-tools.xml  9 Jul 2004 05:19:48 -   1.21
  +++ avalon-tools.xml  9 Jul 2004 07:43:04 -   1.22
  @@ -45,11 +45,12 @@
   
 project name=avalon-tools-magic
   license name=central/system/license/LICENSE.TXT/
  +mkdir dir=tools/magic/target/classes/
  +mkdir dir=tools/magic/target/test-classes/
   ant basedir=tools/magic
 !-- for magic --
 property name=magic.home reference=home project=magic/
 property name=gump.signature value=@@DATE@@/
  -  property name=build.sysclasspath value=dark-arts-volume-one/
 !-- external references --
 depend property=gump.resource.ant project=ant id=ant/
 depend property=gump.resource.junit project=junit/
  @@ -58,6 +59,8 @@
 !-- end for --
   /ant
   depend project=magic runtime=true inherit=runtime/ 
  +work nested=tools/magic/target/classes/
  +work nested=tools/magic/target/test-classes/
   home nested=tools/magic/target/deliverables/
   jar name=jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-09 Thread mcconnell
mcconnell2004/07/09 05:19:40

  Modified:project  avalon-tools.xml
  Log:
  Put back the build.sysclasspath override - I need to validate a build with this in 
place before moving forward.
  
  Revision  ChangesPath
  1.23  +1 -4  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- avalon-tools.xml  9 Jul 2004 07:43:04 -   1.22
  +++ avalon-tools.xml  9 Jul 2004 12:19:40 -   1.23
  @@ -45,12 +45,11 @@
   
 project name=avalon-tools-magic
   license name=central/system/license/LICENSE.TXT/
  -mkdir dir=tools/magic/target/classes/
  -mkdir dir=tools/magic/target/test-classes/
   ant basedir=tools/magic
 !-- for magic --
 property name=magic.home reference=home project=magic/
 property name=gump.signature value=@@DATE@@/
  +  property name=build.sysclasspath value=/ !-- testing --
 !-- external references --
 depend property=gump.resource.ant project=ant id=ant/
 depend property=gump.resource.junit project=junit/
  @@ -59,8 +58,6 @@
 !-- end for --
   /ant
   depend project=magic runtime=true inherit=runtime/ 
  -work nested=tools/magic/target/classes/
  -work nested=tools/magic/target/test-classes/
   home nested=tools/magic/target/deliverables/
   jar name=jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: cvs commit: gump/project avalon-tools.xml

2004-07-09 Thread Stefan Bodewig
On Fri, 09 Jul 2004, Stephen McConnell [EMAIL PROTECTED] wrote:

 Just a quick note - I'm putting back in the build.sysclasspath
 override because I need to validate that this is the only remaining
 issue.

It isn't 8-(

The build tries to copy a jar that isn't there:

standard.test:
  [x:junit] Running org.apache.avalon.tools.model.test.ContextTestCase
  [x:junit] Tests run: 19, Failures: 0, Errors: 0, Time elapsed: 0,829 sec

test:

standard.install:

install:

BUILD FAILED
/javastuff/gump/avalon-tools/tools/magic/build.xml:30: Warning: Could not find file 
/javastuff/gump/avalon-tools/tools/magic/target/deliverables/jars/avalon-tools-magic.jar
 to copy.

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: cvs commit: gump/project avalon-tools.xml

2004-07-09 Thread Stephen McConnell
Stefan Bodewig wrote:
On Fri, 09 Jul 2004, Stephen McConnell [EMAIL PROTECTED] wrote:

Just a quick note - I'm putting back in the build.sysclasspath
override because I need to validate that this is the only remaining
issue.

It isn't 8-(
The build tries to copy a jar that isn't there:

BUILD FAILED
/javastuff/gump/avalon-tools/tools/magic/build.xml:30: 
Warning: Could not find file /javastuff/gump/avalon-tools/tools/magic/target/deliverables/jars/avalon-tools-magic.jar to copy.
I know what this is - its not magic - its supplementary stuff I've added 
to make my life easier.  I'll have this fixed in just a moment.

Steve.
--
|---|
| Magic by Merlin   |
| Production by Avalon  |
|   |
| http://avalon.apache.org  |
|---|
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: cvs commit: gump/project avalon-tools.xml

2004-07-09 Thread Stephen McConnell
Stephen McConnell wrote:
Stefan Bodewig wrote:
On Fri, 09 Jul 2004, Stephen McConnell [EMAIL PROTECTED] wrote:

Just a quick note - I'm putting back in the build.sysclasspath
override because I need to validate that this is the only remaining
issue.

It isn't 8-(
The build tries to copy a jar that isn't there:

BUILD FAILED
/javastuff/gump/avalon-tools/tools/magic/build.xml:30: Warning: Could 
not find file 
/javastuff/gump/avalon-tools/tools/magic/target/deliverables/jars/avalon-tools-magic.jar 
to copy.

I know what this is - its not magic - its supplementary stuff I've added 
to make my life easier.  I'll have this fixed in just a moment.

 ... and fixed.
Should have that other email done in a tick.
Cheers, Steve.
Steve.


--
|---|
| Magic by Merlin   |
| Production by Avalon  |
|   |
| http://avalon.apache.org  |
|---|
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


cvs commit: gump/project avalon-tools.xml

2004-07-08 Thread mcconnell
mcconnell2004/07/08 03:16:16

  Modified:project  avalon-tools.xml
  Log:
  Change the ant enclosed dependency to a property and add an explict depend under the 
project scope.  This seems like a more reliable approach as the gump handling of 
depend attributes inside an ant are generating inconsistent results.
  
  Revision  ChangesPath
  1.18  +2 -2  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- avalon-tools.xml  8 Jul 2004 07:26:14 -   1.17
  +++ avalon-tools.xml  8 Jul 2004 10:16:16 -   1.18
  @@ -46,8 +46,7 @@
   ant basedir=tools/magic
 !-- for magic --
 property name=gump.signature value=@@DATE@@/
  -  depend name=magic.home reference=home
  -  project=magic inherit=runtime/
  +  property name=magic.home reference=home project=magic/
 !-- external references --
 depend property=gump.resource.ant project=ant id=ant/
 depend property=gump.resource.junit project=junit/
  @@ -55,6 +54,7 @@
 depend property=gump.resource.ant-nodeps project=ant id=nodeps/
 !-- end for --
   /ant
  +depend project=magic runtime=true inherit=runtime/
   home nested=tools/magic/target/deliverables/
   jar name=jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-08 Thread mcconnell
mcconnell2004/07/08 10:15:44

  Modified:project  avalon-tools.xml
  Log:
  Add work directories to cover the test case execution.
  
  Revision  ChangesPath
  1.20  +2 -0  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- avalon-tools.xml  8 Jul 2004 10:25:24 -   1.19
  +++ avalon-tools.xml  8 Jul 2004 17:15:44 -   1.20
  @@ -30,6 +30,8 @@
   depend project=junit runtime=true/
   depend project=ant runtime=true inherit=runtime/
   !--depend project=ant ids=ant junit nodeps ant-launcher 
runtime=true/--
  +work nested=tools/magic/target/classes/
  +work nested=tools/magic/target/test-classes/
   home nested=tools/magic/target/@@DATE@@/
   jar name=../deliverables/jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-08 Thread mcconnell
mcconnell2004/07/08 22:19:49

  Modified:project  avalon-tools.xml
  Log:
  (I have to try it)
  
  Revision  ChangesPath
  1.21  +1 -0  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- avalon-tools.xml  8 Jul 2004 17:15:44 -   1.20
  +++ avalon-tools.xml  9 Jul 2004 05:19:48 -   1.21
  @@ -49,6 +49,7 @@
 !-- for magic --
 property name=magic.home reference=home project=magic/
 property name=gump.signature value=@@DATE@@/
  +  property name=build.sysclasspath value=dark-arts-volume-one/
 !-- external references --
 depend property=gump.resource.ant project=ant id=ant/
 depend property=gump.resource.junit project=junit/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: cvs commit: gump/project avalon-tools.xml

2004-07-08 Thread Adam R. B. Jack
   Log:
   (I have to try it)

   +  property name=build.sysclasspath
value=dark-arts-volume-one/

Sure, but I wouldn't be surprised if I tried to stop you (when I coded it).
We'll see. :)

regards

Adam


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-07 Thread mcconnell
mcconnell2004/07/07 09:15:50

  Modified:project  avalon-tools.xml
  Log:
  More treaking based on hunches.
  
  Revision  ChangesPath
  1.15  +1 -1  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- avalon-tools.xml  7 Jul 2004 15:50:26 -   1.14
  +++ avalon-tools.xml  7 Jul 2004 16:15:50 -   1.15
  @@ -28,8 +28,8 @@
 property name=gump.signature value=@@DATE@@/
   /ant
   depend project=junit runtime=true/
  +depend project=ant runtime=true inherit=runtime/
   !--depend project=ant ids=ant junit nodeps ant-launcher 
runtime=true/--
  -depend project=ant runtime=true/
   home nested=tools/magic/target/@@DATE@@/
   jar name=../deliverables/jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-06 Thread mcconnell
mcconnell2004/07/05 23:04:02

  Modified:project  avalon-tools.xml
  Log:
  converge home and bootstrap
  
  Revision  ChangesPath
  1.9   +4 -15 gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- avalon-tools.xml  5 Jul 2004 14:41:43 -   1.8
  +++ avalon-tools.xml  6 Jul 2004 06:04:02 -   1.9
  @@ -24,24 +24,13 @@
   
 project name=avalon-tools-magic-bootstrap
   license name=central/system/license/LICENSE.TXT/
  -ant basedir=tools/magic buildfile=bootstrap.xml target=gump
  +ant basedir=tools/magic buildfile=bootstrap.xml target=home
 property name=gump.signature value=@@DATE@@/
   /ant
   depend project=junit runtime=true/
   depend project=ant ids=ant junit nodeps runtime=true/
  -home nested=tools/magic/target/deliverables/
  -jar name=jars/avalon-tools-magic-@@DATE@@.jar/
  -nag to=[EMAIL PROTECTED]
  -   from=Gump Integration lt;[EMAIL PROTECTED]gt;/
  -  /project
  -
  -  project name=avalon-tools-magic-home
  -ant basedir=tools/magic buildfile=bootstrap.xml target=home
  -  property name=gump.signature value=@@DATE@@/
  -/ant
  -depend project=ant/
   home nested=tools/magic/target/@@DATE@@/
  -depend project=avalon-tools-magic-bootstrap inherit=runtime/
  +jar name=../deliverables/jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  from=Gump Integration lt;[EMAIL PROTECTED]gt;/
 /project
  @@ -55,9 +44,9 @@
   license name=central/system/license/LICENSE.TXT/
   ant basedir=tools/magic
 !-- for magic --
  -  property name=magic.home reference=home
  -  project=avalon-tools-magic-home inherit=runtime/
 property name=gump.signature value=@@DATE@@/
  +  depend name=magic.home reference=home
  +  project=avalon-tools-magic-bootstrap inherit=runtime/
 !-- external references --
 depend property=gump.resource.ant project=ant id=ant/
 depend property=gump.resource.junit project=junit/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-06 Thread mcconnell
mcconnell2004/07/06 11:37:23

  Modified:project  avalon-tools.xml
  Log:
  add launcher to bootstrap so that we inherit this downstream
  
  Revision  ChangesPath
  1.10  +1 -1  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- avalon-tools.xml  6 Jul 2004 06:04:02 -   1.9
  +++ avalon-tools.xml  6 Jul 2004 18:37:23 -   1.10
  @@ -28,7 +28,7 @@
 property name=gump.signature value=@@DATE@@/
   /ant
   depend project=junit runtime=true/
  -depend project=ant ids=ant junit nodeps runtime=true/
  +depend project=ant ids=ant junit nodeps launcher runtime=true/
   home nested=tools/magic/target/@@DATE@@/
   jar name=../deliverables/jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-06 Thread mcconnell
mcconnell2004/07/06 19:28:55

  Modified:project  avalon-tools.xml
  Log:
  Update the dependencies to include ant-launcher - not laucher.
  
  Revision  ChangesPath
  1.11  +1 -1  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- avalon-tools.xml  6 Jul 2004 18:37:23 -   1.10
  +++ avalon-tools.xml  7 Jul 2004 02:28:55 -   1.11
  @@ -28,7 +28,7 @@
 property name=gump.signature value=@@DATE@@/
   /ant
   depend project=junit runtime=true/
  -depend project=ant ids=ant junit nodeps launcher runtime=true/
  +depend project=ant ids=ant junit nodeps ant-launcher runtime=true/
   home nested=tools/magic/target/@@DATE@@/
   jar name=../deliverables/jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-06 Thread mcconnell
mcconnell2004/07/06 20:45:25

  Modified:project  avalon-tools.xml
  Log:
  update url
  
  Revision  ChangesPath
  1.13  +1 -1  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- avalon-tools.xml  7 Jul 2004 02:53:13 -   1.12
  +++ avalon-tools.xml  7 Jul 2004 03:45:25 -   1.13
  @@ -16,7 +16,7 @@
   --
   module name=avalon-tools
   
  -  url href=http://avalon.apache.org//
  +  url href=http://avalon.apache.org/central/tools/index.html/
   
 descriptionAvalon Tools./description
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-05 Thread bodewig
bodewig 2004/07/05 02:02:34

  Modified:profile  gump.xml
   project  avalon-tools.xml
  Log:
  Remove Ant 1.5 branch
  
  Revision  ChangesPath
  1.358 +1 -1  gump/profile/gump.xml
  
  Index: gump.xml
  ===
  RCS file: /home/cvs/gump/profile/gump.xml,v
  retrieving revision 1.357
  retrieving revision 1.358
  diff -u -r1.357 -r1.358
  --- gump.xml  5 Jul 2004 08:32:22 -   1.357
  +++ gump.xml  5 Jul 2004 09:02:34 -   1.358
  @@ -19,7 +19,7 @@
   !-- Apache.Ant --
   
 module href=project/ant.xml/
  -  module href=project/ant-1.5.xml/
  +  !--module href=project/ant-1.5.xml/--
 module href=project/ant-antidote.xml/
   
   !-- Apache.Avalon --
  
  
  
  1.5   +1 -3  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- avalon-tools.xml  5 Jul 2004 08:32:22 -   1.4
  +++ avalon-tools.xml  5 Jul 2004 09:02:34 -   1.5
  @@ -28,9 +28,7 @@
 property name=gump.signature value=@@DATE@@/
   /ant
   depend project=junit/
  -depend project=ant id=ant/
  -depend project=ant id=junit/
  -depend project=ant id=nodeps/
  +depend project=ant ids=ant junit nodeps/
   home nested=tools/magic/target/deliverables/
   jar type=boot name=jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-05 Thread bodewig
bodewig 2004/07/05 02:26:26

  Modified:project  avalon-tools.xml
  Log:
  Make sure magic can load Ant
  
  Revision  ChangesPath
  1.6   +4 -4  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- avalon-tools.xml  5 Jul 2004 09:02:34 -   1.5
  +++ avalon-tools.xml  5 Jul 2004 09:26:26 -   1.6
  @@ -27,10 +27,10 @@
   ant basedir=tools/magic buildfile=bootstrap.xml target=gump
 property name=gump.signature value=@@DATE@@/
   /ant
  -depend project=junit/
  -depend project=ant ids=ant junit nodeps/
  +depend project=junit runtime=true/
  +depend project=ant ids=ant junit nodeps runtime=true/
   home nested=tools/magic/target/deliverables/
  -jar type=boot name=jars/avalon-tools-magic-@@DATE@@.jar/
  +jar name=jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  from=Gump Integration lt;[EMAIL PROTECTED]gt;/
 /project
  @@ -56,7 +56,7 @@
 !-- end for --
   /ant
   !-- magic --
  -depend project=avalon-tools-magic-bootstrap inherit=true runtime=true/
  +depend project=avalon-tools-magic-bootstrap inherit=runtime 
runtime=true/
   home nested=tools/magic/target/deliverables/
   jar name=jars/avalon-tools-magic.jar/
   nag to=[EMAIL PROTECTED]
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: cvs commit: gump/project avalon-tools.xml

2004-07-05 Thread Stephen McConnell
[EMAIL PROTECTED] wrote:
  -depend project=junit/
  -depend project=ant ids=ant junit nodeps/
  +depend project=junit runtime=true/
  +depend project=ant ids=ant junit nodeps runtime=true/
Stefan:
The above dependencies are being generated automatically by magic's gump 
task.  Can I assume that the junit, ant, ant-ant, ant-junit, and 
ant-nodeps definitions used by magic can be flagged as ignorable?

 .. i.e. I can update magic to simply not add dependencies that are
flagged with ignore/.  For example:
  resource
info
  groupant/group
  nameant-nodeps/name
  version1.6.1/version
  typejar/type
/info
gump
  ignore/
/gump
  /resource
Sound reasonable?
Steve.
--
|---|
| Magic by Merlin   |
| Production by Avalon  |
|   |
| http://avalon.apache.org  |
|---|
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: cvs commit: gump/project avalon-tools.xml

2004-07-05 Thread Stefan Bodewig
On Mon, 05 Jul 2004, Stephen McConnell [EMAIL PROTECTED] wrote:
 [EMAIL PROTECTED] wrote:
   -depend project=junit/
   -depend project=ant ids=ant junit nodeps/
   +depend project=junit runtime=true/ depend
   +project=ant ids=ant junit nodeps runtime=true/
 
 Stefan:
 
 The above dependencies are being generated automatically by magic's
 gump task.

Your original had three depends elements with id attributes.  Gump
would have ignored the id attribute since it isn't supported at this
level and simply collapsed the three to a dependency on ant.  I
figured you didn't want to depend on all jars ant creates so I
restricted it.

 Can I assume that the junit, ant, ant-ant, ant-junit, and ant-nodeps
 definitions used by magic can be flagged as ignorable?

   .. i.e. I can update magic to simply not add dependencies that are
 flagged with ignore/.

What would that mean in detail?  You most certainly need ant.jar to
build or run magic.

BTW: Putting magic into the bootclasspath doesn't work unless Ant
itself is there as well.  Otherwise your tasks will be loaded by the
primordial class loader and fail to load Task class of Ant since Ant
itself is in a classloader lower down (higher up?) the chain.

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-05 Thread mcconnell
mcconnell2004/07/05 07:01:45

  Modified:project  avalon-tools.xml
  Log:
  Add a project to generate magic.home and update avalon-tools-magic to correspond to 
the current generated version of the gump project descriptor.
  
  Revision  ChangesPath
  1.7   +24 -16gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- avalon-tools.xml  5 Jul 2004 09:26:26 -   1.6
  +++ avalon-tools.xml  5 Jul 2004 14:01:44 -   1.7
  @@ -35,30 +35,38 @@
  from=Gump Integration lt;[EMAIL PROTECTED]gt;/
 /project
   
  +  project name=avalon-tools-magic-home
  +ant basedir=tools/magic buildfile=bootstrap.xml target=home
  +  property name=gump.signature value=@@DATE@@/
  +/ant
  +depend project=ant/
  +home nested=tools/magic/target/@@DATE@@/
  +depend project=avalon-tools-magic-bootstrap inherit=runtime/
  +nag to=[EMAIL PROTECTED]
  +   from=Gump Integration lt;[EMAIL PROTECTED]gt;/
  +  /project
  +
  +  !--
  +  The following definition is generated - PLEASE NO NOT EDIT. It is 
  +  included here as a test of a generated project defintion.
  +  --
  +
 project name=avalon-tools-magic
   license name=central/system/license/LICENSE.TXT/
  -ant basedir=tools/magic debug=true
  +ant basedir=tools/magic
 !-- for magic --
  +  depend name=magic.home resource=home
  +  project=avalon-tools-magic-home inherit=runtime /
 property name=gump.signature value=@@DATE@@/
 !-- external references --
  -  depend property=gump.resource.ant project=ant id=ant
  -noclasspath/
  -  /depend
  -  depend property=gump.resource.junit project=junit
  -noclasspath/
  -  /depend
  -  depend property=gump.resource.ant-junit project=ant id=junit
  -noclasspath/
  -  /depend
  -  depend property=gump.resource.ant-nodeps project=ant id=nodeps
  -noclasspath/
  -  /depend
  +  depend property=gump.resource.ant project=ant/
  +  depend property=gump.resource.junit project=junit/
  +  depend property=gump.resource.ant-junit project=ant id=junit/
  +  depend property=gump.resource.ant-nodeps project=ant id=nodeps/
 !-- end for --
   /ant
  -!-- magic --
  -depend project=avalon-tools-magic-bootstrap inherit=runtime 
runtime=true/
   home nested=tools/magic/target/deliverables/
  -jar name=jars/avalon-tools-magic.jar/
  +jar name=jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  from=Magic Integration lt;[EMAIL PROTECTED]gt;/
 /project
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-05 Thread bodewig
bodewig 2004/07/05 07:41:43

  Modified:project  avalon-tools.xml
  Log:
  Fix some minor issues
  
  Revision  ChangesPath
  1.8   +3 -3  gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- avalon-tools.xml  5 Jul 2004 14:01:44 -   1.7
  +++ avalon-tools.xml  5 Jul 2004 14:41:43 -   1.8
  @@ -55,11 +55,11 @@
   license name=central/system/license/LICENSE.TXT/
   ant basedir=tools/magic
 !-- for magic --
  -  depend name=magic.home resource=home
  -  project=avalon-tools-magic-home inherit=runtime /
  +  property name=magic.home reference=home
  +  project=avalon-tools-magic-home inherit=runtime/
 property name=gump.signature value=@@DATE@@/
 !-- external references --
  -  depend property=gump.resource.ant project=ant/
  +  depend property=gump.resource.ant project=ant id=ant/
 depend property=gump.resource.junit project=junit/
 depend property=gump.resource.ant-junit project=ant id=junit/
 depend property=gump.resource.ant-nodeps project=ant id=nodeps/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: gump/project avalon-tools.xml

2004-07-04 Thread mcconnell
mcconnell2004/07/04 08:36:50

  Modified:project  avalon-tools.xml
  Log:
  Add a build of magic by magic ... should be interesting!
  
  Revision  ChangesPath
  1.3   +29 -1 gump/project/avalon-tools.xml
  
  Index: avalon-tools.xml
  ===
  RCS file: /home/cvs/gump/project/avalon-tools.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- avalon-tools.xml  4 Jul 2004 09:17:38 -   1.2
  +++ avalon-tools.xml  4 Jul 2004 15:36:50 -   1.3
  @@ -24,7 +24,7 @@
   
 project name=avalon-tools-magic-bootstrap
   license name=central/system/license/LICENSE.TXT/
  -ant basedir=tools/magic buildfile=bootstrap.xml target=gump
  +ant basedir=tools/magic buildfile=bootstrap.xml target=gump
 property name=gump.signature value=@@DATE@@/
   /ant
   depend project=junit/
  @@ -35,6 +35,34 @@
   jar type=boot name=jars/avalon-tools-magic-@@DATE@@.jar/
   nag to=[EMAIL PROTECTED]
  from=Gump Integration lt;[EMAIL PROTECTED]gt;/
  +  /project
  +
  +  project name=avalon-tools-magic
  +license name=central/system/license/LICENSE.TXT/
  +ant basedir=tools/magic debug=true
  +  !-- for magic --
  +  property name=gump.signature value=@@DATE@@/
  +  !-- external references --
  +  depend property=gump.resource.ant project=ant id=ant
  +noclasspath/
  +  /depend
  +  depend property=gump.resource.junit project=junit
  +noclasspath/
  +  /depend
  +  depend property=gump.resource.ant-junit project=ant id=junit
  +noclasspath/
  +  /depend
  +  depend property=gump.resource.ant-nodeps project=ant id=nodeps
  +noclasspath/
  +  /depend
  +  !-- end for --
  +/ant
  +!-- magic --
  +depend project=avalon-tools-magic-bootstrap inherit=true runtime=true/
  +home nested=tools/magic/target/deliverables/
  +jar name=jars/avalon-tools-magic.jar/
  +nag to=[EMAIL PROTECTED]
  +   from=Magic Integration lt;[EMAIL PROTECTED]gt;/
 /project
   
   /module
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]