[JBoss-dev] CVS update: contrib/varia build.sh build.xml

2001-09-03 Thread Jason Dillon

  User: user57  
  Date: 01/09/03 22:08:08

  Modified:variabuild.sh build.xml
  Log:
   o module release is now a control module pull
   o removed min targets
  
  Revision  ChangesPath
  1.7   +4 -1  contrib/varia/build.sh
  
  Index: build.sh
  ===
  RCS file: /cvsroot/jboss/contrib/varia/build.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.sh  2001/08/28 04:53:11 1.6
  +++ build.sh  2001/09/04 05:08:08 1.7
  @@ -8,12 +8,15 @@
   ##  ##
   ### == ###
   
  -# $Id: build.sh,v 1.6 2001/08/28 04:53:11 user57 Exp $
  +# $Id: build.sh,v 1.7 2001/09/04 05:08:08 user57 Exp $
   
   PROGNAME=`basename $0`
   DIRNAME=`dirname $0`
   GREP=grep
   ROOT=/
  +
  +# Ignore user's ANT_HOME if it is set
  +ANT_HOME=
   
   # the default search path for ant
   ANT_SEARCH_PATH=\
  
  
  
  1.7   +10 -74contrib/varia/build.xml
  
  Index: build.xml
  ===
  RCS file: /cvsroot/jboss/contrib/varia/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml 2001/08/27 09:01:37 1.6
  +++ build.xml 2001/09/04 05:08:08 1.7
  @@ -10,9 +10,9 @@
   !----
   !-- == --
   
  -!-- $Id: build.xml,v 1.6 2001/08/27 09:01:37 user57 Exp $ --
  +!-- $Id: build.xml,v 1.7 2001/09/04 05:08:08 user57 Exp $ --
   
  -project default=main
  +project default=main name=JBoss Plugins/Varia
   
 !-- == --
 !-- Initialization --
  @@ -267,7 +267,7 @@
 !-- Override JUnit defaults --
 property name=junit.timeout value=24/ !-- 4 minutes --
 property name=junit.batchtest.todir value=${build.reports}/
  -  property name=junit.jvm.options value=-client/
  +  property name=junit.jvm.options value=-Ddummy/
   
 !-- RMIC should generate stubs compatible with Java 1.2+ --
 property name=rmic.stubVersion value=1.2/
  @@ -288,27 +288,9 @@
 !-- Where release generated files will go --
 property name=release.id value=${module.name}-${module.version}-${build.id}/
 property name=release.root value=${module.release}/${release.id}/
  +  property name=release.archive.basename 
value=${module.release}/${release.id}/
   
  -  property name=release.bin value=${release.root}/bin/
  -  property name=release.client value=${release.root}/client/
  -  property name=release.conf value=${release.root}/conf/
  -  property name=release.conf.default value=${release.conf}/default/
  -  property name=release.db value=${release.root}/db/
  -  property name=release.deploy value=${release.root}/deploy/
  -  property name=release.deploy.lib value=${release.deploy}/lib/
  -  property name=release.lib value=${release.root}/lib/
  -  property name=release.lib.ext value=${release.lib}/ext/
  -  property name=release.log value=${release.root}/log/
  -  property name=release.tmp value=${release.root}/tmp/
  -
  -  !-- Documentation and examples --
  -  property name=release.docs value=${release.root}/docs/
  -  property name=release.examples value=${release.docs}/examples/
  -  property name=release.api value=${release.docs}/api/
  -  property name=release.module.docs value=${release.docs}/${module.name}/
  -  property name=release.module.api value=${release.api}/${module.name}/
   
  -
 !-- == --
 !-- Compile--
 !-- == --
  @@ -478,63 +460,20 @@
 !-- Builds a release distribution. --
 !-- == --
   
  -  target name=release depends=all, release-dependencies
  +  target name=release depends=all
  description=Builds a release distribution.
  -!-- Copy the generated libraries (lib/ext) --
  -mkdir dir=${release.lib.ext}/
  -copy todir=${release.lib.ext} filtering=no
  -  fileset dir=${build.jars}
  - include name=**/
  -  /fileset
  -/copy
  -
  -!-- Copy the generated javadocs (docs/api/module) --
  -mkdir dir=${release.module.api}/
  -copy todir=${release.module.api} filtering=no
  -  fileset dir=${build.api}
  +!-- Copy the output directory to the release directory --
  +mkdir dir=${release.root}/
  +copy todir=${release.root} filtering=no
  +  fileset dir=${module.build}
include name=**/*/
  + exclude 

[JBoss-dev] CVS update: contrib/varia build.sh build.xml

2001-08-01 Thread Jason Dillon

  User: user57  
  Date: 01/08/01 15:01:55

  Modified:variaTag: jboss_buildmagic build.sh build.xml
  Log:
   o using explict classpath to load buildmagic-tasks.jar to allow the usage of
 any install of ant v1.3.  note, that this locks the module  plugin
 structure relative to the tools directory.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.1.1.2.2 +21 -33contrib/varia/build.sh
  
  Index: build.sh
  ===
  RCS file: /cvsroot/jboss/contrib/varia/build.sh,v
  retrieving revision 1.1.1.1.2.1
  retrieving revision 1.1.1.1.2.2
  diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
  --- build.sh  2001/08/01 06:28:41 1.1.1.1.2.1
  +++ build.sh  2001/08/01 22:01:55 1.1.1.1.2.2
  @@ -23,7 +23,7 @@
   ##  ##
   ### == ###
   
  -# $Id: build.sh,v 1.1.1.1.2.1 2001/08/01 06:28:41 user57 Exp $
  +# $Id: build.sh,v 1.1.1.1.2.2 2001/08/01 22:01:55 user57 Exp $
   
   PROGNAME=`basename $0`
   DIRNAME=`dirname $0`
  @@ -87,39 +87,27 @@
   # if there is a build config file. then source it
   maybe_source $DIRNAME/build.conf $HOME/.build.conf
   
  -# try our best to find ANT
  -if [ x$ANT = x ]; then
  - found=
  - 
  - if [ x$ANT_HOME != x ]; then
  - ANT=$ANT_HOME/bin/ant
  - if [ -x $ANT ]; then
  - found=true
  - fi
  - else
  - # try the search path
  - ANT=`search $ANT_SEARCH_PATH`
  - target=build
  - _cwd=`pwd`
  -
  - while [ x$ANT = x ]  [ $cwd != $ROOT ]; do
  - cd ..
  - cwd=`pwd`
  - ANT=`search $ANT_SEARCH_PATH`
  - done
  -
  - # make sure we get back
  - cd $_cwd
  -
  - if [ $cwd != $ROOT ]; then
  - found=true
  - fi
  - fi
  +# try the search path
  +ANT=`search $ANT_SEARCH_PATH`
  +target=build
  +_cwd=`pwd`
  +
  +while [ x$ANT = x ]  [ $cwd != $ROOT ]; do
  + cd ..
  + cwd=`pwd`
  + ANT=`search $ANT_SEARCH_PATH`
  +done
   
  - # complain if we did not find anything
  - if [ $found != true ]; then
  - die Could not locate Ant; check \$ANT or \$ANT_HOME.
  - fi
  +# make sure we get back
  +cd $_cwd
  +
  +if [ $cwd != $ROOT ]; then
  + found=true
  +fi
  +
  +# complain if we did not find anything
  +if [ $found != true ]; then
  + die Could not locate Ant; check \$ANT or \$ANT_HOME.
   fi
   
   # make sure we have one
  
  
  
  1.1.1.1.2.2 +8 -5  contrib/varia/build.xml
  
  Index: build.xml
  ===
  RCS file: /cvsroot/jboss/contrib/varia/build.xml,v
  retrieving revision 1.1.1.1.2.1
  retrieving revision 1.1.1.1.2.2
  diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
  --- build.xml 2001/08/01 06:59:27 1.1.1.1.2.1
  +++ build.xml 2001/08/01 22:01:55 1.1.1.1.2.2
  @@ -10,7 +10,7 @@
   !----
   !-- == --
   
  -!-- $Id: build.xml,v 1.1.1.1.2.1 2001/08/01 06:59:27 user57 Exp $ --
  +!-- $Id: build.xml,v 1.1.1.1.2.2 2001/08/01 22:01:55 user57 Exp $ --
   
   project default=main
   
  @@ -20,11 +20,14 @@
   
 !-- 
|  Load Buildmagic Ant extentions. 
  - |
  - |  To keep the build system as simple as possible these extension tasks
  - |  must already be on the ant or system classpath.
   --
  -  taskdef name=taskdef classname=planet57.tools.buildmagic.task.Taskdef/
  +  property name=planet57.buildmagic.root
  + value=../../tools/planet57/buildmagic/
  +  property name=planet57.buildmagic.lib 
  + value=${planet57.buildmagic.root}/lib/
  +  taskdef name=taskdef 
  +classname=planet57.tools.buildmagic.task.Taskdef
  +classpath=${planet57.buildmagic.lib}/buildmagic-tasks.jar/
 taskdef resource=planet57/tools/buildmagic/task/autoload.properties/
   
 !--
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development