User: starksm
Date: 01/04/22 23:05:44
Modified: src/build build.bat build.sh build.xml
Log:
Update to Ant 1.3 and remove unnecessary jars
Revision Changes Path
1.2 +2 -3 jnp/src/build/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/jboss/jnp/src/build/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 2000/10/10 12:42:35 1.1
+++ build.bat 2001/04/23 06:05:44 1.2
@@ -2,9 +2,8 @@
REM convenience bat file to build with
set CLASSPATH=..\..\lib\ant.jar
-set CLASSPATH=%CLASSPATH%;..\..\lib\xml.jar
-set CLASSPATH=%CLASSPATH%;..\..\lib\xmlbeans.jar
-set CLASSPATH=%CLASSPATH%;..\..\build\classes
+set CLASSPATH=%CLASSPATH%;..\..\lib\crimson.jar
+set CLASSPATH=%CLASSPATH%;..\..\lib\jaxp.jar
set CLASSPATH=%CLASSPATH%;..\..\lib\javac.jar
java -classpath "%CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
1.2 +6 -8 jnp/src/build/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/jnp/src/build/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 2000/10/10 12:42:35 1.1
+++ build.sh 2001/04/23 06:05:44 1.2
@@ -1,11 +1,9 @@
#! /bin/sh
+# $Id: build.sh,v 1.2 2001/04/23 06:05:44 starksm Exp $
-# $Id: build.sh,v 1.1 2000/10/10 12:42:35 oberg Exp $
+CLASSPATH=../../lib/ant.jar
+CLASSPATH=$CLASSPATH:../../lib/crimson.jar
+CLASSPATH=$CLASSPATH:../../lib/jaxp.jar
+CLASSPATH=$CLASSPATH:../../lib/javac.jar
-TARGET_CLASSPATH=../../lib/ant.jar:\
-../../lib/xml.jar:\
-../../lib/xmlbeans.jar:\
-../../build/classes:\
-../../lib/javac.jar
-
-java -classpath $TARGET_CLASSPATH org.apache.tools.ant.Main $*
+java -classpath $CLASSPATH org.apache.tools.ant.Main $*
1.4 +58 -45 jnp/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jnp/src/build/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2000/12/12 10:57:08 1.3
+++ build.xml 2001/04/23 06:05:44 1.4
@@ -1,47 +1,46 @@
<?xml version="1.0"?>
<!-- ======================================================================= -->
-<!-- jBoss build file -->
+<!-- JNP Naming Service build file -->
<!-- ======================================================================= -->
+<project name="JNP" default="main" basedir="../..">
-<project name="JNP" default="main" basedir="../.." verbose="true">
- <target name="init">
-
- <property name="Name" value="JNP"/>
- <property name="name" value="jnp"/>
- <property name="version" value="1.2"/>
-
- <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.resources" value="${basedir}/src/resources"/>
- <property name="db.dir" value="${basedir}/db"/>
- <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="classpath"
value="${lib.dir}/jmxri.jar;${build.classes.dir};${lib.dir}/awt.jar;${lib.dir}/xml.jar;${src.lib.dir}/ejb.jar;${src.lib.dir}/ejxeditor.jar;${src.lib.dir}/jndi.jar;${src.lib.dir}/ejxejb.jar;${src.lib.dir}/jta-spec1_0_1.jar;${src.lib.dir}/jnpserver.jar;${src.lib.dir}/dynaserver.jar;${src.lib.dir}/hsql.jar;${src.lib.dir}/webserver.jar;${src.lib.dir}/idb.jar;${src.lib.dir}/jdbc2_0-stdext.jar"/>
- <property name="packages"
value="org.jnp.server,org.jnp.interfaces,org.jnp.client"/>
+ <property name="Name" value="JNP"/>
+ <property name="name" value="jnp"/>
+ <property name="version" value="1.2"/>
+ <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.resources" value="${basedir}/src/resources"/>
+ <property name="db.dir" value="${basedir}/db"/>
+ <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"/>
+
+ <path id="base.path">
+ <pathelement location="${lib.dir}/jmxri.jar" />
+ <pathelement location="${build.classes.dir}" />
+ <pathelement location="${src.lib.dir}/log4j.jar" />
+ </path>
- <property name="build.compiler" value="classic"/>
-
- </target>
+ <property name="classpath" refid="base.path" />
+ <property name="build.compiler" value="classic"/>
<!-- =================================================================== -->
<!-- Prepares the build directory -->
<!-- =================================================================== -->
- <target name="prepare" depends="init">
+ <target name="prepare">
<mkdir dir="${build.dir}"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Compiles the source code -->
<!-- =================================================================== -->
@@ -58,14 +57,16 @@
<rmic base="${build.classes.dir}"
classname="org.jnp.server.NamingServer"
stubVersion="1.2"
- classpath="${classpath}"/>
+ classpath="${classpath}"/>
</target>
<!-- =================================================================== -->
<!-- Creates the jar archives -->
<!-- =================================================================== -->
<target name="jar" depends="compile">
- <copydir src="${etc.dir}/conf" dest="${build.classes.dir}"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${etc.dir}/conf" />
+ </copy>
<mkdir dir="${build.bin.dir}"/>
<jar jarfile="${build.bin.dir}/jnpserver.jar"
@@ -97,11 +98,17 @@
<mkdir dir="${dist.dir}/lib/ext"/>
<mkdir dir="${dist.dir}/conf"/>
- <copydir src="${etc.dir}/conf" dest="${dist.dir}/conf"/>
- <copydir src="${src.bin.dir}" dest="${dist.dir}/bin"/>
- <copydir src="${src.lib.dir}" dest="${dist.dir}/lib/ext"/>
- <copydir src="${build.bin.dir}" dest="${dist.dir}/bin"/>
- <copydir src="${build.lib.dir}/ext" dest="${dist.dir}/lib/ext"/>
+ <copy todir="${dist.dir}/conf">
+ <fileset dir="${etc.dir}/conf" />
+ </copy>
+ <copy todir="${dist.dir}/bin">
+ <fileset dir="${src.bin.dir}" />
+ <fileset dir="${build.bin.dir}" />
+ </copy>
+ <copy todir="${dist.dir}/lib/ext">
+ <fileset dir="${src.lib.dir}" />
+ <fileset dir="${build.lib.dir}/ext" />
+ </copy>
</target>
<!-- =================================================================== -->
@@ -127,11 +134,17 @@
<target name="dist" depends="main,jar,javadocs">
<mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/api"/>
- <copydir src="${docs.dir}" dest="${dist.dir}/docs"/>
- <copydir src="${build.javadocs.dir}" dest="${dist.dir}/docs/api"/>
-
+ <copy todir="${dist.dir}/docs">
+ <fileset dir="${docs.dir}" />
+ </copy>
+ <copy todir="${dist.dir}/docs/api">
+ <fileset dir="${build.javadocs.dir}" />
+ </copy>
+
<mkdir dir="${dist.dir}/src"/>
- <copydir src="${src.dir}" dest="${dist.dir}/src"/>
+ <copy todir="${dist.dir}/src">
+ <fileset dir="${src.dir}" />
+ </copy>
</target>
<!-- =================================================================== -->
@@ -152,7 +165,7 @@
<!-- =================================================================== -->
<!-- Cleans up generated stuff -->
<!-- =================================================================== -->
- <target name="clean" depends="init">
+ <target name="clean">
<deltree dir="${build.dir}"/>
<deltree dir="${dist.dir}"/>
</target>
@@ -165,4 +178,4 @@
<delete file="${Name}-${version}.tar"/>
<delete file="${Name}-${version}.tar.gz"/>
</target>
-</project>
\ No newline at end of file
+</project>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development