User: user57  
  Date: 01/07/30 16:52:28

  Modified:    .        Tag: jboss_buildmagic build.xml config.xml
  Log:
   o creating the correct binary structure for j2ee, naming and server (short
     of adding external libraries).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.9   +68 -71    jboss-j2ee/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-j2ee/Attic/build.xml,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- build.xml 2001/07/29 02:13:40     1.1.2.8
  +++ build.xml 2001/07/30 23:52:28     1.1.2.9
  @@ -10,9 +10,9 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.1.2.8 2001/07/29 02:13:40 user57 Exp $ -->
  +<!-- $Id: build.xml,v 1.1.2.9 2001/07/30 23:52:28 user57 Exp $ -->
   
  -<project name="jboss-j2ee" default="main">
  +<project default="main">
   
     <!-- ================================================================== -->
     <!-- Basic module configuration                                         -->
  @@ -218,16 +218,6 @@
       </javac>
     </target>
   
  -  <!-- Compile resource files -->
  -  <target name="compile-resources" depends="init">
  -    <mkdir dir="${build.resources}"/>
  -    <copy todir="${build.resources}" filtering="yes">
  -      <fileset dir="${source.resources}">
  -         <include name="**/*"/>
  -      </fileset>
  -    </copy>
  -  </target>
  -
   
     <!-- ================================================================== -->
     <!-- Build Jars                                                         -->
  @@ -318,79 +308,77 @@
   
   
     <!-- ================================================================== -->
  -  <!-- Release/Install file copying.                                      -->
  +  <!-- Builds a release distribution.                                     -->
     <!-- ================================================================== -->
   
  -  <!--
  -     |  This target is a helper for release and install to consolidate the
  -     |  task logic required to copy files.
  -   -->
  -  <target name="copy-files">
  -    <!-- Copy the generated libraries -->
  -    <mkdir dir="${to.lib}"/>
  -    <copy todir="${to.lib}" filtering="no">
  -      <fileset dir="${from.lib}">
  -         <include name="**/*"/>
  +  <target name="release" depends="all"
  +       description="Builds a release distribution.">
  +    <!-- Copy the generated libraries (lib) -->
  +    <mkdir dir="${release.lib}"/>
  +    <copy todir="${release.lib}" filtering="no">
  +      <fileset dir="${build.jars}">
  +         <include name="jboss-jdbc_ext.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${build.jars}">
  +         <include name="jboss-j2ee.jar"/>
         </fileset>
       </copy>
   
  +    <!-- Copy the generated libraries (client) -->
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${build.jars}">
  +         <include name="jboss-j2ee.jar"/>
  +      </fileset>
  +    </copy>
  +
       <!-- Copy the generated javadocs -->
  -    <mkdir dir="${to.api}"/>
  -    <copy todir="${to.api}" filtering="no">
  -      <fileset dir="${from.api}">
  +    <mkdir dir="${release.module.api}"/>
  +    <copy todir="${release.module.api}" filtering="no">
  +      <fileset dir="${build.api}">
            <include name="**/*"/>
         </fileset>
       </copy>
     </target>
  -
   
  -  <!-- ================================================================== -->
  -  <!-- Builds a release distribution.                                     -->
  -  <!-- ================================================================== -->
  -
  -  <target name="release" 
  -       depends="all"
  -       description="Builds a release distribution.">
  -    <!-- Copy the files to release -->
  -    <antcall target="copy-files">
  -      <param name="to.lib" value="${release.lib}"/>
  -      <param name="from.lib" value="${build.jars}"/>
  -      <param name="to.api" value="${release.api}"/>
  -      <param name="from.api" value="${build.api}"/>
  -    </antcall>
  -
  -    <!-- Build a jar for the release -->
  +  <target name="release-archive-prepare" depends="release">
       <mkdir dir="${module.release}"/>
  -    <mkdir dir="${module.output}"/>
  -    <jar jarfile="${module.output}/${module.name}-${build.id}.jar">
  +    <property name="release.archive.basename"
  +           value="${module.release}/${release.id}"/>
  +  </target>
  +
  +  <target name="release-zip" depends="release-archive-prepare"
  +       description="Builds a ZIP release distribution.">
  +    <zip zipfile="${release.archive.basename}.zip">
         <fileset dir="${module.release}">
  -        <include name="**"/>
  +        <include name="${release.id}/**"/>
         </fileset>
  -    </jar>
  +    </zip>
     </target>
   
  -
  -  <!-- ================================================================== -->
  -  <!-- Install release files into project output.                         -->
  -  <!-- ================================================================== -->
  +  <target name="release-tar" depends="release-archive-prepare"
  +       description="Builds a TAR release distribution.">
  +    <tar tarfile="${release.archive.basename}.tar" longfile="gnu"
  +      basedir="${module.release}"
  +      includes="${release.id}/**">
  +    </tar>
  +  </target>
   
  -  <target name="install-check" depends="init">
  -    <require property="install.lib"/>
  -    <require property="install.module.api"/>
  -  </target>
  -
  -  <target name="install" depends="install-check, release"
  -       description="Installs released files into project namespace.">
  -    <!-- Copy the files to project -->
  -    <antcall target="copy-files">
  -      <param name="to.lib" value="${install.lib}"/>
  -      <param name="from.lib" value="${release.lib}"/>
  -      <param name="to.api" value="${install.module.api}"/>
  -      <param name="from.api" value="${release.api}"/>
  -    </antcall>
  +  <target name="release-tgz" depends="release-tar"
  +       description="Builds a TAR-GZIP release distribution.">
  +    <gzip src="${release.archive.basename}.tar"
  +       zipfile="${release.archive.basename}.tgz"/>
     </target>
   
  +  <target name="release-all" depends="release-zip, release-tgz"
  +       description="Builds a distribution for each archive type."/>
   
  +
     <!-- ================================================================== -->
     <!-- Cleans up generated stuff                                          -->
     <!-- ================================================================== -->
  @@ -416,13 +404,22 @@
     <!-- ================================================================== -->
   
     <target name="help">
  +    <property name="projecthelp.header">
  +  The ${module.Name} module.
  +</property>
  +    <property name="projecthelp.footer"><![CDATA[
  +    -projecthelp for all targets
  +    -help for full options
  +]]></property>
  +
       <projecthelp>
  -      <header/>
  -      <header>  The ${module.Name} module.</header>
  -      <header/>
  -      <footer/>                                  
  -      <footer>    * -projecthelp for all targets</footer>
  -      <footer>    * -help for full options</footer>
  +      <header><![CDATA[
  +  The ${module.Name} module.
  +]]></header>
  +      <footer><![CDATA[
  +    -projecthelp for all targets
  +    -help for full options
  +]]></footer>
       </projecthelp>
     </target>
   
  
  
  
  1.1.2.5   +33 -16    jboss-j2ee/Attic/config.xml
  
  Index: config.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-j2ee/Attic/config.xml,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- config.xml        2001/07/29 02:13:40     1.1.2.4
  +++ config.xml        2001/07/30 23:52:28     1.1.2.5
  @@ -6,29 +6,19 @@
   <!--  See terms of license at http://www.gnu.org.                           -->
   <!--                                                                        -->
   <!-- ====================================================================== -->
  -<!--                                                                        -->
  -<!--  Module configuration.                                                 -->
  -<!--                                                                        -->
  -<!--    Define configuration elements that are used by the module build     -->
  -<!--    system here.                                                        -->
  -<!--                                                                        -->
  -<!-- ====================================================================== -->
   
  -<!-- $Id: config.xml,v 1.1.2.4 2001/07/29 02:13:40 user57 Exp $ -->
  +<!-- $Id: config.xml,v 1.1.2.5 2001/07/30 23:52:28 user57 Exp $ -->
   
     <!-- ================================================================== -->
     <!-- Module Setup                                                       -->
     <!-- ================================================================== -->
   
     <!-- Module name(s) & version -->
  -  <property name="module.name" value="${ant.project.name}"/>
  +  <property name="module.name" value="j2ee"/>
     <property name="module.Name" value="JBoss J2EE"/>
  -  <property name="module.version" value="${build.number}"/>
  +  <property name="module.version" value="1.2.1"/>
   
  -  <!-- This module is based on Java 1.2 -->
  -  <property name="javac.target" value="1.2"/>
   
  -
     <!-- ================================================================== -->
     <!-- Tool Setup                                                         -->
     <!-- ================================================================== -->
  @@ -79,6 +69,9 @@
       <path refid="dependentmodule.classpath"/>
     </path>
   
  +  <!-- This module is based on Java 1.2 -->
  +  <property name="javac.target" value="1.2"/>
  +
     <!-- classpath and local.classpath must have a value using with a path -->
     <property name="classpath" value=""/>
     <property name="local.classpath" value=""/>
  @@ -100,7 +93,6 @@
   
     <!-- Where source files live -->
     <property name="source.java" value="${module.source}/main"/>
  -  <property name="source.resources" value="${module.source}/resources"/>
   
     <!-- Where build generated files will go -->
     <property name="build.classes" value="${module.build}/classes"/>
  @@ -108,8 +100,33 @@
     <property name="build.api" value="${module.build}/api"/>
   
     <!-- Where release generated files will go -->
  -  <property name="release.lib" value="${module.release}/lib"/>
  -  <property name="release.api" value="${module.release}/api"/>
  +  <property name="release.id" value="${module.name}-${module.version}-${build.id}"/>
  +  <property name="release.root" 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}"/>
  +
  +  <!-- Not really sure why these are here -->
  +  <property name="release.admin" value="${release.root}/admin"/>
  +  <property name="release.admin.client" value="${release.admin}/client"/>
  +  <property name="release.admin.client.lib" value="${release.client}/lib"/>
  +  <property name="release.admin.components" value="${release.admin}/components"/>
   
   
     <!-- ================================================================== -->
  
  
  

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

Reply via email to