User: user57
Date: 01/12/05 19:25:26
Modified: website build.bat build.sh build.xml
Log:
o fixed up jboss-website to use new build.xml stuff
o added generation of dtds.ear (minor hack) to get the /j2ee/dtd/* stuff
back online.
Revision Changes Path
1.4 +2 -2 build/website/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/jboss/build/website/build.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.bat 2001/09/12 00:55:02 1.3
+++ build.bat 2001/12/06 03:25:26 1.4
@@ -8,7 +8,7 @@
REM
REM ======================================================================
REM
-REM $Id: build.bat,v 1.3 2001/09/12 00:55:02 user57 Exp $
+REM $Id: build.bat,v 1.4 2001/12/06 03:25:26 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.4 +15 -2 build/website/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/build/website/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 2001/09/12 00:55:02 1.3
+++ build.sh 2001/12/06 03:25:26 1.4
@@ -8,7 +8,7 @@
## ##
### ====================================================================== ###
-# $Id: build.sh,v 1.3 2001/09/12 00:55:02 user57 Exp $
+# $Id: build.sh,v 1.4 2001/12/06 03:25:26 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.17 +89 -318 build/website/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/build/website/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/11/20 01:14:45 1.16
+++ build.xml 2001/12/06 03:25:26 1.17
@@ -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,161 +12,78 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.16 2001/11/20 01:14:45 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.17 2001/12/06 03:25:26 user57 Exp $ -->
<project default="main" name="JBoss Website/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 -->
<!-- ================================================================== -->
+
+ <!--
+ | Initialize the build system. Must depend on '_buildmagic:init'.
+ | Other targets should depend on 'init' or things will mysteriously fail.
+ -->
- <!-- 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 preperation before init. -->
- <target name="_init-prepare">
- <available file="${module.root}/etc/local.properties-example"
- property="init.have-local-properties"/>
- </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>
+ <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="0"/>
+ <property name="version.minor" value="0"/>
+ <property name="version.revision" value="0"/>
+ <property name="version.tag" value="unknown"/>
+ <property name="version.name" value="has-to-be-here"/>
+
<!-- Module name(s) & version -->
<property name="module.name" value="jboss-website"/>
<property name="module.Name" value="JBoss Website"/>
<property name="module.version" value="DEV"/>
-
- <!-- 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>
-
- <!-- 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>
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
- <!-- Configure the thirdparty libraries required by this module. -->
- <target name="_configure-libraries" unless="configure-libraries.disable">
<!-- The combined library classpath -->
<path id="library.classpath">
</path>
- </target>
- <!-- Configure the external modules which this module depends on. -->
- <target name="_configure-modules" unless="configure-modules.disable">
+ <!-- ============== -->
+ <!-- Modules/Groups -->
+ <!-- ============== -->
+
<!-- The group to use by default -->
<property name="groups" value="default"/>
@@ -207,11 +126,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"/>
@@ -239,103 +158,18 @@
<!-- 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"/>
- </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"/>
- </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"/>
- </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"/>
- </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"/>
- </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>
-
- <!-- 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>
+ <!--
+ | These targets will execute all configured modules with the specified
+ | 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"/>
<!-- ================================================================== -->
@@ -394,6 +228,7 @@
<copy todir="${install.deploy}">
<fileset dir="${_module.output}/lib">
<include name="snapshots.ear"/>
+ <include name="dtds.ear"/>
</fileset>
</copy>
</target>
@@ -445,111 +280,51 @@
<!-- ================================================================== -->
- <!-- 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"/>
-
-
- <!-- ================================================================== -->
- <!-- Release -->
- <!-- ================================================================== -->
-
- <target name="release" depends="install, modules-all">
- </target>
- <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."/>
-
+ <target name="release" depends="install, modules-all"/>
- <!-- ================================================================== -->
- <!-- 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="modules-clobber, clean"
+ <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">
- <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. -->
<!-- ================================================================== -->
@@ -562,6 +337,9 @@
<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."/>
+
<!-- ================================================================== -->
<!-- Generate the Website -->
@@ -617,13 +395,6 @@
<copy todir="${jboss.deploy.root}">
<fileset dir="${install.deploy}">
<include name="survey.ear"/>
- </fileset>
- </copy>
-
- <!-- copy the SURVEY-HELPER deployables but first wait 30 seconds -->
- <sleep seconds="30"/>
- <copy todir="${jboss.deploy.root}">
- <fileset dir="${install.deploy}">
<include name="survey-helper.ear"/>
</fileset>
</copy>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
