User: kimptoc
Date: 01/03/25 08:20:20
Modified: src/build build.bat build.sh build.xml
Added: src/build lcp.bat
Log:
upgrade to ant 1.3 to make build more maintainable
Revision Changes Path
1.3 +4 -4 jbossmq/src/build/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/build/build.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.bat 2001/03/24 06:32:08 1.2
+++ build.bat 2001/03/25 16:20:20 1.3
@@ -4,11 +4,11 @@
REM convenience bat file to build with
-set CP=%CP%;..\..\lib\ant.jar
-set CP=%CP%;..\..\lib\jaxp.jar
-set CP=%CP%;..\..\lib\crimson.jar
+
+for %%i in (..\..\lib\*.jar) do call lcp.bat %%i
+
set CP=%CP%;..\..\build\classes
-set CP=%CP%;..\..\lib\javac.jar
+
java -classpath "%CP%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
@pause
1.3 +4 -6 jbossmq/src/build/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/build/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2001/03/24 06:32:08 1.2
+++ build.sh 2001/03/25 16:20:20 1.3
@@ -1,11 +1,9 @@
#! /bin/sh
-# $Id: build.sh,v 1.2 2001/03/24 06:32:08 starksm Exp $
+# $Id: build.sh,v 1.3 2001/03/25 16:20:20 kimptoc Exp $
-TARGET_CLASSPATH=../../lib/ant.jar:\
-../../lib/jaxp.jar:\
-../../lib/crimson.jar:\
-../../build/classes:\
-../../lib/javac.jar
+TARGET_CLASSPATH=`echo ../../lib/*.jar | tr ' ' ':'`
+
+TARGET_CLASSPATH=${TARGET_CLASSPATH}:../../build/classes
java -classpath $TARGET_CLASSPATH org.apache.tools.ant.Main $*
1.5 +62 -61 jbossmq/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/build/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/03/24 06:32:08 1.4
+++ build.xml 2001/03/25 16:20:20 1.5
@@ -6,58 +6,57 @@
<project name="JBossMQ" default="main" basedir="../..">
<target name="init">
-
- <property name="Name" value="JBossMQ"/>
- <property name="name" value="jbossmq"/>
- <property name="version" value="0.8"/>
-
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="src.bin.dir" value="${basedir}/src/bin"/>
- <property name="src.dir" value="${basedir}/src/main"/>
+ <echo message="build.compiler = ${build.compiler}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="user.home = ${user.home}"/>
+ <echo message="java.class.path = ${java.class.path}"/>
+ <echo message=""/>
- <property name="src.client.dir" value="${basedir}/src/client"/>
- <property name="src.examples.dir" value="${basedir}/src/examples"/>
- <property name="src.resources" value="${basedir}/src/resources"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="lib.ext.dir" value="${lib.dir}/ext"/>
- <property name="etc.dir" value="${basedir}/src/etc"/>
- <property name="src.lib.dir" value="${basedir}/src/lib"/>
- <property name="docs.dir" value="${basedir}/src/docs"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="build.bin.dir" value="${build.dir}/bin"/>
- <property name="build.lib.dir" value="${build.dir}/lib"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.javadocs.dir" value="${build.dir}/docs/api"/>
- <property name="dist.dir" value="dist"/>
+ <available property="jdk1.3+" classname="java.lang.StrictMath" />
+ </target>
+
+
+
+ <property name="Name" value="JBossMQ"/>
+ <property name="name" value="jbossmq"/>
+ <property name="version" value="0.8"/>
+
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="src.bin.dir" value="${basedir}/src/bin"/>
+ <property name="src.dir" value="${basedir}/src/main"/>
+
+ <property name="src.client.dir" value="${basedir}/src/client"/>
+ <property name="src.examples.dir" value="${basedir}/src/examples"/>
+ <property name="src.resources" value="${basedir}/src/resources"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="lib.ext.dir" value="${lib.dir}/ext"/>
+ <property name="etc.dir" value="${basedir}/src/etc"/>
+ <property name="src.lib.dir" value="${basedir}/src/lib"/>
+ <property name="docs.dir" value="${basedir}/src/docs"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="build.bin.dir" value="${build.dir}/bin"/>
+ <property name="build.lib.dir" value="${build.dir}/lib"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.javadocs.dir" value="${build.dir}/docs/api"/>
+ <property name="dist.dir" value="dist"/>
+
+ <property name="packages" value="org.jbossmq.*" />
+
+ <property name="build.compiler" value="classic"/>
+
+ <!-- base jboss/jbossmq packages these go in the dist/lib directory, others go
into dist/lib/ext -->
+ <property name="jboss.core.packages" value="crimson.jar,jmxri.jar" />
+
- <property name="classpath" value="
- ${src.lib.dir}/jmxri.jar;
- ${src.lib.dir}/jaxp.jar;
- ${src.lib.dir}/crimson.jar;
- ${src.lib.dir}/jnpserver.jar;
- ${src.lib.dir}/jms.jar;
- ${src.lib.dir}/jndi.jar;
- ${src.lib.dir}/jboss_base.jar;
- ${src.lib.dir}/jta-spec1_0_1.jar;
- ${src.lib.dir}/oswego-concurrent.jar;
- ${src.lib.dir}/gnu-regexp-1.0.8.jar"/>
-
- <property name="packages" value="
- org.jbossmq,
- org.jbossmq.distributed.interfaces,
- org.jbossmq.distributed.server,
- org.jbossmq.multiplexor,
- org.jbossmq.persistence,
- org.jbossmq.referenceable,
- org.jbossmq.selectors,
- org.jbossmq.server,
- org.jbossmq.xml
- "/>
+ <!-- Build classpath -->
+ <path id="classpath">
+ <fileset dir="${src.lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
- <property name="build.compiler" value="classic"/>
- <available property="jdk1.3+" classname="java.lang.StrictMath" />
- </target>
+
<!-- =================================================================== -->
<!-- Prepares the build directory -->
@@ -73,26 +72,29 @@
<mkdir dir="${build.classes.dir}"/>
<javac srcdir="${src.dir}"
destdir="${build.classes.dir}"
- classpath="${classpath}"
debug="off"
deprecation="off"
optimize="on"
includes="org/**"
- />
+ >
+ <classpath refid="classpath"/>
+ </javac>
<!--
- <javac srcdir="${examples.dir}" destdir="${build.examples}"
classpath="${build.lib}/ext/jnpserver.jar;${build.lib}/ext/jms.jar;${build.lib}/ext/jndi.jar;${build.dest}"
debug="${debug}"/>
+ <javac srcdir="${examples.dir}" destdir="${build.examples}"
classpath="${build.lib}/**/*.jar;${build.dest}" debug="${debug}"/>
-->
<rmic base="${build.classes.dir}"
classname="org.jbossmq.distributed.server.DistributedJMSServerRMIImpl"
- classpath="${classpath}"
- stubVersion="1.2" />
+ stubVersion="1.2" >
+ <classpath refid="classpath"/>
+ </rmic>
<rmic base="${build.classes.dir}"
classname="org.jbossmq.distributed.server.ConnectionReceiverRMIImpl"
- classpath="${classpath}"
- stubVersion="1.2" />
+ stubVersion="1.2" >
+ <classpath refid="classpath"/>
+ </rmic>
</target>
@@ -155,14 +157,12 @@
<copy todir="${dist.dir}/lib">
<fileset dir="${src.lib.dir}"
- includes="crimson.jar,jmxri.jar"
+ includes="${jboss.core.packages}"
/>
</copy>
<copy todir="${dist.dir}/lib/ext">
<fileset dir="${src.lib.dir}"
- includes="jboss_base.jar,jms.jar,gnu-regexp-1.0.8.jar,
- jmxtools.jar,jndi.jar,jnpserver.jar,jta-spec1_0_1.jar,
- oswego-concurrent.jar"
+ excludes="${jboss.core.packages}"
/>
</copy>
@@ -192,14 +192,15 @@
<javadoc packagenames="${packages}"
sourcepath="${src.dir}"
destdir="${build.javadocs.dir}"
- classpath="${classpath}"
author="true"
version="true"
windowtitle="${Name} API"
doctitle="${Name}"
extdirs="${src.lib.dir}"
bottom="Copyright © 2000 The JBoss Organization. All Rights
Reserved."
- />
+ >
+ <classpath refid="classpath"/>
+ </javadoc>
</target>
<!-- =================================================================== -->
1.1 jbossmq/src/build/lcp.bat
Index: lcp.bat
===================================================================
rem $Id: lcp.bat,v 1.1 2001/03/25 16:20:20 kimptoc Exp $
set CP=%CP%;%1
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
