User: starksm 
  Date: 01/09/30 15:54:33

  Modified:    src/build Tag: Branch_2_4 build.sh build.xml
  Log:
  Update build to use a JBoss distribution rather than potentially
  out of date local copies
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.4.1 +2 -3      jbosscx/src/build/Attic/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/jbosscx/src/build/Attic/build.sh,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.4.1
  diff -u -r1.1.1.1 -r1.1.1.1.4.1
  --- build.sh  2001/02/06 06:54:40     1.1.1.1
  +++ build.sh  2001/09/30 22:54:32     1.1.1.1.4.1
  @@ -1,11 +1,10 @@
   #! /bin/sh
   
  -# $Id: build.sh,v 1.1.1.1 2001/02/06 06:54:40 allsopp Exp $
  +# $Id: build.sh,v 1.1.1.1.4.1 2001/09/30 22:54:32 starksm Exp $
   
   TARGET_CLASSPATH=../../lib/ant.jar:\
   ../../lib/jaxp.jar:\
  -../../lib/parser.jar:\
  -../../build/classes:\
  +../../lib/crimson.jar:\
   ../../lib/javac.jar
   
   java -classpath $TARGET_CLASSPATH org.apache.tools.ant.Main $*
  
  
  
  1.4.2.4   +45 -35    jbosscx/src/build/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosscx/src/build/Attic/build.xml,v
  retrieving revision 1.4.2.3
  retrieving revision 1.4.2.4
  diff -u -r1.4.2.3 -r1.4.2.4
  --- build.xml 2001/09/09 00:12:01     1.4.2.3
  +++ build.xml 2001/09/30 22:54:32     1.4.2.4
  @@ -5,45 +5,60 @@
   <!-- ======================================================================= -->
   
   <project name="JBossCX" default="jar" basedir="../..">
  -  <target name="init">
  -
  +    <!-- The location of the JBoss server dist tree. This is
  +     needed for compiling JBossCX code sinc there are dependencies
  +     on org.jboss.* classes. The default assumes the jbosscx and
  +     jboss cvs modules have the same parent directory.
  +    -->
  +    <property name="jboss.home" value="../jboss" />
  +    <property name="jboss.dist" value="${jboss.home}/dist" />
  +    <property name="jboss.client" value="${jboss.dist}/client" />
  +    <property name="jboss.lib" value="${jboss.dist}/lib" />
  +    <property name="jboss.lib.ext" value="${jboss.dist}/lib/ext" />
  +    <property name="jboss.src" value="${jboss.home}/src/main" />
       <property name="Name" value="JBossCX"/>
  -    <property name="name" value="jbosscx"/>
  -    <property name="version" value="0.2"/>
  +    <property name="version" value="1.0"/>
   
  -    <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.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="external.dir" value="${dist.dir}/external"/>
   
  -    <property name="classpath" 
value="${build.classes.dir};${src.lib.dir}/jndi.jar;${src.lib.dir}/jboss-j2ee.jar;${src.lib.dir}/jaas.jar;${src.lib.dir}/jaxp.jar;${src.lib.dir}/jboss-util.jar;${src.lib.dir}/jboss-deployer.jar;${lib.dir}/jmxri.jar;${src.lib.dir}/xml.jar;${src.lib.dir}/metadata.jar"/>
  +    <!-- The main project classpath -->
  +    <path id="base.path">
  +        <pathelement path="${build.classes.dir}" />
  +        <pathelement path="${lib.dir}/crimson.jar" />
  +        <pathelement path="${jboss.lib}/jaas.jar" />
  +        <pathelement path="${jboss.lib}/jaxp.jar" />
  +        <pathelement path="${jboss.lib}/jboss-jdbc_ext.jar" />
  +        <pathelement path="${jboss.lib}/jmxri.jar" />
  +        <pathelement path="${jboss.lib.ext}/jboss.jar" />
  +        <pathelement path="${jboss.lib.ext}/jboss-j2ee.jar" />
  +        <pathelement path="${jboss.lib.ext}/log4j.jar" />
  +    </path>
       <property name="packages" 
value="org.jboss.resource,org.jboss.resource.security"/>
   
  -    <property name="build.compiler" value="classic"/>
  -
  -    <available property="jdk1.3+" classname="java.lang.StrictMath" />
  -  </target>
   
  -  <!-- =================================================================== -->
  -  <!-- Prepares the build directory                                        -->
  -  <!-- =================================================================== -->
  -  <target name="prepare" depends="init">
  -    <mkdir dir="${build.dir}"/>
  -  </target>
  +    <target name="init">
  +        <available property="valid.jboss.dist" file="${jboss.lib}/ext/jboss.jar"/>
  +        <available property="jdk1.3+" classname="java.lang.StrictMath" />
  +    </target>
  +    <target name="error" unless="valid.jboss.dist">
  +        <echo message="jboss.home = ${jboss.home}/dist is not a valid JBoss server 
cvs dist structure"/>
  +        <fail message="Override/edit the jboss.home property and build the dist"/>
  +    </target>
  +    <target name="prepare" depends="init,error" >
  +        <mkdir dir="${build.dir}"/>
  +        <mkdir dir="${build.classes.dir}"/>
  +        <mkdir dir="${dist.dir}"/>
  +        <mkdir dir="${external.dir}"/>
  +    </target>
   
     <!-- =================================================================== -->
     <!-- Compiles the source code                                            -->
  @@ -52,10 +67,10 @@
       <mkdir dir="${build.classes.dir}"/>
       <javac srcdir="${src.dir}"
              destdir="${build.classes.dir}"
  -           classpath="${classpath}"
  -           debug="off"
  +           classpathref="base.path"
  +           debug="on"
              deprecation="off"
  -           optimize="on"
  +           optimize="off"
              includes="org/**"
       />
     </target>
  @@ -64,12 +79,7 @@
     <!-- Creates the jar archives                                            -->
     <!-- =================================================================== -->
     <target name="jar" depends="compile">
  -    <!--copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}"/>
  -    </copy-->
  -
  -    <mkdir dir="${external.dir}"/>
  -    <jar jarfile="${external.dir}/${name}.jar"
  +    <jar jarfile="${external.dir}/jbosscx.jar"
            basedir="${build.classes.dir}"
            includes="org/jboss/resource/**"
       />
  @@ -77,12 +87,12 @@
   
     <!-- Installs the jbosscx jars into the jboss.dist structure -->
     <target name="install" depends="jar">
  -    <copy file="${external.dir}/${name}.jar" todir="${jboss.dist}/lib/ext" />
  +    <copy file="${external.dir}/jbosscx.jar" todir="${jboss.dist}/lib/ext" />
     </target>
   
     <!-- Installs the jbosscx jars into the jboss.src structure -->
     <target name="src-install" depends="jar">
  -    <copy file="${external.dir}/${name}.jar" todir="${jboss.dist}/../src/lib" />
  +    <copy file="${external.dir}/jbosscx.jar" todir="${jboss.dist}/../src/lib" />
     </target>
   
     <!-- =================================================================== -->
  @@ -98,7 +108,7 @@
                version="true"
                windowtitle="${Name} API"
                doctitle="${Name}"
  -             extdirs="${src.lib.dir}"
  +             extdirs="${jboss.dist}/lib:${jboss.dist}/lib/ext"
                bottom="Copyright &#169; 2001 The JBoss Organization. All Rights 
Reserved."
       />
     </target>
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to