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

  Modified:    .        Tag: 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  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +21 -33    jbosscx/Attic/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/jbosscx/Attic/build.sh,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- build.sh  2001/08/01 06:28:40     1.1.2.3
  +++ build.sh  2001/08/01 22:01:53     1.1.2.4
  @@ -23,7 +23,7 @@
   ##                                                                          ##
   ### ====================================================================== ###
   
  -# $Id: build.sh,v 1.1.2.3 2001/08/01 06:28:40 user57 Exp $
  +# $Id: build.sh,v 1.1.2.4 2001/08/01 22:01:53 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.2.6   +8 -5      jbosscx/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosscx/Attic/build.xml,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- build.xml 2001/07/31 21:36:43     1.1.2.5
  +++ build.xml 2001/08/01 22:01:53     1.1.2.6
  @@ -10,7 +10,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.1.2.5 2001/07/31 21:36:43 user57 Exp $ -->
  +<!-- $Id: build.xml,v 1.1.2.6 2001/08/01 22:01:53 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

Reply via email to