User: user57
Date: 01/07/30 19:29:11
Modified: . Tag: jboss_buildmagic build.xml config.xml
Log:
o Updated some modules from HEAD
o Converted most modules to new release style (except plugins and manual)
o Most modules produce the correct binary structure.
o short of the manual and valid testsuite jars the system will build now.
Revision Changes Path
No revision
No revision
1.1.2.5 +87 -73 jbosspool/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosspool/Attic/build.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- build.xml 2001/07/29 04:57:40 1.1.2.4
+++ build.xml 2001/07/31 02:29:11 1.1.2.5
@@ -10,9 +10,9 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.4 2001/07/29 04:57:40 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.5 2001/07/31 02:29:11 user57 Exp $ -->
-<project name="jboss-pool" default="main">
+<project default="main">
<!-- ================================================================== -->
<!-- Basic module configuration -->
@@ -195,7 +195,7 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-classes"
+ depends="compile-classes, compile-resources"
description="Compile all source files."/>
<!-- Compile all class files -->
@@ -215,16 +215,18 @@
<classpath refid="javac.classpath"/>
<include name="${javac.includes}"/>
<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/**"/>
-
- <!-- This is currently contains outdated package references. -->
- <exclude name="test/**"/>
</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>
<!-- ================================================================== -->
@@ -237,12 +239,33 @@
<target name="jars" depends="compile" description="Builds all jar files.">
<mkdir dir="${build.jars}"/>
- <!-- Build the module jar -->
- <jar jarfile="${build.jars}/${module.name}.jar">
+ <!-- Build jbosspool.jar -->
+ <jar jarfile="${build.jars}/jbosspool.jar">
<fileset dir="${build.classes}">
<include name="**"/>
</fileset>
</jar>
+
+ <!-- Build ra-libs.jar -->
+ <jar jarfile="${build.jars}/ra-libs.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/pool/*.class"/>
+ <include name="org.jboss/pool/connector/*.class"/>
+ <include name="org.jboss/pool/connector/jdbc/*.class"/>
+ <include name="org.jboss/pool/cache/*.class"/>
+ <include name="org.jboss/pool/jdbc/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbosspool-jdbc.jar -->
+ <jar jarfile="${build.jars}/jbosspool-jdbc.jar">
+ <fileset dir="${build.resources}/jdbc-rar">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${build.jars}">
+ <include name="ra-libs.jar"/>
+ </fileset>
+ </jar>
</target>
@@ -304,78 +327,68 @@
<!-- ================================================================== -->
- <!-- Release/Install file copying. -->
+ <!-- Builds a release distribution. -->
<!-- ================================================================== -->
- <!--
- | 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="**/*"/>
+ <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="jboss.jar"/>
</fileset>
</copy>
- <!-- Copy the generated javadocs -->
- <mkdir dir="${to.api}"/>
- <copy todir="${to.api}" filtering="no">
- <fileset dir="${from.api}">
+ <!-- Copy the generated deployment libraries (deploy/lib) -->
+ <mkdir dir="${release.deploy.lib}"/>
+ <copy todir="${release.deploy.lib}" filtering="no">
+ <fileset dir="${build.jars}">
+ <include name="*-jdbc-ra.rar"/>
+ </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}">
<include name="**/*"/>
</fileset>
</copy>
</target>
-
-
- <!-- ================================================================== -->
- <!-- Builds a release distribution. -->
- <!-- ================================================================== -->
-
- <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>
- <!-- 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-zip" depends="release-archive-prepare"
+ description="Builds a ZIP release distribution.">
+ <zip zipfile="${release.archive.basename}.zip">
<fileset dir="${module.release}">
- <include name="**"/>
+ <include name="${release.id}/**"/>
</fileset>
- </jar>
+ </zip>
</target>
-
- <!-- ================================================================== -->
- <!-- Install release files into project output. -->
- <!-- ================================================================== -->
+ <target name="release-tar" depends="release-archive-prepare"
+ description="Builds a TAR release distribution.">
+ <tar tarfile="${release.archive.basename}.tar" longfile="gnu"
+ basedir="${module.release}"
+ includes="${release.id}/**">
+ </tar>
+ </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-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-zip, release-tgz"
+ description="Builds a distribution for each archive type."/>
+
<!-- ================================================================== -->
<!-- Cleans up generated stuff -->
@@ -403,12 +416,13 @@
<target name="help">
<projecthelp>
- <header/>
- <header> The ${module.Name} module.</header>
- <header/>
- <footer/>
- <footer> * -projecthelp for all targets</footer>
- <footer> * -help for full options</footer>
+ <header><![CDATA[
+ The ${module.Name} module.
+]]></header>
+ <footer><![CDATA[
+ -projecthelp for all targets
+ -help for full options
+]]></footer>
</projecthelp>
</target>
1.1.2.3 +53 -17 jbosspool/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/jbosspool/Attic/config.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- config.xml 2001/07/29 02:13:41 1.1.2.2
+++ config.xml 2001/07/31 02:29:11 1.1.2.3
@@ -6,28 +6,18 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- -->
<!-- ====================================================================== -->
-<!-- -->
-<!-- Module configuration. -->
-<!-- -->
-<!-- Define configuration elements that are used by the module build -->
-<!-- system here. -->
-<!-- -->
-<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.2 2001/07/29 02:13:41 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.3 2001/07/31 02:29:11 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
<!-- ================================================================== -->
<!-- Module name(s) & version -->
- <property name="module.name" value="${ant.project.name}"/>
+ <property name="module.name" value="pool"/>
<property name="module.Name" value="JBoss Pool"/>
- <property name="module.version" value="2.5alpha"/>
+ <property name="module.version" value="1.0"/>
- <!-- This module is based on Java 1.2 -->
- <property name="javac.target" value="1.2"/>
-
<!-- ================================================================== -->
<!-- Tool Setup -->
@@ -110,14 +100,14 @@
<property name="jboss.server.root" value="${project.root}/server/output"/>
<property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
<path id="jboss.server.classpath">
- <pathelement path="${jboss.server.lib}/jboss-server.jar"/>
+ <pathelement path="${jboss.server.lib}/jboss.jar"/>
</path>
<!-- Connector -->
<property name="jboss.connector.root" value="${project.root}/connector/output"/>
<property name="jboss.connector.lib" value="${jboss.connector.root}/lib"/>
<path id="jboss.connector.classpath">
- <pathelement path="${jboss.connector.lib}/jboss-connector.jar"/>
+ <pathelement path="${jboss.connector.lib}/jbosscx.jar"/>
</path>
<!-- The combined depedant module classpath -->
@@ -138,6 +128,9 @@
<path refid="dependentmodule.classpath"/>
</path>
+ <!-- This module is based on Java 1.2 -->
+ <property name="javac.target" value="1.2"/>
+
<!-- classpath and local.classpath must have a value using with a path -->
<property name="classpath" value=""/>
<property name="local.classpath" value=""/>
@@ -160,16 +153,59 @@
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
<property name="source.etc" value="${module.source}/etc"/>
+ <property name="source.resources" value="${module.source}/resources"/>
<!-- Where build generated files will go -->
<property name="build.classes" value="${module.build}/classes"/>
<property name="build.jars" value="${module.build}/lib"/>
<property name="build.api" value="${module.build}/api"/>
<property name="build.etc" value="${module.build}/etc"/>
+ <property name="build.resources" value="${module.build}/resources"/>
+ <!-- Where source files live -->
+ <property name="source.java" value="${module.source}/main"/>
+ <property name="source.etc" value="${module.source}/etc"/>
+ <property name="source.bin" value="${module.source}/bin"/>
+ <property name="source.docs" value="${module.source}/docs"/>
+ <property name="source.resources" value="${module.source}/resources"/>
+
+ <!-- Where build generated files will go -->
+ <property name="build.classes" value="${module.build}/classes"/>
+ <property name="build.jars" value="${module.build}/lib"/>
+ <property name="build.api" value="${module.build}/api"/>
+ <property name="build.etc" value="${module.build}/etc"/>
+ <property name="build.bin" value="${module.build}/bin"/>
+ <property name="build.docs" value="${module.build}/docs"/>
+ <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}-${module.version}-${build.id}"/>
+ <property name="release.root" 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}"/>
+
+ <!-- Not really sure why these are here -->
+ <property name="release.admin" value="${release.root}/admin"/>
+ <property name="release.admin.client" value="${release.admin}/client"/>
+ <property name="release.admin.client.lib" value="${release.client}/lib"/>
+ <property name="release.admin.components" value="${release.admin}/components"/>
<!-- ================================================================== -->
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
