User: user57
Date: 01/07/29 19:36:34
Modified: . Tag: jboss_buildmagic build.xml config.xml
Log:
o simplified module and project release mechanism (only for server module
currently).
Revision Changes Path
No revision
No revision
1.1.2.7 +90 -94 jboss/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/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/29 06:26:53 1.1.2.6
+++ build.xml 2001/07/30 02:36:34 1.1.2.7
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.6 2001/07/29 06:26:53 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.7 2001/07/30 02:36:34 user57 Exp $ -->
<project name="jboss-server" default="main">
@@ -62,8 +62,8 @@
| Setup the basic environment for a source module.
|
| module.source - The module source root
- | module.output - The root where build output will be placed
- | module.build - Where released files will be placed
+ | module.output - The root where generated files will be placed
+ | module.build - Where build files will be placed
| module.release - Where released files will be placed
| tools.root - Where to build support tools live
| thirdparty.root - Where to thirdparty libraries live
@@ -217,7 +217,6 @@
<exclude name="${javac.excludes}"/>
<!-- Move both of these to plugins -->
- <!-- Looks like this needs to be updated for 0.9.7.0 -->
<exclude name="org/jboss/tm/plugins/tyrex/**"/>
<exclude name="org/jboss/jdo/castor/**"/>
@@ -325,38 +324,6 @@
</fileset>
</jar>
- <!-- Build jboss-metadata.jar -->
- <jar jarfile="${build.jars}/jboss-metadata.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/metadata/**"/>
- <include name="org/jboss/ejb/DeploymentException.class"/>
- </fileset>
- <fileset dir="${build.etc}/conf/default">
- <include name="standardjboss.xml"/>
- </fileset>
- </jar>
-
- <!-- Build jboss-util.jar -->
- <jar jarfile="${build.jars}/jboss-util.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/util/Service.class"/>
- <include name="org/jboss/util/ServiceMBean*"/>
- <include name="org/jboss/util/MBeanProxy*"/>
- <include name="org/jboss/proxy/**"/>
- <include name="org/jboss/logging/Log.class"/>
- <include name="org/jboss/logging/LogWriter.class"/>
- <include name="org/jboss/monitor/MetricsConstants.class"/>
- </fileset>
- </jar>
-
- <!-- Build jboss-deployer.jar -->
- <jar jarfile="${build.jars}/jboss-deployer.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/deployment/DeployerMBean*"/>
- <include name="org/jboss/deployment/DeploymentException*"/>
- </fileset>
- </jar>
-
<!-- Build run.jar -->
<jar jarfile="${build.jars}/run.jar"
manifest="${build.etc}/run.mf">
@@ -439,6 +406,38 @@
</fileset>
</jar>
+ <!-- Build jboss-metadata.jar -->
+ <jar jarfile="${build.jars}/jboss-metadata.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/metadata/**"/>
+ <include name="org/jboss/ejb/DeploymentException.class"/>
+ </fileset>
+ <fileset dir="${build.etc}/conf/default">
+ <include name="standardjboss.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-util.jar -->
+ <jar jarfile="${build.jars}/jboss-util.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/util/Service.class"/>
+ <include name="org/jboss/util/ServiceMBean*"/>
+ <include name="org/jboss/util/MBeanProxy*"/>
+ <include name="org/jboss/proxy/**"/>
+ <include name="org/jboss/logging/Log.class"/>
+ <include name="org/jboss/logging/LogWriter.class"/>
+ <include name="org/jboss/monitor/MetricsConstants.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-deployer.jar -->
+ <jar jarfile="${build.jars}/jboss-deployer.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/deployment/DeployerMBean*"/>
+ <include name="org/jboss/deployment/DeploymentException*"/>
+ </fileset>
+ </jar>
+
<!-- Build jms-ra.rar -->
<jar jarfile="${build.jars}/jms-ra.rar">
<fileset dir="${build.classes}">
@@ -512,8 +511,7 @@
protected="${javadoc.protected}"
private="${javadoc.private}"
use="${javadoc.use}"
- verbose="${javadoc.verbose}"
- bottom="Copyright © 2000 The JBoss Organization. All Rights
Reserved.">
+ verbose="${javadoc.verbose}">
<!-- <group title="???" packages="*"/> -->
</javadoc>
</target>
@@ -523,76 +521,74 @@
<!-- Builds a release distribution. -->
<!-- ================================================================== -->
- <target name="release"
- depends="all"
+ <target name="release" depends="all"
description="Builds a release distribution.">
- <!-- Copy the files to release -->
- <antcall target="copy-files">
- <param name="to.lib" value="${release.lib}"/>
- <param name="from.lib" value="${build.jars}"/>
- <param name="to.api" value="${release.api}"/>
- <param name="from.api" value="${build.api}"/>
- </antcall>
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${release.lib}"/>
+ <copy todir="${release.lib}" filtering="no">
+ <fileset dir="${build.jars}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${release.module.api}"/>
+ <copy todir="${release.module.api}" filtering="no">
+ <fileset dir="${build.api}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Make some directories -->
+ <mkdir dir="${release.db}/hypersonic"/>
+ </target>
- <!-- Build a jar for the release -->
+ <target name="release-archive-prepare" depends="release">
<mkdir dir="${module.release}"/>
- <mkdir dir="${module.output}"/>
- <jar jarfile="${module.output}/${module.name}-${build.id}.jar">
+ <property name="release.archive.basename"
+ value="${module.release}/${release.id}"/>
+ </target>
+
+ <target name="release-jar" depends="release-archive-prepare"
+ description="Builds a JAR release distribution.">
+ <jar jarfile="${release.archive.basename}.jar">
<fileset dir="${module.release}">
- <include name="**"/>
+ <include name="${release.id}/**"/>
</fileset>
</jar>
</target>
-
- <!-- ================================================================== -->
- <!-- Install release files into project output. -->
- <!-- ================================================================== -->
+ <target name="release-zip" depends="release-archive-prepare"
+ description="Builds a ZIP release distribution.">
+ <zip zipfile="${release.archive.basename}.zip">
+ <fileset dir="${module.release}">
+ <include name="${release.id}/**"/>
+ </fileset>
+ </zip>
+ </target>
- <target name="install-check" depends="init">
- <require property="install.lib"/>
- <require property="install.module.api"/>
- </target>
-
- <target name="install" depends="install-check, release"
- description="Installs released files into project namespace.">
- <!-- Copy the files to project -->
- <antcall target="copy-files">
- <param name="to.lib" value="${install.lib}"/>
- <param name="from.lib" value="${release.lib}"/>
- <param name="to.api" value="${install.module.api}"/>
- <param name="from.api" value="${release.api}"/>
- </antcall>
+ <target name="release-tar" depends="release-archive-prepare"
+ description="Builds a TAR release distribution.">
- <!-- Make some directories -->
- <mkdir dir="${install.db}/hypersonic"/>
- </target>
+ <tar tarfile="${release.archive.basename}.tar"
+ basedir="${module.release}" longfile="gnu">
- <!-- ================================================================== -->
- <!-- Release/Install file copying. -->
- <!-- ================================================================== -->
+ <!-- this is taring up other release distributions, fix me -->
- <!--
- | This target is a helper for release and install to consolidate the
- | task logic required to copy files.
- -->
- <target name="copy-files">
- <!-- Copy the generated libraries -->
- <mkdir dir="${to.lib}"/>
- <copy todir="${to.lib}" filtering="no">
- <fileset dir="${from.lib}">
- <include name="**/*"/>
- </fileset>
- </copy>
+ <tarfileset dir="${module.release}">
+ <include name="${release.id}/**"/>
+ </tarfileset>
+ </tar>
+ </target>
- <!-- Copy the generated javadocs -->
- <mkdir dir="${to.api}"/>
- <copy todir="${to.api}" filtering="no">
- <fileset dir="${from.api}">
- <include name="**/*"/>
- </fileset>
- </copy>
+ <target name="release-tgz" depends="release-tar"
+ description="Builds a TAR-GZIP release distribution.">
+ <gzip src="${release.archive.basename}.tar"
+ zipfile="${release.archive.basename}.tgz"/>
</target>
+
+ <target name="release-all" depends="release-jar, release-zip, release-tgz"
+ description="Builds a distribution for each archive type."/>
<!-- ================================================================== -->
1.1.2.5 +11 -4 jboss/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/Attic/config.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- config.xml 2001/07/29 06:26:53 1.1.2.4
+++ config.xml 2001/07/30 02:36:34 1.1.2.5
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.4 2001/07/29 06:26:53 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.5 2001/07/30 02:36:34 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
@@ -23,7 +23,7 @@
<!-- Module name(s) & version -->
<property name="module.name" value="${ant.project.name}"/>
<property name="module.Name" value="JBoss Server"/>
- <property name="module.version" value="2.5alpha"/>
+ <property name="module.version" value="${build.number}"/>
<!-- This module is based on Java 1.2 -->
<property name="javac.target" value="1.2"/>
@@ -229,8 +229,15 @@
<property name="build.resources" value="${module.build}/resources"/>
<!-- Where release generated files will go -->
- <property name="release.lib" value="${module.release}/lib"/>
- <property name="release.api" value="${module.release}/api"/>
+ <property name="release.id" value="${module.name}-${build.id}"/>
+ <property name="release.root" value="${module.release}/${release.id}"/>
+
+ <property name="release.lib" value="${release.root}/lib"/>
+ <property name="release.lib.ext" value="${release.lib}/ext"/>
+ <property name="release.docs" value="${release.root}/docs"/>
+ <property name="release.db" value="${release.root}/db"/>
+ <property name="release.api" value="${release.docs}/api"/>
+ <property name="release.module.api" value="${release.api}/${module.name}"/>
<!-- ================================================================== -->
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
