User: vincent 
  Date: 00/08/24 19:33:19

  Modified:    build    build.sh build.xml
  Log:
  Updated the build process so that a distribution is created that is
  more consistent with JBoss.
  
  Revision  Changes    Path
  1.4       +13 -18    spyderMQ/build/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /products/cvs/ejboss/spyderMQ/build/build.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.sh  2000/06/09 21:43:20     1.3
  +++ build.sh  2000/08/25 02:33:18     1.4
  @@ -1,5 +1,14 @@
   #!/bin/bash
   
  +# Make sure the PROJECT_HOME environment variable is set.
  +
  +if [ -z $PROJECT_HOME ] ; then
  +    echo "build.sh: error: PROJECT_HOME environment variable must"
  +    echo "                 be set.  Typically, something like"
  +    echo "                 '~/development/projects/spydermq'."
  +    exit 1
  +fi
  +
   # Choose your JDK
   #
   
  @@ -14,16 +23,16 @@
   #-------------------------------------------------------------------
   
   # change dir to ".." because Ant has some problems when basedir!="."
  -cd ..
  +#cd ..
   
   # set the LIB variable to the lib in the CVS tree
   # these are the libraries needed by the application
   
  -LIB=lib
  +LIB=../lib
   
   # there is a path for Ant build files
   
  -BF=build
  +BF=.
   
   #--------------------------------------------
   # No need to edit anything past here
  @@ -39,19 +48,5 @@
   
   # antRun must be executable
   chmod +x ${BF}/bin/antRun
  -
  -${JAVA} -classpath ${CP} -Dant.home=${BF} -Dbuild.files=${BF} 
org.apache.tools.ant.Main -buildfile ${BUILDFILE} ${TARGET}
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
   
  +${JAVA} -classpath ${CP} -Dfinal.dir=${SPYDERMQ_HOME} 
-Dproject.home=${PROJECT_HOME} -Dant.home=${BF} -Dbuild.files=${BF} 
org.apache.tools.ant.Main -buildfile ${BUILDFILE} ${TARGET}
  
  
  
  1.14      +22 -31    spyderMQ/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /products/cvs/ejboss/spyderMQ/build/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml 2000/06/14 19:16:48     1.13
  +++ build.xml 2000/08/25 02:33:18     1.14
  @@ -11,30 +11,33 @@
                <property name="debug" value="off"/>
                
                <!-- DIRECTORIES -->            
  -             <property name="src.java.dir"           value="src/java"/>
  -             <property name="src.scripts.dir"        value="src/scripts/run"/>
  -             <property name="build.dir"              value="bin"/>
  -             <property name="lib.dir"                value="lib"/>
  -             <property name="conf.dir"               value="conf"/>
  -             <property name="docs.dir"               value="docs"/>
  -             <property name="examples.dir"           value="examples"/>
  +             <property name="src.java.dir"           
value="${project.home}/src/java"/>
  +             <property name="src.scripts.dir"        
value="${project.home}/src/scripts/run"/>
  +             <property name="build.dir"              value="${project.home}/dist"/>
  +             <property name="lib.dir"                value="${project.home}/lib"/>
  +             <property name="conf.dir"               value="${project.home}/conf"/>
  +             <property name="docs.dir"               value="${project.home}/docs"/>
  +             <property name="examples.dir"           
value="${project.home}/examples"/>
                
  -             <property name="final.dir"              
value="${build.dir}/${final.name}/"/>
  -
                <property name="build.src"              value="${final.dir}/src"/>
  -             <property name="build.dest"             value="${final.dir}/classes"/>
  +             <property name="build.dest"             
value="${project.home}/classes"/>
                <property name="build.lib"              value="${final.dir}/lib"/>
                <property name="build.docs"             value="${final.dir}/docs"/>
  +             <property name="build.conf"             value="${final.dir}/conf"/>
  +             <property name="build.bin"              value="${final.dir}/bin"/>
  +             <property name="build.examples"         value="${final.dir}/examples"/>
        </target>
     
        <target name="prepare" depends="init">
                <!-- MAKE THE DIRECTORIES IF NEEDED -->
  -             <mkdir dir="${build.dir}"/>
                <mkdir dir="${final.dir}"/>
                <mkdir dir="${build.src}"/>
                <mkdir dir="${build.dest}"/>            
                <mkdir dir="${build.lib}"/>
                <mkdir dir="${build.docs}"/>            
  +             <mkdir dir="${build.conf}"/>            
  +             <mkdir dir="${build.bin}"/>             
  +             <mkdir dir="${build.examples}"/>                
                
                <!-- MAKE THE SOURCE DIRECTORY -->
                <mkdir dir="${build.src}/org/spydermq"/>
  @@ -49,12 +52,12 @@
                <copydir  src="${docs.dir}" dest="${build.docs}"/>              
   
                <!-- COPY THE EXAMPLES -->
  -             <copydir  src="${src.scripts.dir}" dest="${final.dir}"/>
  +             <copydir  src="${src.scripts.dir}" dest="${build.bin}"/>
   
                <!-- COPYING JNDI PROPERTIES -->             
  -             <copyfile  src="${conf.dir}/jndi.properties" 
dest="${final.dir}/jndi.properties"/>
  -             <copyfile  src="${conf.dir}/spyderMQ.properties" 
dest="${final.dir}/spyderMQ.properties"/>
  -             <copyfile  src="${conf.dir}/spyderMQ.plugin" 
dest="${final.dir}/spyderMQ.plugin"/>
  +             <copyfile  src="${conf.dir}/jndi.properties" 
dest="${build.conf}/jndi.properties"/>
  +             <copyfile  src="${conf.dir}/spyderMQ.properties" 
dest="${build.conf}/spyderMQ.properties"/>
  +             <copyfile  src="${conf.dir}/spyderMQ.plugin" 
dest="${build.conf}/spyderMQ.plugin"/>
   
                <!-- MISC FILES -->
                <copyfile src="AUTHORS"   dest="${final.dir}/AUTHORS"/>
  @@ -67,7 +70,7 @@
        
                <!-- The JAVAC command -->
                <javac srcdir="${build.src}" destdir="${build.dest}" 
classpath="${build.lib}/jmxri.jar;${build.lib}/jnpserver.jar;${build.lib}/jms.jar;${build.lib}/jndi.jar"
 debug="${debug}"/>
  -             <javac srcdir="${examples.dir}" destdir="${final.dir}" 
classpath="${build.lib}/jmxri.jar;${build.lib}/jnpserver.jar;${build.lib}/jms.jar;${build.lib}/jndi.jar;${build.dest}"
 debug="${debug}"/>
  +             <javac srcdir="${examples.dir}" destdir="${build.examples}" 
classpath="${build.lib}/jmxri.jar;${build.lib}/jnpserver.jar;${build.lib}/jms.jar;${build.lib}/jndi.jar;${build.dest}"
 debug="${debug}"/>
                
                <!-- The RMIC commands -->
                <rmic base="${build.dest}" 
classname="org.spydermq.distributed.server.DistributedJMSServerRMIImpl" 
classpath="${build.lib}/jms.jar" stubVersion="1.2" />
  @@ -84,22 +87,10 @@
                <jar jarfile="${final.dir}/lib/spydermq.jar" basedir="${build.dest}" 
includes="org/**"/>
        </target>       
        
  -     <target name="clean">
  -             <deltree dir="${build.dir}"/>
  +     <target name="clean" depends="init">
  +             <deltree dir="${final.dir}"/>
  +             <deltree dir="${build.dest}"/>
        </target>
   
        
   </project>
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  
  
  

Reply via email to