User: user57
Date: 01/09/03 22:08:06
Modified: . build.sh build.xml
Log:
o module release is now a control module pull
o removed min targets
Revision Changes Path
1.7 +4 -1 admin/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/admin/build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.sh 2001/08/28 04:53:07 1.6
+++ build.sh 2001/09/04 05:08:06 1.7
@@ -8,12 +8,15 @@
## ##
### ====================================================================== ###
-# $Id: build.sh,v 1.6 2001/08/28 04:53:07 user57 Exp $
+# $Id: build.sh,v 1.7 2001/09/04 05:08:06 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.6 +34 -83 admin/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/admin/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/08/27 09:01:35 1.5
+++ build.xml 2001/09/04 05:08:06 1.6
@@ -10,9 +10,9 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.5 2001/08/27 09:01:35 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.6 2001/09/04 05:08:06 user57 Exp $ -->
-<project default="main">
+<project default="main" name="JBoss/Admin">
<!-- ================================================================== -->
<!-- Initialization -->
@@ -195,7 +195,7 @@
<!-- Override JUnit defaults -->
<property name="junit.timeout" value="240000"/> <!-- 4 minutes -->
<property name="junit.batchtest.todir" value="${build.reports}"/>
- <property name="junit.jvm.options" value="-client"/>
+ <property name="junit.jvm.options" value="-Ddummy"/>
<!-- ejbdoclet bits -->
<path id="dreambean.ejbdoclet.task.classpath">
@@ -225,33 +225,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}"/>
-
- <!-- 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.admin.client}/lib"/>
- <property name="release.admin.components" value="${release.admin}/components"/>
-
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
@@ -477,68 +453,46 @@
<target name="release" depends="all"
description="Builds a release distribution.">
- <!-- Copy the generated scripts & runnable jars (bin) -->
- <mkdir dir="${release.bin}"/>
- <copy todir="${release.bin}" filtering="no">
- <fileset dir="${build.bin}">
- <include name="**/*"/>
- </fileset>
- </copy>
- <!-- since copy does not preserve permissions, do this here (again) -->
- <!-- need to create unix scripts !!!
- <chmod perm="+x">
- <fileset dir="${build.bin}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
- -->
-
- <!-- 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>
-
- <!-- Copy admin files (admin) -->
- <mkdir dir="${release.admin}"/>
- <copy todir="${release.admin}" filtering="no">
- <fileset dir="${build.jars}">
+ <!-- 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>
- <!-- Copy admin files (admin/client) -->
- <mkdir dir="${release.admin.client}"/>
- <copy todir="${release.admin.client}" filtering="no">
- <fileset dir="${build.jars}">
- <include name="monitor.jar"/>
- </fileset>
- <fileset dir="${build.etc}">
- <include name="jndi.properties"/>
- </fileset>
- </copy>
+ <target name="release-archive-prepare" depends="release">
+ <mkdir dir="${module.release}"/>
+ </target>
- <!-- Copy admin files (admin/client/lib) -->
- <mkdir dir="${release.admin.client.lib}"/>
- <copy todir="${release.admin.client.lib}" filtering="no">
- <fileset dir="${build.jars}">
- <include name="**/"/>
+ <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>
- </copy>
+ </zip>
+ </target>
- <!-- Copy admin files (admin/components) -->
- <mkdir dir="${release.admin.components}"/>
- <copy todir="${release.admin.components}" filtering="no">
- <fileset dir="${build.jars}">
- <include name="SystemMonitor.jar"/>
- <include name="admin.jar"/>
- </fileset>
- </copy>
+ <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="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."/>
+
<!-- ================================================================== -->
<!-- Run tests -->
@@ -627,8 +581,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
