[JBoss-dev] CVS update: contrib/jetty build.sh build.xml
User: user57
Date: 01/09/03 22:08:08
Modified:jettybuild.sh build.xml
Log:
o module release is now a control module pull
o removed min targets
Revision ChangesPath
1.7 +4 -1 contrib/jetty/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/contrib/jetty/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
@@ -15,6 +15,9 @@
GREP=grep
ROOT=/
+# Ignore user's ANT_HOME if it is set
+ANT_HOME=
+
# the default search path for ant
ANT_SEARCH_PATH=\
tools
1.6 +8 -59 contrib/jetty/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/jetty/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/08/27 09:01:37 1.5
+++ build.xml 2001/09/04 05:08:08 1.6
@@ -12,7 +12,7 @@
!-- $Id$ --
-project default=main
+project default=main name=JBoss Plugins/Jetty
!-- == --
!-- Initialization --
@@ -224,27 +224,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}/
-
!-- == --
!-- Compile--
!-- == --
@@ -371,50 +353,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=**/*/
- /fileset
-/copy
-
-!-- Copy the default configuration files (conf/default) --
-mkdir dir=${release.conf.default}/
-copy todir=${release.conf.default} filtering=no
- fileset dir=${build.etc}
- include name=jetty.xml/
- include name=jetty.properties/
- /fileset
-/copy
-
-!-- Copy the generated javadocs (docs/api/module) --
-mkdir dir=${release.module.api}/
-copy todir=${release.module.api} filtering=no
- fileset dir=${build.api}
+!-- 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-dependencies depends=init
-mkdir dir=${release.lib.ext}/
-copy todir=${release.lib.ext} filtering=no
- fileset dir=${mortbay.jetty.lib}
-include name=**/*.jar/
- /fileset
- fileset dir=${mortbay.jetty3extra.jmx.lib}
-include name=**/*.jar/
- /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
[JBoss-dev] CVS update: contrib/jetty build.sh build.xml config.xml
User: user57
Date: 01/08/26 00:00:30
Modified:jettybuild.sh build.xml
Removed: jettyconfig.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 contrib/jetty/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/contrib/jetty/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2001/08/16 23:53:14 1.2
+++ build.sh 2001/08/26 07:00:30 1.3
@@ -1,23 +1,8 @@
#!/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. ##
## ##
@@ -30,10 +15,11 @@
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.3 +205 -151 contrib/jetty/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/jetty/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/08/16 23:53:14 1.2
+++ build.xml 2001/08/26 07:00:30 1.3
@@ -1,9 +1,9 @@
?xml version=1.0 encoding=UTF-8?
-!DOCTYPE project-module [ !ENTITY config SYSTEM file:./config.xml ]
+!DOCTYPE project
!-- == --
!----
-!-- JBoss, the OpenSource EJB server --
+!-- JBoss, the OpenSource J2EE webOS
[JBoss-dev] CVS update: contrib/jetty build.sh build.xml
User: user57
Date: 01/08/26 21:47:23
Modified:jettybuild.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 contrib/jetty/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/contrib/jetty/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 2001/08/26 07:00:30 1.3
+++ build.sh 2001/08/27 04:47:23 1.4
@@ -106,6 +106,11 @@
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.4 +7 -13 contrib/jetty/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/jetty/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/08/26 07:00:30 1.3
+++ build.xml 2001/08/27 04:47:23 1.4
@@ -46,18 +46,8 @@
property name=module.release value=${module.output}/
property file=${module.root}/local.properties/
- !--
- | Initialize the build system.
- |
- | o Sets the timestamp and build.number properties
- | o Installs property defaults
- | o Displays some module information
- | o Resolves properties for psuedo late-binding
- | o Installs filters for each property
- |
- | This target will not run once the initialized-already property is set.
---
- target name=init unless=initialized-already
+ !-- Initialize the build system. --
+ target name=init unless=initialized-already depends=init-buildlog
tstamp
format property=build.number pattern=MMddHHmm/
/tstamp
@@ -70,6 +60,10 @@
resolver force=${buildmagic.resolveproperties.force}/
propertyfilter all=${buildmagic.propertyfilter.all}/
property name=initialized-already value=true/
+ /target
+
+ target name=init-buildlog unless=buildlog-disabled
+record name=${basedir}/build.log append=no loglevel=info/
/target
___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty build.sh build.xml config.xml README TODO
User: user57 Date: 01/08/16 16:53:14 Added: jettybuild.sh build.xml config.xml Removed: jettyREADME TODO Log: o integrating plugins/jetty with buildmagic Revision ChangesPath 1.2 +131 -0contrib/jetty/build.sh 1.2 +490 -0contrib/jetty/build.xml 1.2 +228 -0contrib/jetty/config.xml ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty build.sh build.xml
User: user57
Date: 01/08/01 15:01:55
Modified:jettyTag: 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.5 +21 -33contrib/jetty/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/contrib/jetty/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 06:28:41 1.1.2.4
+++ build.sh 2001/08/01 22:01:54 1.1.2.5
@@ -23,7 +23,7 @@
## ##
### == ###
-# $Id: build.sh,v 1.1.2.4 2001/08/01 06:28:41 user57 Exp $
+# $Id: build.sh,v 1.1.2.5 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.7 +8 -5 contrib/jetty/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/jetty/Attic/build.xml,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- build.xml 2001/07/31 21:36:44 1.1.2.6
+++ build.xml 2001/08/01 22:01:54 1.1.2.7
@@ -10,7 +10,7 @@
!----
!-- == --
-!-- $Id: build.xml,v 1.1.2.6 2001/07/31 21:36:44 user57 Exp $ --
+!-- $Id: build.xml,v 1.1.2.7 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: contrib/jetty build.sh build.xml config.xml
User: user57 Date: 01/07/27 23:58:47 Added: jettyTag: jboss_buildmagic build.sh build.xml config.xml Log: o started working on support for plugins in a sub-directory, don't know how well this will work with the current system. Revision ChangesPath No revision No revision 1.1.2.1 +140 -0contrib/jetty/Attic/build.sh 1.1.2.1 +387 -0contrib/jetty/Attic/build.xml 1.1.2.1 +191 -0contrib/jetty/Attic/config.xml ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/jetty build.sh build.xml config.xml README TODO
User: user57
Date: 01/07/28 19:29:30
Modified:jettyTag: jboss_buildmagic build.sh build.xml config.xml
Removed: jettyTag: jboss_buildmagic README TODO
Log:
o integrated into buildmagic
Revision ChangesPath
No revision
No revision
1.1.2.3 +1 -1 contrib/jetty/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/contrib/jetty/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/07/29 02:29:30 1.1.2.3
@@ -23,7 +23,7 @@
## ##
### == ###
-# $Id: build.sh,v 1.1.2.2 2001/07/29 02:13:41 user57 Exp $
+# $Id: build.sh,v 1.1.2.3 2001/07/29 02:29:30 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
1.1.2.3 +111 -77 contrib/jetty/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/jetty/Attic/build.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- build.xml 2001/07/29 02:13:41 1.1.2.2
+++ build.xml 2001/07/29 02:29:30 1.1.2.3
@@ -10,9 +10,9 @@
!----
!-- == --
-!-- $Id: build.xml,v 1.1.2.2 2001/07/29 02:13:41 user57 Exp $ --
+!-- $Id: build.xml,v 1.1.2.3 2001/07/29 02:29:30 user57 Exp $ --
-project name=jboss-jetty-plugin default=main
+project name=jboss-plugins-jetty default=main
!-- == --
!-- Basic module configuration --
@@ -31,8 +31,8 @@
| Setup the basic module roots.
|
| module.root - Should be the directory this file is in
- | project.root-
- | project.config -
+ | project.root- Where the project root directory is
+ | project.config - Where the project configuration files live
--
property name=module.root value=${basedir}/
property name=project.root
@@ -87,16 +87,20 @@
!-- Initialize, Configure and Bootstrap the build system --
!-- == --
- !-- Bootstrap all required extensions --
+ !--
+ | Bootstrap all required extensions.
+ |
+ | Build local Ant extensions here if they are required.
+ |
+ | This target will not run once the bootstraped-already is set.
+--
target name=bootstrap
depends=bootstrap-init
unless=bootstraped-already
-!-- Build local Ant extensions (if required) --
-!-- Mark things as bootstrapped --
property name=bootstraped-already value=true/
/target
- !-- Fail if the required dependencies are missing --
+ !-- Fail if the required bootstrapping dependencies are missing --
target name=bootstrap-init
depends=bootstrap-check
unless=have-bootstrap-dependencies-already
@@ -111,11 +115,17 @@
/target
!--
- | Configure the module build system
+ | Configure the module build system.
+ |
+ | o Updates/installs example files if they exist
+ | o Invokes the 'configure-hook' target, which should be defined in
+ |config.xml.
+ |
+ | This target will not run once the configured-already property is set.
--
- target name=configure unless=configured-already
+ target name=configure
+ unless=configured-already
description=Configure the module build system.
-!-- Put the example files in place --
property name=module.examples value=${module.root}/etc/
property name=module.examples.extension value=-example/
copy todir=${module.root} filtering=yes
@@ -125,7 +135,6 @@
mapper type=glob from=*${module.examples.extension} to=*/
/copy
-!-- Execute module configure hook and mark things as configured --
antcall target=configure-hook/
property name=configured-already value=true/
/target
@@ -136,29 +145,30 @@
/target
!--
- | Initialize the build system
+ | Initialize the build system.
+ |
+ | o Sets the timestamp and build.number properties
+ | o Installs property defaults
+ | o Displays some module information
+ | o Invokes to 'init-hook' target which should be defined in config.xml
+ | o Resolves properties for psuedo late-binding
+ | o Installs
