User: user57  
  Date: 01/09/03 22:08:08

  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      jbosssx/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/build.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.sh  2001/08/28 04:53:11     1.6
  +++ build.sh  2001/09/04 05:08:08     1.7
  @@ -8,12 +8,15 @@
   ##                                                                          ##
   ### ====================================================================== ###
   
  -# $Id: build.sh,v 1.6 2001/08/28 04:53:11 user57 Exp $
  +# $Id: build.sh,v 1.7 2001/09/04 05:08:08 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.7       +12 -75    jbosssx/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml 2001/08/27 09:01:37     1.6
  +++ build.xml 2001/09/04 05:08:08     1.7
  @@ -10,9 +10,9 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.6 2001/08/27 09:01:37 user57 Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/09/04 05:08:08 user57 Exp $ -->
   
  -<project default="main">
  +<project default="main" name="JBoss/Security">
   
     <!-- ================================================================== -->
     <!-- Initialization                                                     -->
  @@ -239,6 +239,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="-Ddummy"/>
   
     <!-- RMIC should generate stubs compatible with Java 1.2+ -->
     <property name="rmic.stubVersion" value="1.2"/>
  @@ -257,27 +258,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}"/>
   
  -
     <!-- ================================================================== -->
     <!-- Compile                                                            -->
     <!-- ================================================================== -->
  @@ -317,10 +300,6 @@
          <classpath refid="javac.classpath"/>
          <include name="${javac.includes}"/>
          <exclude name="${javac.excludes}"/>
  -
  -       <!-- Currently needs HSQL
  -       <exclude name="org/jboss/test/**"/>
  -       -->
       </javac>
     </target>
   
  @@ -488,59 +467,20 @@
     <!-- Builds a release distribution.                                     -->
     <!-- ================================================================== -->
   
  -  <target name="release" depends="all, release-dependencies"
  +  <target name="release" depends="all"
          description="Builds a release distribution.">
  -    <!-- Copy the generated libraries (lib/ext) -->
  -    <mkdir dir="${release.lib.ext}"/>
  -    <copy todir="${release.lib.ext}" filtering="no">
  -      <fileset dir="${build.jars}">
  -         <include name="jbosssx.jar"/>
  -         <include name="jaas.jar"/>
  -      </fileset>
  -    </copy>
  -
  -    <!-- Copy the generated libraries (client) -->
  -    <mkdir dir="${release.client}"/>
  -    <copy todir="${release.client}" filtering="no">
  -      <fileset dir="${build.jars}">
  -         <include name="*-client.jar"/>
  -         <include name="jaas.jar"/>
  -      </fileset>
  -      <fileset dir="${build.etc}/client">
  -         <include name="*"/>
  -      </fileset>
  -    </copy>
  -
  -    <!-- Copy the generated javadocs (docs/api/<module>) -->
  -    <mkdir dir="${release.module.api}"/>
  -    <copy todir="${release.module.api}" filtering="no">
  -      <fileset dir="${build.api}">
  +    <!-- 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>
   
  -  <target name="release-dependencies" depends="init">
  -    <mkdir dir="${release.lib.ext}"/>
  -
  -    <copy todir="${release.lib.ext}" filtering="no">
  -      <fileset dir="${sun.jsse.lib}">
  -        <include name="*.jar"/>
  -      </fileset>
  -    </copy>
  -
  -    <copy todir="${release.client}" filtering="no">
  -      <fileset dir="${sun.jsse.lib}">
  -        <include name="*.jar"/>
  -      </fileset>
  -    </copy>
  -  </target>
  -
  -
     <target name="release-archive-prepare" depends="release">
       <mkdir dir="${module.release}"/>
  -    <property name="release.archive.basename"
  -           value="${module.release}/${release.id}"/>
     </target>
   
     <target name="release-zip" depends="release-archive-prepare"
  @@ -616,8 +556,8 @@
   
     <target name="loginmodule-junit" depends="compile">
       <mkdir dir="${build.reports}"/>
  -<property name="javac_classpath" refid="javac.classpath" />
  -<echo message="javac_classpath=${javac_classpath}" />
  +    <property name="javac_classpath" refid="javac.classpath" />
  +    <echo message="javac_classpath=${javac_classpath}" />
       <junit dir="${module.output}"
           printsummary="${junit.printsummary}" 
           haltonerror="${junit.haltonerror}" 
  @@ -686,8 +626,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

Reply via email to