User: user57  
  Date: 01/07/30 22:05:59

  Modified:    .        Tag: jboss_buildmagic build.xml config.xml
  Log:
   o fixed up manual build system, still does not work, but uses common
     release targets.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +40 -159   manual/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/manual/Attic/build.xml,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- build.xml 2001/07/29 02:13:40     1.1.2.3
  +++ build.xml 2001/07/31 05:05:59     1.1.2.4
  @@ -10,9 +10,9 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.1.2.3 2001/07/29 02:13:40 user57 Exp $ -->
  +<!-- $Id: build.xml,v 1.1.2.4 2001/07/31 05:05:59 user57 Exp $ -->
   
  -<project name="jboss-manual" default="main">
  +<project default="main">
   
     <!-- ================================================================== -->
     <!-- Basic module configuration                                         -->
  @@ -195,39 +195,8 @@
        |  documentation compiles.
       -->
     <target name="compile" 
  -       depends="compile-classes"
          description="Compile all source files."/>
   
  -  <!-- Compile all class files -->
  -  <target name="compile-classes" depends="init">
  -    <mkdir dir="${build.classes}"/>
  -    <javac destdir="${build.classes}"
  -           optimize="${javac.optimize}"
  -        target="${javac.target}"
  -           debug="${javac.debug}"
  -        depend="${javac.depend}"
  -        verbose="${javac.verbose}"
  -        deprecation="${javac.deprecation}"
  -        includeAntRuntime="${javac.include.ant.runtime}"
  -        includeJavaRuntime="${javac.include.java.runtime}"
  -        failonerror="${javac.fail.onerror}">
  -       <src path="${source.java}"/>
  -       <classpath refid="javac.classpath"/>
  -       <include name="${javac.includes}"/>
  -       <exclude name="${javac.excludes}"/>
  -    </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                                                         -->
  @@ -237,24 +206,6 @@
        |  Build all jar files.
       -->
     <target name="jars" depends="compile" description="Builds all jar files.">
  -    <mkdir dir="${build.jars}"/>
  -
  -    <!-- Build the j2ee jar -->
  -    <jar jarfile="${build.jars}/jboss-j2ee.jar">
  -      <fileset dir="${build.classes}">
  -        <include name="**"/>
  -        <!-- do not include the bits that go into jdbc_ext -->
  -        <exclude name="javax/sql/**"/>
  -      </fileset>
  -    </jar>
  -
  -    <!-- Build the jdbc ext jar -->
  -    <jar jarfile="${build.jars}/jboss-jdbc_ext.jar">
  -      <fileset dir="${build.classes}">
  -        <!-- only include jdbc classes -->
  -        <include name="javax/sql/**"/>
  -      </fileset>
  -    </jar>
     </target>
   
   
  @@ -268,54 +219,9 @@
        |  This target should depend on other docs-* targets for each 
        |  different type of docuementation that is to be generated.
       -->
  -  <target name="docs" depends="docs-api"
  +  <target name="docs" depends="html, printable-html, pdf"
          description="Builds all documentation."/>
   
  -  <!-- Javadocs is an exception, but provide a docs-api to conform. -->
  -  <target name="docs-api" depends="javadocs"/>
  -
  -  <!-- 
  -     |  Check if we need to build javadocs 
  -     |
  -     |  Javadocs will only be generated if one or more .java source files
  -     |  is newer than the generated index.html.
  -    -->
  -  <target name="javadocs-check" depends="init">
  -    <!-- if index.html is newer than the sources we are up to date -->
  -    <uptodate property="javadoc-generated-already"
  -           targetfile="${build.api}/index.html">
  -      <srcfiles dir="${source.java}" includes="**/*.java"/>
  -    </uptodate>
  -
  -    <!-- create the directory here to prevent install/release from failing -->
  -    <mkdir dir="${build.api}"/>
  -  </target>        
  -
  -  <!-- Generate Javadoc if we are out of date -->
  -  <target name="javadocs" 
  -       depends="javadocs-check" 
  -       unless="javadoc-generated-already">
  -    <javadoc packagenames="${javadoc.packages}"
  -             sourcepath="${source.java}"
  -             destdir="${build.api}"
  -             classpathref="javadoc.classpath"
  -             windowtitle="${javadoc.windowtitle}"
  -          splitindex="${javadoc.splitindex}"
  -             doctitle="${javadoc.doctitle}"
  -             author="${javadoc.author}"
  -             version="${javadoc.version}"
  -             public="${javadoc.public}"
  -             package="${javadoc.package}"
  -             protected="${javadoc.protected}"
  -             private="${javadoc.private}"
  -             encoding="${javadoc.encoding}"
  -             use="${javadoc.use}"
  -          verbose="${javadoc.verbose}"> 
  -      <group title="JDBC Extension" packages="javax.sql*"/>
  -      <group title="J2EE" packages="javax*"/>
  -    </javadoc>
  -  </target>
  -
     <!-- Generate the HTML manual -->
     <target name="html" depends="init">
   
  @@ -410,78 +316,52 @@
   
   
     <!-- ================================================================== -->
  -  <!-- 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="**/*"/>
  -      </fileset>
  -    </copy>
  -
  -    <!-- Copy the generated javadocs -->
  -    <mkdir dir="${to.api}"/>
  -    <copy todir="${to.api}" filtering="no">
  -      <fileset dir="${from.api}">
  +  <target name="release" depends="all"
  +       description="Builds a release distribution.">
  +    <!-- Copy the static documents (docs) -->
  +    <mkdir dir="${release.docs}"/>
  +    <copy todir="${release.docs}" filtering="no">
  +      <fileset dir="${build.docs}">
            <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="install-check" depends="init">
  -    <require property="install.lib"/>
  -    <require property="install.module.api"/>
  +  <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" 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                                          -->
  @@ -509,12 +389,13 @@
   
     <target name="help">
       <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.3   +27 -15    manual/Attic/config.xml
  
  Index: config.xml
  ===================================================================
  RCS file: /cvsroot/jboss/manual/Attic/config.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- config.xml        2001/07/29 02:13:40     1.1.2.2
  +++ config.xml        2001/07/31 05:05:59     1.1.2.3
  @@ -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.2 2001/07/29 02:13:40 user57 Exp $ -->
  +<!-- $Id: config.xml,v 1.1.2.3 2001/07/31 05:05:59 user57 Exp $ -->
   
     <!-- ================================================================== -->
     <!-- Module Setup                                                       -->
     <!-- ================================================================== -->
   
     <!-- Module name(s) & version -->
  -  <property name="module.name" value="${ant.project.name}"/>
  +  <property name="module.name" value="manual"/>
     <property name="module.Name" value="JBoss Manual"/>
  -  <property name="module.version" value="${build.number}"/>
  +  <property name="module.version" value="1.0"/>
   
  -  <!-- This module is based on Java 1.2 -->
  -  <property name="javac.target" value="1.2"/>
   
  -
     <!-- ================================================================== -->
     <!-- Tool Setup                                                         -->
     <!-- ================================================================== -->
  @@ -81,6 +71,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=""/>
  @@ -113,8 +106,27 @@
     <property name="build.jars" value="${module.build}/lib"/>
   
     <!-- 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}"/>
   
   
     <!-- ================================================================== -->
  
  
  

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

Reply via email to