[JBoss-dev] CVS update: jbosscx build.sh build.xml
User: user57 Date: 01/09/03 22:08:07 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 jbosscx/build.sh Index: build.sh === RCS file: /cvsroot/jboss/jbosscx/build.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.sh 2001/08/28 04:53:08 1.6 +++ build.sh 2001/09/04 05:08:07 1.7 @@ -8,12 +8,15 @@ ## ## ### == ### -# $Id: build.sh,v 1.6 2001/08/28 04:53:08 user57 Exp $ +# $Id: build.sh,v 1.7 2001/09/04 05:08:07 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.8 +8 -38 jbosscx/build.xml Index: build.xml === RCS file: /cvsroot/jboss/jbosscx/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.xml 2001/09/03 02:14:45 1.7 +++ build.xml 2001/09/04 05:08:07 1.8 @@ -10,9 +10,9 @@ - + - + @@ -212,27 +212,9 @@ + - - - - - - - - - - - - - - - - - - - @@ -373,27 +355,18 @@ - - - - - - - - - - - - + + + + + - - - ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosscx build.sh build.xml
User: user57 Date: 01/08/26 21:47:21 Modified:.build.sh build.xml Log: o Added a build.log, which will be created as a dependency of init unless buildlog-disabled is set. This contains all info & higher messages from the build system. o build.sh will now cd to $DIRNAME, so you don't have to be in the same directory with build.sh for it to work. Revision ChangesPath 1.4 +6 -1 jbosscx/build.sh Index: build.sh === RCS file: /cvsroot/jboss/jbosscx/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.sh 2001/08/26 07:00:29 1.3 +++ build.sh 2001/08/27 04:47:21 1.4 @@ -8,7 +8,7 @@ ## ## ### == ### -# $Id: build.sh,v 1.3 2001/08/26 07:00:29 user57 Exp $ +# $Id: build.sh,v 1.4 2001/08/27 04:47:21 user57 Exp $ PROGNAME=`basename $0` DIRNAME=`dirname $0` @@ -105,6 +105,11 @@ die "Ant version $ANT_VERSION is required to build." fi fi + +# change to the directory where the script lives so folks do not have +# to be in the same dir to run the build without specifying the build +# file. +cd $DIRNAME export ANT ANT_HOME exec $ANT $ANT_OPTIONS "$@" 1.5 +7 -13 jbosscx/build.xml Index: build.xml === RCS file: /cvsroot/jboss/jbosscx/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 2001/08/26 07:00:29 1.4 +++ build.xml 2001/08/27 04:47:21 1.5 @@ -10,7 +10,7 @@ - + @@ -46,18 +46,8 @@ - - + + @@ -70,6 +60,10 @@ + + + + ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosscx build.sh build.xml config.xml
User: user57
Date: 01/08/26 00:00:29
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 jbosscx/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbosscx/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2001/08/11 05:20:11 1.2
+++ build.sh 2001/08/26 07:00:29 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:11 user57 Exp $
+# $Id: build.sh,v 1.3 2001/08/26 07:00:29 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 2>&1 | $GREP $ANT_VERSION`x"
if [ "$result" = "x" ]; then
die "Ant version $ANT_VERSION is required to build."
1.4 +194 -151 jbosscx/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbosscx/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/08/19 04:48:40 1.3
+++ build.xml 2001/08/26 07:00:29 1.4
@@ -1,159 +1,50 @@
- ]>
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
[JBoss-dev] CVS update: jbosscx build.sh build.xml
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 ChangesPath No revision No revision 1.1.2.4 +21 -33jbosscx/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 @@ - + @@ -20,11 +20,14 @@ - + + +
[JBoss-dev] CVS update: jbosscx 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 -15jbosscx/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbosscx/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 01:32:07 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 01:32:07 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 jbosscx/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbosscx/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 01:32:07 1.1.2.1
+++ build.xml 2001/07/29 02:13:40 1.1.2.2
@@ -9,25 +9,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -35,46 +18,68 @@
-
+
+
+
+
+
-
-
-
-
-
+
+
+
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
&config;
@@ -82,37 +87,47 @@
-
-
-
-
+
+
-
-
+
+
Missing some or all of the required dependencies.
-
-
+
+
-
-
+
-
-
-
-
-
@@ -120,10 +135,7 @@
-
-
-
@@ -132,44 +144,31 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Project root is ${project.root}
-Module root is ${module.root}
-
-
+
+
+
-
-
-
-
@@ -188,7 +187,13 @@
-
+
@@ -213,22 +218,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -245,11 +242,24 @@
[JBoss-dev] CVS update: jbosscx build.sh build.xml config.xml
User: user57 Date: 01/07/27 18:32:07 Added: .Tag: jboss_buildmagic build.sh build.xml config.xml Log: o hooked up jbosscx o changed mkdir for javadocs to be done inside of javadocs-check to allow all javadoc generation to be disabled via javadoc-generated-already and not break the install/release targets. Revision ChangesPath No revision No revision 1.1.2.1 +116 -0jbosscx/Attic/build.sh 1.1.2.1 +387 -0jbosscx/Attic/build.xml 1.1.2.1 +183 -0jbosscx/Attic/config.xml ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
