User: user57  
  Date: 01/12/05 18:16:06

  Modified:    jboss    build.bat build.sh build.xml
  Log:
   o adding support for resource:// url
   o moved common buildmagic initialization, release, help and other bits
     into a common.xml resource file.
   o dropped _configure* targets, replaced with one single configure target
   o dropped *most* tests (junit related) targets (some are still there)
     need to come up with a general stradegy on this to go anyfurther.
   o build systems now MUST be executed from the build.sh or build.bat scripts
     this will help reduce problems by users using ant by itself (with out the
     proper version of libraries... for users that want to get around this
     let me know).
   o fixed local.properties install everywhere
   o build.log should be deleted properly now on win32 systems, or at least
     if the delete failes it will not cause the build to fail.
  
  Revision  Changes    Path
  1.7       +2 -2      build/jboss/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /cvsroot/jboss/build/jboss/build.bat,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.bat 2001/09/12 00:49:54     1.6
  +++ build.bat 2001/12/06 02:16:06     1.7
  @@ -8,7 +8,7 @@
   REM
   REM  ======================================================================
   REM
  -REM $Id: build.bat,v 1.6 2001/09/12 00:49:54 user57 Exp $
  +REM $Id: build.bat,v 1.7 2001/12/06 02:16:06 user57 Exp $
   REM
   REM Authors:
   REM     Jason Dillon <[EMAIL PROTECTED]>
  @@ -32,7 +32,7 @@
   REM set JAXP_DOM_FACTORY=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
   REM set JAXP_SAX_FACTORY=org.apache.xerces.jaxp.SAXParserFactoryImpl
   
  -set ANT_OPTS=-Djavax.xml.parsers.DocumentBuilderFactory=%JAXP_DOM_FACTORY% 
-Djavax.xml.parsers.SAXParserFactory=%JAXP_SAX_FACTORY%
  +set ANT_OPTS=-Djava.protocol.handler.pkgs=planet57.net.protocol 
-Djavax.xml.parsers.DocumentBuilderFactory=%JAXP_DOM_FACTORY% 
-Djavax.xml.parsers.SAXParserFactory=%JAXP_SAX_FACTORY% -Dbuild.script=build.bat
   
   REM ******************************************************
   REM - "for" loops have been unrolled for compatibility
  
  
  
  1.7       +15 -2     build/jboss/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/build/jboss/build.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.sh  2001/09/04 05:08:06     1.6
  +++ build.sh  2001/12/06 02:16:06     1.7
  @@ -8,7 +8,7 @@
   ##                                                                          ##
   ### ====================================================================== ###
   
  -# $Id: build.sh,v 1.6 2001/09/04 05:08:06 user57 Exp $
  +# $Id: build.sh,v 1.7 2001/12/06 02:16:06 user57 Exp $
   
   PROGNAME=`basename $0`
   DIRNAME=`dirname $0`
  @@ -129,12 +129,25 @@
        ANT_OPTS="$ANT_OPTS -Djavax.xml.parsers.SAXParserFactory=$JAXP_SAX_FACTORY"
       fi
   
  +    # need to specify planet57/buildmagic protocol handler package
  +    ANT_OPTS="$ANT_OPTS -Djava.protocol.handler.pkgs=planet57.net.protocol"
  +
  +    # setup some build properties
  +    ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
  +
       # change to the directory where the script lives so users are not forced
       # to be in the same directory as build.xml
       cd $DIRNAME
   
  +    # export some stuff for ant
       export ANT ANT_HOME ANT_OPTS
  -    exec $ANT $ANT_OPTIONS "$@"
  +
  +    # execute in debug mode, or simply execute
  +    if [ "x$ANT_DEBUG" != "x" ]; then
  +     /bin/sh -x $ANT $ANT_OPTIONS "$@"
  +    else
  +     exec $ANT $ANT_OPTIONS "$@"
  +    fi
   }
   
   ##
  
  
  
  1.52      +130 -358  build/jboss/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/build/jboss/build.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- build.xml 2001/11/27 00:15:27     1.51
  +++ build.xml 2001/12/06 02:16:06     1.52
  @@ -1,5 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<!DOCTYPE project>
  +<!DOCTYPE project [
  +  <!ENTITY buildmagic SYSTEM "resource://planet57/tools/buildmagic/common.xml">
  +]>
   
   <!-- ====================================================================== -->
   <!--                                                                        -->
  @@ -10,126 +12,54 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.51 2001/11/27 00:15:27 peter_f Exp $ -->
  +<!-- $Id: build.xml,v 1.52 2001/12/06 02:16:06 user57 Exp $ -->
   
   <project default="main" name="JBoss/Build">
   
     <!-- ================================================================== -->
  +  <!-- Setup                                                              -->
  +  <!-- ================================================================== -->
  +
  +  <!--
  +     | Include the common Buildmagic elements.
  +     |
  +     | This defines several different targets, properties and paths.
  +     | It also sets up the basic extention tasks amoung other things.
  +   -->
  +
  +  &buildmagic;
  +
  +
  +  <!-- ================================================================== -->
     <!-- Initialization                                                     -->
     <!-- ================================================================== -->
   
  -  <!-- Load Buildmagic extention tasks. -->
  -  <taskdef resource="planet57/tools/buildmagic/task/autoload.properties"/>
  -  <taskdef name="property" classname="planet57.tools.buildmagic.task.Property"/>
  -
  -  <!-- Initialize the build system. -->
  -  <target name="init" unless="init.disable">
  -    <!-- Perform any setup required if we are a child of another build -->
  -    <call target="_init-child"/>
  -
  -    <!-- Setup the basic project roots. -->
  -    <path id="project.root"><pathelement location=".."/></path>
  -    <property name="project.root" refid="project.root"/> 
  -    <property name="project.build" value="${project.root}/build"/>
  -  
  -    <!-- Include user and project property overrides. -->
  -    <property file="${user.home}/.buildmagic.properties"/>
  -    <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Setup the project environment. -->
  -    <property file="${project.build}/local.properties"/>
  -    <property name="project.tools" value="${project.root}/tools"/>
  -    <property name="project.thirdparty" value="${project.root}/thirdparty"/>
  -
  -    <!-- Setup the module environment. -->
  -    <property name="module.root" value="${basedir}"/>
  -    <available file="${module.root}/etc/local.properties-example"
  -            property="init.have-local-properties"/>
  -    <call target="_init-local-properties"/>
  -    <property file="${module.root}/local.properties"/>
  -    <property name="module.source" value="${module.root}/src"/>
  -    <property name="module.output" value="${module.root}/output"/>
  -    <property name="module.tools" value="${module.root}/tools"/>
  -    <property name="module.thirdparty" value="${module.root}/thirdparty"/>
  -
  -    <!-- Setup the build.log -->
  -    <call target="_init-buildlog"/>
  -
  -    <!-- Load common properties -->
  -    <property resource="planet57/tools/buildmagic/common.properties"/>
  -
  -    <!-- Setup the build timestamp & build identifer properties -->
  -    <tstamp>
  -      <format property="build.number" pattern="yyyyMMddHHmm"/>
  -    </tstamp>
  -    <property name="build.id" value="${build.number}"/>
  -
  -    <!-- Invoke the configure task -->
  -    <call target="_configure"/>
  -
  -    <!-- Late bind properties & install filters -->
  -    <resolver force="${buildmagic.resolveproperties.force}"/>
  -    <propertyfilter all="${buildmagic.propertyfilter.all}"/>
  -
  -    <!-- Show some information -->
  -    <call target="_init-show-environment"/>
  -
  -    <!-- Finish up -->
  -    <property name="init.disable" value="true"/>
  -  </target>
  -
  -  <!-- Perform any setup required if we are a child of another build -->
  -  <target name="_init-child" if="init.have-parent">
  -    <!-- Disable the build.log, our parent will catch it -->
  -    <property name="init-buildlog.disable" value="true"/>
  -  </target>
  -
  -  <!-- Install the local.properties example if it is there -->
  -  <target name="_init-local-properties" if="init.have-local-properties">
  -    <!-- Setup the local.properties file as needed -->
  -    <copy file="${module.root}/etc/local.properties-example"
  -          tofile="${module.root}/local.properties" filtering="yes"/>
  -    <property file="${module.root}/local.properties"/>
  -  </target>
  -
  -  <!-- Initialize the build.log -->
  -  <target name="_init-buildlog" unless="init-buildlog.disable">
  -    <record name="${basedir}/build.log" append="no" loglevel="info"/>
  -    <property name="init-buildlog.disable" value="true"/>
  -  </target>
  -
  -  <!-- Show the running environment if -Dinit.verbose=true -->
  -  <target name="_init-show-environment" if="init.verbose">
  -    <echo><![CDATA[
  -project.root:    ${project.root}
  -module.root:     ${module.root}
  -user.home:       ${user.home}
  -build.compiler:  ${build.compiler}
  -java.home:       ${java.home}
  -java.class.path: ${java.class.path}
  -java.version:    ${java.version}
  -java.vendor:     ${java.vendor}
  -java.vm.version: ${java.vm.version}
  -java.vm.name:    ${java.vm.name}
  -java.vm.info:    ${java.vm.info}
  -os.name:         ${os.name}
  -os.arch:         ${os.arch}
  -os.version:      ${os.version}
  -]]></echo>
  +  <!--
  +     | Initialize the build system.  Must depend on '_buildmagic:init'.  
  +     | Other targets should depend on 'init' or things will mysteriously fail.
  +   -->
  +
  +  <target name="init" unless="init.disable" depends="_buildmagic:init">
     </target>
   
  +
     <!-- ================================================================== -->
     <!-- Configuration                                                      -->
     <!-- ================================================================== -->
   
     <!--
  -     | Configure the build system.
  +     | Configure the build system.  
        |
  -     | Configuration elements should be placed in the appropriate 
  -     | _configure-* targets.
  +     | This target is invoked by the Buildmagic initialization logic and 
  +     | should contain module specific configuration elements.
      -->
   
  -  <target name="_configure" unless="configure.disable">
  +  <target name="configure" unless="configure.disable">
  +
  +    <!-- =================== -->
  +    <!-- Basic Configuration -->
  +    <!-- =================== -->
  +
       <!-- Version identifiers for the server. -->
       <property name="version.major" value="3"/>
       <property name="version.minor" value="0"/>
  @@ -142,23 +72,10 @@
       <property name="module.Name" value="JBoss Build"/>
       <property name="module.version" 
value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
   
  -    <!-- Invoke the rest of the configuration targets -->
  -    <call target="_configure-tools"/>
  -    <call target="_configure-libraries"/>
  -    <call target="_configure-modules"/>
  -    <call target="_configure-tasks"/>
  -
  -    <!-- Load common task properties -->
  -    <property resource="planet57/tools/buildmagic/task.properties"/>
  -  </target>
  +    <!-- ========= -->
  +    <!-- Libraries -->
  +    <!-- ========= -->
   
  -  <!-- Configure the thirdparty tools required to build this module. -->
  -  <target name="_configure-tools" unless="configure-tools.disable">
  -    <!-- No non-standard tools are required for this module. -->
  -  </target>
  -
  -  <!-- Configure the thirdparty libraries required by this module. -->
  -  <target name="_configure-libraries" unless="configure-libraries.disable">
       <!-- Java Naming and Directory Interface (JNDI) -->
       <property name="sun.jndi.root" value="${project.thirdparty}/sun/jndi"/>
       <property name="sun.jndi.lib" value="${sun.jndi.root}/lib"/>
  @@ -243,10 +160,11 @@
       <!-- The combined library classpath -->
       <path id="library.classpath">
       </path>
  -  </target>
  +
  +    <!-- ============== -->
  +    <!-- Modules/Groups -->
  +    <!-- ============== -->
   
  -  <!-- Configure the external modules which this module depends on. -->
  -  <target name="_configure-modules" unless="configure-modules.disable">
       <!-- The group to use by default -->
       <property name="groups" value="default"/>
   
  @@ -326,11 +244,11 @@
       <!-- The combined dependent module classpath -->
       <path id="dependentmodule.classpath">
       </path>
  -  </target>
   
  +    <!-- ===== -->
  +    <!-- Tasks -->
  +    <!-- ===== -->
   
  -  <!-- Configure the tasks used by this module. -->
  -  <target name="_configure-tasks" unless="configure-tasks.disable">
       <!-- Skip any missing modules and issue a warning -->
       <property name="executemodules.skipmissing" value="true"/>
   
  @@ -384,161 +302,33 @@
     <!-- ================================================================== -->
     <!-- Module Pass-through Targets                                        -->
     <!-- ================================================================== -->
  -
  -  <!-- Invoke the 'all' on all configured modules -->
  -  <target name="modules-all" depends="init">
  -    <execmodules target="all" 
  -              modules="${modules}" 
  -              root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <before target="_module-${module}-${target}-prepare"/>
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -      <after target="_module-${module}-${target}"/>
  -      <property name="init.have-parent" value="true"/>
  -
  -      <!-- 
  -         | temporary HACK, until a better method for passing selective
  -         | properties to children is invented.
  -       -->
  -      <property name="version.major" value="${version.major}"/>
  -      <property name="version.minor" value="${version.minor}"/>
  -      <property name="version.revision" value="${version.revision}"/>
  -      <property name="version.tag" value="${version.tag}"/>
  -      <property name="version.name" value="${version.name}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'most' on all configured modules -->
  -  <target name="modules-most" depends="init">
  -    <execmodules target="most" 
  -              modules="${modules}" 
  -              root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -      <before target="_module-${module}-${target}-prepare"/>
  -      <after target="_module-${module}-${target}"/>
  -      <property name="init.have-parent" value="true"/>
  -
  -      <!-- 
  -         | temporary HACK, until a better method for passing selective
  -         | properties to children is invented.
  -       -->
  -      <property name="version.major" value="${version.major}"/>
  -      <property name="version.minor" value="${version.minor}"/>
  -      <property name="version.revision" value="${version.revision}"/>
  -      <property name="version.tag" value="${version.tag}"/>
  -      <property name="version.name" value="${version.name}"/>
  -    </execmodules>
  -  </target>
   
  -  <!-- Invoke the 'main' on all configured modules -->
  -  <target name="modules-main" depends="init">
  -    <execmodules target="main" 
  -              modules="${modules}" 
  -              root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -      <before target="_module-${module}-${target}-prepare"/>
  -      <after target="_module-${module}-${target}"/>
  -      <property name="init.have-parent" value="true"/>
  -
  -      <!-- 
  -         | temporary HACK, until a better method for passing selective
  -         | properties to children is invented.
  -       -->
  -      <property name="version.major" value="${version.major}"/>
  -      <property name="version.minor" value="${version.minor}"/>
  -      <property name="version.revision" value="${version.revision}"/>
  -      <property name="version.tag" value="${version.tag}"/>
  -      <property name="version.name" value="${version.name}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'release' on all configured modules -->
  -  <target name="modules-release" depends="init">
  -    <execmodules target="release" 
  -              modules="${modules}" 
  -              root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <before target="_module-${module}-${target}-prepare"/>
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -      <after target="_module-${module}-${target}"/>
  -      <property name="init.have-parent" value="true"/>
  -
  -      <!-- 
  -         | temporary HACK, until a better method for passing selective
  -         | properties to children is invented.
  -       -->
  -      <property name="version.major" value="${version.major}"/>
  -      <property name="version.minor" value="${version.minor}"/>
  -      <property name="version.revision" value="${version.revision}"/>
  -      <property name="version.tag" value="${version.tag}"/>
  -      <property name="version.name" value="${version.name}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'tests' on all configured modules -->
  -  <target name="modules-tests" depends="init">
  -    <execmodules target="tests" 
  -              modules="${modules}" 
  -              root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <before target="_module-${module}-${target}-prepare"/>
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -      <after target="_module-${module}-${target}"/>
  -      <property name="init.have-parent" value="true"/>
  -
  -      <!-- 
  -         | temporary HACK, until a better method for passing selective
  -         | properties to children is invented.
  -       -->
  -      <property name="version.major" value="${version.major}"/>
  -      <property name="version.minor" value="${version.minor}"/>
  -      <property name="version.revision" value="${version.revision}"/>
  -      <property name="version.tag" value="${version.tag}"/>
  -      <property name="version.name" value="${version.name}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'clean' on all configured modules -->
  -  <target name="modules-clean" depends="init">
  -    <execmodules target="clean" 
  -              modules="${modules}" 
  -              root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <before target="_module-${module}-${target}-prepare"/>
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -      <after target="_module-${module}-${target}"/>
  -      <property name="init.have-parent" value="true"/>
  -    </execmodules>
  -  </target>
  +  <!--
  +     | These targets will execute all configured modules with the specified
  +     | target.
  +   -->
   
  -  <!-- Invoke the 'clobber' on all configured modules -->
  -  <target name="modules-clobber" depends="init">
  -    <execmodules target="clobber" 
  -              modules="${modules}" 
  -              root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <before target="_module-${module}-${target}-prepare"/>
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -      <after target="_module-${module}-${target}"/>
  -      <property name="init.have-parent" value="true"/>
  -    </execmodules>
  -  </target>
  +  <target name="modules-all" depends="_buildmagic:modules:all"/>
  +  <target name="modules-most" depends="_buildmagic:modules:most"/>
  +  <target name="modules-main" depends="_buildmagic:modules:main"/>
  +  <target name="modules-release" depends="_buildmagic:modules:release"/>
  +  <target name="modules-tests" depends="_buildmagic:modules:tests"/>
  +  <target name="modules-clean" depends="_buildmagic:modules:clean"/>
  +  <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
   
   
     <!-- ================================================================== -->
     <!-- Module Pass-through Hooks                                          -->
     <!-- ================================================================== -->
   
  +  <!--
  +     | These hooks are executed after the above pass-through targets have 
  +     | finished with a given module.
  +   -->
  +
  +  <!-- ==== -->
     <!-- J2EE -->
  +  <!-- ==== -->
   
     <target name="_module-j2ee-most">
       <property name="_module.name" value="j2ee" override="true"/>
  @@ -572,7 +362,9 @@
       </copy>
     </target>
   
  +  <!-- ====== -->
     <!-- Naming -->
  +  <!-- ====== -->
   
     <target name="_module-naming-most">
       <property name="_module.name" value="naming" override="true"/>
  @@ -606,7 +398,9 @@
       </copy>
     </target>
   
  +  <!-- ====== -->
     <!-- Server -->
  +  <!-- ====== -->
   
     <target name="_module-server-most">
       <property name="_module.name" value="server" override="true"/>
  @@ -828,7 +622,9 @@
       </copy>
     </target>
   
  +  <!-- ===== -->
     <!-- Admin -->
  +  <!-- ===== -->
   
     <target name="_module-admin-most">
       <property name="_module.name" value="admin" override="true"/>
  @@ -890,7 +686,9 @@
       </copy>
     </target>
   
  +  <!-- ========= -->
     <!-- Connector -->
  +  <!-- ========= -->
   
     <target name="_module-connector-most">
       <property name="_module.name" value="connector" override="true"/>
  @@ -926,7 +724,9 @@
       </copy>
     </target>
   
  +  <!-- ========= -->
     <!-- Messaging -->
  +  <!-- ========= -->
   
     <target name="_module-messaging-most">
       <property name="_module.name" value="messaging" override="true"/>
  @@ -988,7 +788,9 @@
       </copy>
     </target>
   
  +  <!-- ==== -->
     <!-- Pool -->
  +  <!-- ==== -->
   
     <target name="_module-pool-most">
       <property name="_module.name" value="pool" override="true"/>
  @@ -1015,7 +817,9 @@
       </copy>
     </target>
   
  +  <!-- ======== -->
     <!-- Security -->
  +  <!-- ======== -->
   
     <target name="_module-security-most">
       <property name="_module.name" value="security" override="true"/>
  @@ -1054,7 +858,9 @@
       </copy>
     </target>
   
  +  <!-- ======= -->
     <!-- Cluster -->
  +  <!-- ======= -->
   
     <target name="_module-cluster-most">
       <property name="_module.name" value="cluster" override="true"/>
  @@ -1099,7 +905,9 @@
       </copy>
     </target>
   
  +  <!-- ============= -->
     <!-- Plugins Varia -->
  +  <!-- ============= -->
   
     <target name="_module-plugins/varia-most">
       <property name="_module.name" value="plugins/varia" override="true"/>
  @@ -1141,7 +949,9 @@
       </copy>
     </target>
   
  +  <!-- ============= -->
     <!-- Plugins Jetty -->
  +  <!-- ============= -->
   
     <target name="_module-plugins/jetty-most">
       <property name="_module.name" value="plugins/jetty" override="true"/>
  @@ -1178,9 +988,9 @@
       </copy>
     </target>
   
  -  <!-- ================================================================== -->
  -  <!-- JBoss.net                                                          -->
  -  <!-- ================================================================== -->
  +  <!-- ================= -->
  +  <!-- Plugins JBoss.net -->
  +  <!-- ================= -->
   
     <target name="_module-plugins/jboss.net-most">
       <property name="_module.name" value="plugins/jboss.net" override="true"/>
  @@ -1244,11 +1054,14 @@
       </copy>
     </target>
   
  +
     <!-- ================================================================== -->
  -  <!-- Install                                                            -->
  +  <!-- Install & Release                                                  -->
     <!-- ================================================================== -->
   
  -  <target name="install" depends="install-dependencies"/>
  +  <target name="install" 
  +       description="Install the structure for a release."
  +       depends="install-dependencies"/>
   
     <target name="install-dependencies" depends="init">
       <mkdir dir="${install.lib}"/>
  @@ -1312,17 +1125,19 @@
         <fileset dir="${exolab.tyrex.lib}">
           <include name="tyrex.jar"/>
         </fileset>
  -      <!--now in jetty.sar-->
  +      <!-- now in jetty.sar -->
         <fileset dir="${mortbay.jetty.lib}">
           <include name="**/javax.servlet.jar"/>
           <include name="**/org.apache.jasper.jar"/>
         </fileset>
  -      <!--fileset dir="${mortbay.jetty.lib}">
  +      <!--
  +      <fileset dir="${mortbay.jetty.lib}">
           <include name="**/*.jar"/>
         </fileset>
         <fileset dir="${mortbay.jetty3extra.jmx.lib}">
           <include name="**/*.jar"/>
  -      </fileset-->
  +      </fileset>
  +      -->
       </copy>
   
       <mkdir dir="${install.client}"/>
  @@ -1345,103 +1160,42 @@
       </copy>
     </target>
   
  -
  -  <!-- ================================================================== -->
  -  <!-- Release                                                            -->
  -  <!-- ================================================================== -->
  -
     <target name="release" depends="install, modules-all"/>
  -
  -  <target name="release-zip" depends="release"
  -       description="Builds a ZIP release distribution.">
  -    <zip zipfile="${module.output}/${release.id}.zip">
  -      <fileset dir="${module.output}">
  -        <include name="${release.id}/**"/>
  -      </fileset>
  -    </zip>
  -  </target>
  -
  -  <target name="release-tar" depends="release"
  -       description="Builds a TAR release distribution.">
  -    <tar tarfile="${module.output}/${release.id}.tar" longfile="gnu"
  -      basedir="${module.output}"
  -      includes="${release.id}/**">
  -    </tar>
  -  </target>
   
  -  <target name="release-tgz" depends="release-tar"
  -       description="Builds a TAR-GZIP release distribution.">
  -    <gzip src="${module.output}/${release.id}.tar"
  -       zipfile="${module.output}/${release.id}.tgz"/>
  -  </target>
  -
  -  <target name="release-all" depends="release-zip, release-tgz"
  -       description="Builds a distribution for each archive type."/>
  -
  -
  -  <!-- ================================================================== -->
  -  <!-- Tests                                                              -->
  -  <!-- ================================================================== -->
  +  <target name="release-zip" 
  +       description="Builds a ZIP distribution."
  +       depends="release, _buildmagic:release:zip"/>
  +
  +  <target name="release-tar" 
  +       description="Builds a TAR distribution."
  +       depends="release, _buildmagic:release:tar"/>
  +
  +  <target name="release-tgz" 
  +       description="Builds a TAR-GZ distribution."
  +       depends="release, _buildmagic:release:tgz"/>
  +
  +  <target name="release-all"
  +       description="Builds a distribution for each archive type."
  +       depends="release-zip, release-tgz"/>
   
  -  <target name="tests" depends="init" description="Execute all tests."/>
   
  -
     <!-- ================================================================== -->
     <!-- Cleaning                                                           -->
     <!-- ================================================================== -->
   
     <!-- Clean up all build output -->
  -  <target name="clean" depends="init, modules-clean"
  +  <target name="clean" depends="_buildmagic:clean, modules-clean"
          description="Cleans up most generated files.">
  -    <delete dir="${module.output}"/>
     </target>
   
     <!-- Clean up all generated files -->
  -  <target name="clobber" depends="clean, modules-clobber"
  +  <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber"
          description="Cleans up all generated files.">
  -    <delete file="${module.root}/local.properties"/>
  -    <delete file="${module.root}/build.log"/>
       <delete file="${module.root}/run.log"/>
     </target>
   
   
     <!-- ================================================================== -->
  -  <!-- Workspace                                                          -->
  -  <!-- ================================================================== -->
  -
  -  <target name="update-project" depends="init">
  -    <echo>Updating project workspace...</echo>
  -    <cvs command="update -d" dest="${project.root}"/>
  -  </target>
  -
  -  <target name="update-module" depends="init">
  -    <echo>Updating module workspace...</echo>
  -    <cvs command="update -d" dest="${module.root}"/>
  -  </target>
  -
  -
  -  <!-- ================================================================== -->
  -  <!-- Help                                                               -->
  -  <!-- ================================================================== -->
  -
  -  <target name="help" depends="init">
  -    <projecthelp taskname="help">
  -      <header><![CDATA[
  -  The ${module.Name} module.
  -]]></header>
  -      <footer><![CDATA[
  -    -Dgroups=<group>[(,<group>)*]      Specify the module groups.
  -    -Dmodules=<module>[(,<module>)*]   Specify the modules.
  -                                       (overrides groups).
  -    -Dtest=<testcase>                  Specify the testcase to run.
  -    -projecthelp for all targets
  -    -help for full options
  -]]></footer>
  -    </projecthelp>
  -  </target>
  -
  -
  -  <!-- ================================================================== -->
     <!-- Misc.                                                              -->
     <!-- ================================================================== -->
   
  @@ -1454,6 +1208,14 @@
     <target name="most" depends="modules-most, install"
          description="Executes all modules and builds most everything."/>
   
  +  <target name="help" depends="_buildmagic:help:build"
  +          description="Show this help message."/>
  +
  +
  +  <!--
  +     | NOTE: The following targets will probably be moved to external 
  +     |       scripts or external build files.
  +   -->
   
     <!-- ================================================================== -->
     <!-- Run the JBoss/Testsuite                                            -->
  @@ -1553,6 +1315,16 @@
     <!-- ================================================================== -->
     <!-- Run the Nightly Tasks                                              -->
     <!-- ================================================================== -->
  +
  +  <target name="update-project" depends="init">
  +    <echo>Updating project workspace...</echo>
  +    <cvs command="update -d" dest="${project.root}"/>
  +  </target>
  +
  +  <target name="update-module" depends="init">
  +    <echo>Updating module workspace...</echo>
  +    <cvs command="update -d" dest="${module.root}"/>
  +  </target>
   
     <target name="run-nightly">
       <!-- perhaps refresh cvs -->
  
  
  

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

Reply via email to