[JBoss-dev] CVS update: jbossmq build.sh build.xml
User: user57
Date: 01/09/03 22:08:08
Modified:.build.sh build.xml
Log:
o module release is now a control module pull
o removed min targets
Revision ChangesPath
1.7 +4 -1 jbossmq/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbossmq/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.12 +9 -85 jbossmq/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbossmq/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 2001/08/27 09:01:36 1.11
+++ build.xml 2001/09/04 05:08:08 1.12
@@ -10,9 +10,9 @@
!----
!-- == --
-!-- $Id: build.xml,v 1.11 2001/08/27 09:01:36 user57 Exp $ --
+!-- $Id: build.xml,v 1.12 2001/09/04 05:08:08 user57 Exp $ --
-project default=main
+project default=main name=JBoss/Messaging
!-- == --
!-- Initialization --
@@ -237,7 +237,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/
@@ -270,27 +270,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}/
-
!-- == --
!-- Pretty --
!-- == --
@@ -538,75 +520,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=jbossmq.jar/
- /fileset
-/copy
-
-!-- Copy the generated libraries (client) --
-mkdir dir=${release.client}/
-copy todir=${release.client} filtering=no
- fileset dir=${build.jars}
- include name=*-client.jar/
- /fileset
-/copy
-
-!-- Copy the static documents (docs) --
-mkdir dir=${release.module.docs}/
-copy todir=${release.module.docs} filtering=no
- fileset dir=${build.docs}
- include
[JBoss-dev] CVS update: jbossmq build.sh build.xml config.xml
User: user57
Date: 01/08/26 00:00:30
Modified:.build.sh build.xml
Removed: .config.xml
Log:
o consolidated all tools/* stuff into tools/bin and tools/lib
o upgraded ant to 1.4beta2
o consolidated config.xml into build.xml
o using path to generate absolute paths to project.root
o changed project.config to control.root
o removed classpath fluff for extra tasks the taskdefs for them
currently every support lib is in ANT_HOME/lib, so there is no need for
specific classpaths. May change that for ejbdoclet and such later.
o updated build.sh to look for tools/ too (will get the a win32 script soon
... really)
o removed bootstrap configure targets, the just added complexity and
slowed down the build
NOTE: All modules will read ${config.root}/local.properties
(or build/local.properties). Modules still can read a local.properties
(when they don't care about the control module, but this file will
no loger be placed here automatically)
Revision ChangesPath
1.3 +8 -22 jbossmq/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbossmq/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2001/08/11 05:20:14 1.2
+++ build.sh 2001/08/26 07:00:30 1.3
@@ -1,39 +1,25 @@
#!/bin/sh
### == ###
## ##
-## Copyright (c) 1998-2000 by Jason Dillon [EMAIL PROTECTED]##
-## ##
-## This file is part of Buildmagic.##
-## ##
-## This library is free software; you can redistribute it and/or modify##
-## it under the terms of the GNU Lesser General Public License as ##
-## published by the Free Software Foundation; either version 2 of the ##
-## License, or (at your option) any later version. ##
-## ##
-## This library is distributed in the hope that it will be useful, but ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of ##
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ##
-## Lesser General Public License for more details. ##
-## ##
-### == ###
-## ##
## This is the main entry point for the build system. ##
+## ##
## Users should be sure to execute this file rather than 'ant' to ensure ##
## the correct version is being used with the correct configuration. ##
## ##
### == ###
-# $Id: build.sh,v 1.2 2001/08/11 05:20:14 user57 Exp $
+# $Id: build.sh,v 1.3 2001/08/26 07:00:30 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
GREP=grep
ROOT=/
-# the default search path for buildmagic/ant
+# the default search path for ant
ANT_SEARCH_PATH=\
-tools/apache/ant \
+tools
tools/ant \
+tools/apache/ant \
ant
# the default build file name
@@ -42,8 +28,8 @@
# the default arguments
ANT_OPTIONS=-find $ANT_BUILD_FILE
-# the required version of Ant
-ANT_VERSION=1.3
+# don't check versions (too slow)
+ANT_VERSION=
#
# Helper to complain.
@@ -113,7 +99,7 @@
fi
# perhaps check the version
-if [ x$ANT_VERSION_CHECK != x ]; then
+if [ x$ANT_VERSION != x ] [ x$ANT_VERSION_CHECK != x ]; then
result=`$ANT -version 21 | $GREP $ANT_VERSION`x
if [ $result = x ]; then
die Ant version $ANT_VERSION is required to build.
1.8 +250 -150 jbossmq/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbossmq/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/08/19 04:48:40 1.7
+++ build.xml 2001/08/26 07:00:30 1.8
@@ -1,159 +1,50 @@
?xml version=1.0 encoding=UTF-8?
-!DOCTYPE project-module [ !ENTITY config SYSTEM file:./config.xml ]
+!DOCTYPE project
!--
[JBoss-dev] CVS update: jbossmq build.sh build.xml
User: user57
Date: 01/08/01 15:01:54
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 ChangesPath
No revision
No revision
1.1.2.4 +21 -33jbossmq/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbossmq/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:54 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:54 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.9 +8 -5 jbossmq/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbossmq/Attic/build.xml,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- build.xml 2001/08/01 06:59:27 1.1.2.8
+++ build.xml 2001/08/01 22:01:54 1.1.2.9
@@ -10,7 +10,7 @@
!----
!-- == --
-!-- $Id: build.xml,v 1.1.2.8 2001/08/01 06:59:27 user57 Exp $ --
+!-- $Id: build.xml,v 1.1.2.9 2001/08/01 22:01:54 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
[JBoss-dev] CVS update: jbossmq build.sh build.xml config.xml
User: user57
Date: 01/07/28 19:13:40
Modified:.Tag: jboss_buildmagic build.sh build.xml config.xml
Log:
o updated all modules to use new simplified configuration
Revision ChangesPath
No revision
No revision
1.1.2.2 +45 -15jbossmq/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbossmq/Attic/build.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build.sh 2001/07/28 02:30:44 1.1.2.1
+++ build.sh 2001/07/29 02:13:40 1.1.2.2
@@ -23,14 +23,21 @@
## ##
### == ###
-# $Id: build.sh,v 1.1.2.1 2001/07/28 02:30:44 user57 Exp $
+# $Id: build.sh,v 1.1.2.2 2001/07/29 02:13:40 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
GREP=grep
+ROOT=/
-# the default search path for ant
-ANT_SEARCH_PATH=../tools/apache/ant ../tools/ant ./tools/apache/ant ./tools/ant
./ant
+# the default search path for buildmagic/ant
+ANT_SEARCH_PATH=\
+tools/planet57/buildmagic \
+tools/buildmagic \
+buildmagic \
+tools/apache/ant \
+tools/ant \
+ant
# the default build file name
ANT_BUILD_FILE=build.xml
@@ -60,6 +67,19 @@
done
}
+search() {
+search=$*
+for d in $search; do
+ ANT_HOME=`pwd`/$d
+ ANT=$ANT_HOME/bin/ant
+ if [ -x $ANT ]; then
+ # found one
+ echo $ANT
+ break
+ fi
+done
+}
+
#
# Main function.
#
@@ -69,22 +89,32 @@
# try our best to find ANT
if [ x$ANT = x ]; then
- if [ x$ANT_HOME = x ]; then
- search=$ANT_SEARCH_PATH
- else
- search=$ANT_HOME
- fi
-
found=
- for d in $search; do
- ANT_HOME=$d
+
+ if [ x$ANT_HOME != x ]; then
ANT=$d/bin/ant
if [ -x $ANT ]; then
- # found one
found=true
- break
fi
- done
+ 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
# complain if we did not find anything
if [ $found != true ]; then
@@ -105,7 +135,7 @@
fi
fi
-export ANT
+export ANT ANT_HOME
exec $ANT $ANT_OPTIONS $@
}
1.1.2.2 +182 -146 jbossmq/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbossmq/Attic/build.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build.xml 2001/07/28 02:30:44 1.1.2.1
+++ build.xml 2001/07/29 02:13:40 1.1.2.2
@@ -9,25 +9,8 @@
!-- See terms of license at http://www.gnu.org. --
!----
!-- == --
-!----
-!-- Configuration Files (in order of precedence): --
-!----
-!--${module.root}/build.xml* (this file) --
-!--${project.config}/override.properties --
-!--${module.root}/override.properties --
-!--${user.home}/.buildmagic.properties --
-!--${user.home}/.ant.properties--
-!--${project.config}/local.properties --
-!--${module.root}/local.properties --
-!--${project.config}/config.properties --
-!--${module.root}/config.properties--
-!--${module.root}/config.xml* --
-!----
-!--* Required --
-!----
-!-- == --
-!--
[JBoss-dev] CVS update: jbossmq build.sh build.xml config.xml AUTHORS COPYING ChangeLog README
User: user57 Date: 01/07/27 19:30:45 Added: .Tag: jboss_buildmagic build.sh build.xml config.xml Removed: .Tag: jboss_buildmagic AUTHORS COPYING ChangeLog README Log: o integrating into buildmagic build system o moved root documents to /docs to keep things consistent Revision ChangesPath No revision No revision 1.1.2.1 +116 -0jbossmq/Attic/build.sh 1.1.2.1 +387 -0jbossmq/Attic/build.xml 1.1.2.1 +232 -0jbossmq/Attic/config.xml ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
