[JBoss-dev] CVS update: jbosstest build.sh build.xml
User: user57
Date: 01/09/03 22:08:09
Modified:.build.sh build.xml
Log:
o module release is now a control module pull
o removed min targets
Revision ChangesPath
1.5 +4 -1 jbosstest/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbosstest/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.sh 2001/08/28 04:53:12 1.4
+++ build.sh 2001/09/04 05:08:09 1.5
@@ -8,12 +8,15 @@
## ##
### == ###
-# $Id: build.sh,v 1.4 2001/08/28 04:53:12 user57 Exp $
+# $Id: build.sh,v 1.5 2001/09/04 05:08:09 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.10 +11 -27jbosstest/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/09/03 20:21:34 1.9
+++ build.xml 2001/09/04 05:08:09 1.10
@@ -10,9 +10,9 @@
!----
!-- == --
-!-- $Id: build.xml,v 1.9 2001/09/03 20:21:34 kimptoc Exp $ --
+!-- $Id: build.xml,v 1.10 2001/09/04 05:08:09 user57 Exp $ --
-project default=main
+project default=main name=JBoss/Testsuite
!-- == --
!-- Initialization --
@@ -281,27 +281,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 --
!-- == --
@@ -1284,13 +1266,18 @@
target name=release depends=all
description=Builds a release distribution.
-!-- currently there is no release for this module --
+!-- 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 name=${release.id}/**/
+ /fileset
+/copy
/target
target name=release-archive-prepare depends=release
mkdir dir=${module.release}/
-property name=release.archive.basename
- value=${module.release}/${release.id}/
/target
target name=release-zip depends=release-archive-prepare
@@ -1618,8 +1605,5 @@
target name=most depends=jars
description=Builds almost everything./
-
- target name=min depends=compile
- description=Builds a minimal subset./
/project
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest build.sh build.xml
User: user57 Date: 01/08/26 21:48:20 Added: .build.sh build.xml Log: o Integrated the testsuite module with the new build system. Revision ChangesPath 1.2 +122 -0jbosstest/build.sh 1.2 +1617 -0 jbosstest/build.xml ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest build.sh build.xml config.xml
User: user57
Date: 01/07/31 23:28:41
Modified:.Tag: jboss_buildmagic build.sh build.xml config.xml
Log:
o fixed build.sh to correctly detect ant when ANT_HOME is set, though if
the buildmagic-tasks.jar file is not under ANT_HOME/lib things will still
not work.
Revision ChangesPath
No revision
No revision
1.1.2.3 +1 -1 jbosstest/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbosstest/Attic/build.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- build.sh 2001/07/29 02:13:41 1.1.2.2
+++ build.sh 2001/08/01 06:28:41 1.1.2.3
@@ -92,7 +92,7 @@
found=
if [ x$ANT_HOME != x ]; then
- ANT=$d/bin/ant
+ ANT=$ANT_HOME/bin/ant
if [ -x $ANT ]; then
found=true
fi
1.1.2.9 +4 -1 jbosstest/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbosstest/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/07/31 21:36:44 1.1.2.8
+++ build.xml 2001/08/01 06:28:41 1.1.2.9
@@ -446,6 +446,9 @@
The ${module.Name} module.
]]/header
footer![CDATA[
+-Dtestsuite.groups=group[(,group)* Specify the module group list.
+-Dtestsuite.modules=module[(,module)* Specify the module list
+(overrides groups).
-projecthelp for all targets
-help for full options
]]/footer
1.1.2.7 +10 -1 jbosstest/Attic/config.xml
Index: config.xml
===
RCS file: /cvsroot/jboss/jbosstest/Attic/config.xml,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- config.xml2001/07/31 06:13:36 1.1.2.6
+++ config.xml2001/08/01 06:28:41 1.1.2.7
@@ -226,6 +226,15 @@
!-- RMIC should generate stubs compatible with Java 1.2+ --
property name=rmic.stubVersion value=1.2/
+ !-- JUnit defaults --
+ property name=junit.printsummary value=true/
+ property name=junit.haltonfailure value=false/
+ property name=junit.fork value=true/
+ property name=junit.timeout value=24/
+ property name=junit.java.options value=/
+ property name=junit.formatter.type value=xml/
+ property name=junit.formatter.usefile value=true/
+
!-- Where source files live --
property name=source.java value=${module.source}/main/
property name=source.etc value=${module.source}/etc/
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosstest build.sh build.xml
User: user57
Date: 01/08/01 15:01:56
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 -33jbosstest/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbosstest/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:41 1.1.2.3
+++ build.sh 2001/08/01 22:01:55 1.1.2.4
@@ -23,7 +23,7 @@
## ##
### == ###
-# $Id: build.sh,v 1.1.2.3 2001/08/01 06:28:41 user57 Exp $
+# $Id: build.sh,v 1.1.2.4 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.2.10 +8 -5 jbosstest/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbosstest/Attic/build.xml,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- build.xml 2001/08/01 06:28:41 1.1.2.9
+++ build.xml 2001/08/01 22:01:56 1.1.2.10
@@ -10,7 +10,7 @@
!----
!-- == --
-!-- $Id: build.xml,v 1.1.2.9 2001/08/01 06:28:41 user57 Exp $ --
+!-- $Id: build.xml,v 1.1.2.10 2001/08/01 22:01:56 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: jbosstest build.sh build.xml config.xml
User: user57
Date: 01/08/01 20:45:32
Modified:.Tag: jboss_buildmagic build.sh build.xml config.xml
Log:
o testsuite can now run junit tasks again.
o classpath usage has been expaned to allow standard ant v1.3 clients to
work against the build files.
o optional tasks is not assumed to be in the path anymore
o reverting to the standard xml parser that comes with ant to avoid any
odd class loading problems that might occur.
Revision ChangesPath
No revision
No revision
1.1.2.5 +1 -4 jbosstest/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbosstest/Attic/build.sh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- build.sh 2001/08/01 22:01:55 1.1.2.4
+++ build.sh 2001/08/02 03:45:32 1.1.2.5
@@ -23,7 +23,7 @@
## ##
### == ###
-# $Id: build.sh,v 1.1.2.4 2001/08/01 22:01:55 user57 Exp $
+# $Id: build.sh,v 1.1.2.5 2001/08/02 03:45:32 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
@@ -32,9 +32,6 @@
# the default search path for buildmagic/ant
ANT_SEARCH_PATH=\
-tools/planet57/buildmagic \
-tools/buildmagic \
-buildmagic \
tools/apache/ant \
tools/ant \
ant
1.1.2.11 +87 -66jbosstest/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbosstest/Attic/build.xml,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- build.xml 2001/08/01 22:01:56 1.1.2.10
+++ build.xml 2001/08/02 03:45:32 1.1.2.11
@@ -10,7 +10,7 @@
!----
!-- == --
-!-- $Id: build.xml,v 1.1.2.10 2001/08/01 22:01:56 user57 Exp $ --
+!-- $Id: build.xml,v 1.1.2.11 2001/08/02 03:45:32 user57 Exp $ --
project default=main
@@ -21,14 +21,17 @@
!--
| Load Buildmagic Ant extentions.
--
- 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/
+ property name=planet57.buildmagic.root value=../tools/planet57/buildmagic/
+ property name=planet57.buildmagic.lib value=${planet57.buildmagic.root}/lib/
+ path id=planet57.buildmagic.classpath
+fileset dir=${planet57.buildmagic.lib}
+ include name=**/*.jar/
+/fileset
+ /path
+ taskdef name=taskdef classname=planet57.tools.buildmagic.task.Taskdef
+classpathref=planet57.buildmagic.classpath/
+ taskdef classpathref=planet57.buildmagic.classpath
+resource=planet57/tools/buildmagic/task/autoload.properties/
!--
| Setup the basic module roots.
@@ -220,39 +223,9 @@
| documentation compiles.
--
target name=compile
- depends=compile-classes, compile-resources, compile-etc, compile-bin
+ depends=compile-etc, compile-bin, all-compile
description=Compile all source files./
- !-- Compile all class files --
- target name=compile-classes depends=init
-mkdir dir=${build.classes}/
-javac destdir=${build.classes}
- optimize=${javac.optimize}
-target=${javac.target}
- debug=${javac.debug}
-depend=${javac.depend}
-verbose=${javac.verbose}
-deprecation=${javac.deprecation}
-includeAntRuntime=${javac.include.ant.runtime}
-includeJavaRuntime=${javac.include.java.runtime}
-failonerror=${javac.fail.onerror}
- src path=${source.java}/
- classpath refid=javac.classpath/
- include name=${javac.includes}/
- exclude name=${javac.excludes}/
-/javac
- /target
-
- !-- Compile resource files --
- target name=compile-resources depends=init
-mkdir dir=${build.resources}/
-copy todir=${build.resources} filtering=yes
- fileset dir=${source.resources}
- include name=**/*/
- /fileset
-/copy
- /target
-
!-- Compile etc files (manifests and such) --
target name=compile-etc depends=init
mkdir dir=${build.etc}/
@@ -285,20 +258,7 @@
/chmod
/target
- !-- Execute test build files --
- target name=compile-tests depends=init
[JBoss-dev] CVS update: jbosstest build.sh build.xml config.xml
User: user57
Date: 01/07/28 19:13:41
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 -15jbosstest/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbosstest/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 03:46:20 1.1.2.1
+++ build.sh 2001/07/29 02:13:41 1.1.2.2
@@ -23,14 +23,21 @@
## ##
### == ###
-# $Id: build.sh,v 1.1.2.1 2001/07/28 03:46:20 user57 Exp $
+# $Id: build.sh,v 1.1.2.2 2001/07/29 02:13:41 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 jbosstest/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbosstest/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 03:46:20 1.1.2.1
+++ build.xml 2001/07/29 02:13:41 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: jbosstest build.sh build.xml config.xml
User: user57 Date: 01/07/27 20:46:20 Added: .Tag: jboss_buildmagic build.sh build.xml config.xml Log: o integrating with buildmagic Revision ChangesPath No revision No revision 1.1.2.1 +116 -0jbosstest/Attic/build.sh 1.1.2.1 +390 -0jbosstest/Attic/build.xml 1.1.2.1 +272 -0jbosstest/Attic/config.xml ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
