poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ye...@apache.org
Subject svn commit: r833603 - in /poi/trunk: ant.dtd build.xml src/documentation/content/xdocs/howtobuild.xml
Date Fri, 06 Nov 2009 23:40:54 GMT
Author: yegor
Date: Fri Nov  6 23:40:53 2009
New Revision: 833603

URL: http://svn.apache.org/viewvc?rev=833603&view=rev
Log:
cleanup of build.xml

Removed:
    poi/trunk/ant.dtd
Modified:
    poi/trunk/build.xml
    poi/trunk/src/documentation/content/xdocs/howtobuild.xml

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=833603&r1=833602&r2=833603&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Nov  6 23:40:53 2009
@@ -17,7 +17,6 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE project PUBLIC "-//Ant//Project 1.5//EN" "ant.dtd">
 
 <!--
     POI Build System.  Written by:
@@ -35,8 +34,7 @@
 
     LIBRARY         LOCATION
     =======         ========
-    junit(3.8+)     http://www.ibiblio.org/maven/junit/jars/
-    jdepend         http://www.ibiblio.org/maven/jdepend/jars/
+    junit(3.8+)     http://www.junit.org
 
     The ant jar "optional.jar" should also be available otherwise the
     build will fail.
@@ -58,9 +56,7 @@
  -->
 <project name="POI Build" default="help" basedir=".">
 
-  <description>
-    The POI project Ant build.
-  </description>
+  <description>The POI project Ant build.</description>
 
   <property environment="env"/>
 
@@ -149,21 +145,16 @@
   <property name="build.site" location="build/tmp/site/build/site"/>
   <property name="build.site.src" location="build/tmp/site"/>
   <property name="junit.report.dir" location="${build.site}/junit"/>
-  <property name="jdepend.report.dir" location="${build.site}/jdepend"/>
-  <property name="jdepend.report.out.dir" location="${build.site.src}/src/documentation/content/jdepend"/>
   <property name="apidocs.report.dir" location="${build.site}/apidocs"/>
   <property name="dist.dir" location="build/dist"/>
   <property name="mavendist.ooxml.dir" location="build/maven-ooxml-dependencies"/>
   <property name="apache.repository" value="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
-  <property name="snapshots.repository" value="scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository/"/>
   <property name="jar.name" value="poi"/>
   <property name="version.id" value="3.6-beta1"/>
   <property name="halt.on.test.failure" value="true"/>
 
-  <property name="jdk.version.source" value="1.5"
-    description="JDK version of source code"/>
-  <property name="jdk.version.class" value="1.5"
-    description="JDK version of generated class files"/>  
+  <property name="jdk.version.source" value="1.5" description="JDK version of source code"/>
+  <property name="jdk.version.class" value="1.5"  description="JDK version of generated
class files"/>  
 
     <path id="main.classpath">
         <fileset dir="${main.lib}"> 
@@ -250,31 +241,12 @@
     </echo>
   </target>
 
-
-
-    <target name="with.clover" if="clover.present">
-        <taskdef resource="clovertasks"/>
-        <clover-setup initString="mycoverage.db"/>
-    </target>
-
-    <target name="clover.html" depends="with.clover" if="clover.present">
-        <echo>Generating clover report</echo>
-       <clover-report>
-          <current outfile="build/tmp/site/build/site/clover_html">
-             <format type="html"/>
-          </current>
-       </clover-report>
-    </target>
-
     <target name="init" depends="fetch-jars,fetch-ooxml-jars">
 
         <tstamp>
           <format property="tstamp.year" pattern="yyyy"/>
         </tstamp>
 
-        <available resource="clovertasks" property="clover.present"/>
-        <antcall target="with.clover"/>
-        
         <mkdir dir="build"/>
         <mkdir dir="build/non-ant-classes"/>
         <mkdir dir="${main.output.dir}"/>
@@ -292,8 +264,6 @@
         <mkdir dir="${contrib.reports.test}"/>
         <mkdir dir="${ooxml.reports.test}"/>
         <mkdir dir="${junit.report.dir}"/>
-        <mkdir dir="${jdepend.report.dir}"/>
-        <mkdir dir="${jdepend.report.out.dir}"/>
         <mkdir dir="${apidocs.report.dir}"/>
         <mkdir dir="${ooxml.xsds.tmp.dir}" />
         <mkdir dir="${dist.dir}"/>
@@ -837,9 +807,6 @@
         <copy todir="${build.site.src}/src/documentation/content/apidocs">
             <fileset dir="${apidocs.report.dir}"/>
         </copy>
-        <copy
-          tofile="${build.site.src}/src/documentation/content/jdepend.ehtml"
-          file="${jdepend.report.dir}/index.html" failonerror="false"/>
         <mkdir dir="${build.site.src}/src/documentation/content/junit"/>
         <copy todir="${build.site.src}/src/documentation/content/junit">
             <fileset dir="${junit.report.dir}"/>
@@ -861,26 +828,6 @@
         </touch>
     </target>
 
-    <!-- Checks whether reports are required to be run.  If nothing has changed then they
dont. -->
-    <target name="-check-reports">
-        <condition property="reports.notRequired">
-            <and>
-                <equals arg1="${main.test.notRequired}" arg2="true"/>
-                <equals arg1="${scratchpad.test.notRequired}" arg2="true"/>
-                <equals arg1="${contrib.test.notRequired}" arg2="true"/>
-            </and>
-        </condition>
-    </target>
-
-
-  <!-- Creates reports and API documentation -->
-  <target name="reports" unless="reports.notRequired" depends="-check-reports,
-    fail-unless-jdepend-is-available, test-ignore-failures, junitreport,
-    jdepend, javadocs, clover.html"
-    description="Creates various reports and the API documentation">
-  </target>
-
-
 
   <!-- Runs all JUnit tests without aborting if one of the tests fails. -->
   <target name="test-ignore-failures" depends="init">
@@ -888,29 +835,6 @@
       <param name="halt.on.test.failure" value="false"/>
     </antcall>
   </target>
-
-
-
-  <!-- Produces a report of the JUnit test results -->
-  <target name="junitreport"
-    depends="test-ignore-failures"
-    description="Produces a report of the JUnit test results">
-    <junitreport todir="${junit.report.dir}">
-      <fileset dir="${main.reports.test}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <fileset dir="${scratchpad.reports.test}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <fileset dir="${contrib.reports.test}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report format="frames" todir="${junit.report.dir}"/>
-    </junitreport>
-  </target>
-
-
-
   <!-- Generates the API documentation. -->
   <target name="javadocs" depends="init"
     description="Generates the API documentation">
@@ -975,16 +899,15 @@
       </group>
     </javadoc>
 
-    <antcall target="clover.html"/>
   </target>
 
 
     <!-- Generates documentation and reports -->
-    <target name="site" depends="reports, docs"
+    <target name="site" depends="docs"
       description="Generates POI's website's contents"/>
 
 
-    <target name="maven-poms" depends="jar" description="Builds the POM files for a maven
distribution, and copies these and the jars to the appropriate locations">
+    <target name="maven-poms" description="Builds the POM files for a maven distribution,
and copies these and the jars to the appropriate locations">
       <!-- TODO: Decide about source jars, and copy them if we have some -->
 
       <!-- Build the org.apache.poi poms -->
@@ -1145,6 +1068,7 @@
     </zip>
 
     <tar destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.tar.gz"
+      longfile="gnu"
       compression="gzip">
       <tarfileset dir="legal/" prefix="${zipdir}" />
       <tarfileset dir="lib/" prefix="${zipdir}/lib" />
@@ -1159,6 +1083,7 @@
     </tar>
 
     <tar destfile="${dist.dir}/${jar.name}-src-${version.id}-${DSTAMP}.tar.gz"
+      longfile="gnu"
       compression="gzip">
       <tarfileset dir="legal/" prefix="${zipdir}" />
       <tarfileset dir="${build.site}" prefix="${zipdir}/docs"/>
@@ -1189,58 +1114,8 @@
   <target name="gump" depends="test, jar"/>
 
 
-
-  <!-- Generates the Ant document type definition (DTD) -->
-  <target name="dtd"
-    description="Generates the Ant document type definition (DTD)">
-    <antstructure output="ant.dtd"/>
-  </target>
-
-  <!-- Abort the build if JDepend is missing. -->
-  <target name="fail-unless-jdepend-is-available" depends="init">
-    <condition property="isAvailable.jdepend">
-      <available classname="jdepend.framework.JDepend"/>
-    </condition>
-    <antcall target="fail-jdepend"/>
-  </target>
-
-  <target name="fail-jdepend" unless="isAvailable.jdepend">
-    <echo>
-      JDepend is not available. You must download JDepend from
-      &lt;http://www.clarkware.com/software/JDepend.html&gt; and include the
-      JAR file in your classpath.
-    </echo> 
-    <fail message="JDepend is not available."/>
-  </target>
-
   <!-- Aborts the build if any of the required tools are missing. -->
-  <target name="fail-unless-tools-are-available"
-    depends="fail-unless-jdepend-is-available"/>
-
-
-
-  <!-- Runs jdepend to produce a report about package dependencies -->
-  <target name="jdepend" depends="fail-unless-jdepend-is-available"
-    description="Runs jdepend to produce a report about package dependencies">
-    <jdepend outputfile="${jdepend.report.dir}/jdepend.xml" format="xml">
-      <classespath>
-        <pathelement location="${main.output.dir}"/>
-        <pathelement location="${contrib.output.dir}"/>
-        <pathelement location="${scratchpad.output.dir}"/>
-      </classespath>
-      <classpath>
-        <path refid="main.classpath"/>
-        <path refid="contrib.classpath"/>
-        <path refid="scratchpad.classpath"/>
-      </classpath>
-    </jdepend>
-
-    <style basedir="${jdepend.report.dir}"
-      in="${jdepend.report.dir}/jdepend.xml"
-      out="${jdepend.report.out.dir}/index.html"
-      style="jdepend.xsl"/>
-  </target>
-
+  <target name="fail-unless-tools-are-available"/>
 
   <target name="-require-filename" description="Ensure -Dfilename=... was given">
      <fail unless="filename" message="A filename must be supplied with -Dfilename=, eg
-Dfilename=test.xls" />
@@ -1272,20 +1147,3 @@
 
 </project>
 
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->

Modified: poi/trunk/src/documentation/content/xdocs/howtobuild.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/howtobuild.xml?rev=833603&r1=833602&r2=833603&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/howtobuild.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/howtobuild.xml Fri Nov  6 23:40:53 2009
@@ -41,11 +41,11 @@
                 The POI build system requires two components to perform a
                 build.
                 <link href="ext:ant.apache.org/">Ant</link> and
-                <link href="ext:xml.apache.org/forrest">forrest</link>.
+                <link href="ext:xml.apache.org/forrest">Forrest</link>.
             </p>
             <p>
                 Specifically the build has been tested to work with Ant version
-                1.5.3 and Forrest 0.4.  To install these products download
+                1.7.1 and Forrest 0.5.  To install these products download
                 the distributions and follow the instructions in their
                 documentation.  Make sure you don't forget to set the
                 environment variables FORREST_HOME and ANT_HOME.  The
@@ -62,19 +62,7 @@
                 </tr>
                 <tr>
                     <td>junit</td>
-                    <td>http://www.ibiblio.org/maven/junit/jars/</td>
-                </tr>
-                <tr>
-                    <td>xerces</td>
-                    <td>http://www.ibiblio.org/maven/xerces/jars/</td>
-                </tr>
-                <tr>
-                    <td>jdepend</td>
-                    <td>http://www.ibiblio.org/maven/jdepend/jars/</td>
-                </tr>
-                <tr>
-                    <td>xalan</td>
-                    <td>http://www.ibiblio.org/maven/xalan/jars/</td>
+                    <td>http://www.junit.org</td>
                 </tr>
             </table>
             <p>
@@ -86,59 +74,6 @@
         <section>
             <title>Running the Build</title>
             <p>
-                On the first run the ant build system will download all
-                the jars required by the project to build ant.  If you're
-                behind a firewall this may cause some problems.  Should you
-                need to it's possible to manually put the jars in the
-                correct directories.  These can be obtained from here:
-            </p>
-            <table>
-                <tr>
-                    <th>JAR</th>
-                    <th>Location</th>
-                </tr>
-                <tr>
-                    <td>/commons-logging/jars/commons-logging-1.0.1.jar</td>
-                    <td>lib</td>
-                </tr>
-                <tr>
-                    <td>/log4j/jars/log4j-1.2.8.jar</td>
-                    <td>lib</td>
-                </tr>
-                <tr>
-                    <td>/commons-beanutils/jars/commons-beanutils-1.6.jar</td>
-                    <td>src/contrib/lib</td>
-                </tr>
-                <tr>
-                    <td>/commons-collections/jars/commons-collections-2.1.jar</td>
-                    <td>src/contrib/lib</td>
-                </tr>
-                <tr>
-                    <td>/commons-lang/jars/commons-lang-1.0-b1.jar</td>
-                    <td>src/contrib/lib</td>
-                </tr>
-                <tr>
-                    <td>/junit/jars/junit-3.8.1.jar</td>
-                    <td>lib</td>
-                </tr>
-                <tr>
-                    <td>/dom4j/jars/dom4j-1.6.1.jar</td>
-                    <td>ooxml-lib</td>
-                </tr>
-                <tr>
-                    <td>/org.apache.xmlbeans/jars/xmlbeans-2.3.0.jar</td>
-                    <td>ooxml-lib</td>
-                </tr>
-                <tr>
-                    <td>/xmlbeans/jars/jsr173_1.0_api.jar</td>
-                    <td>ooxml-lib</td>
-                </tr>
-                <tr>
-                    <td>/org.apache.poi/jars/ooxml-schemas-1.0.jar</td>
-                    <td>ooxml-lib</td>
-                </tr>
-            </table>
-            <p>
                 The main targets of interest to our users are:
             </p>
             <table>
@@ -164,15 +99,6 @@
                     <td>Generate all documentation for the system</td>
                 </tr>
                 <tr>
-                    <td>generate-records</td>
-                    <td>Generate records from the XML record defintitions</td>
-                </tr>
-                <tr>
-                    <td>generate-types</td>
-                    <td>Generate types from the XML type definitions (this is
-                        for HWPF).</td>
-                </tr>
-                <tr>
                     <td>jar</td>
                     <td>Produce jar files</td>
                 </tr>
@@ -180,10 +106,6 @@
                     <td>dist</td>
                     <td>Create a distribution.</td>
                 </tr>
-                <tr>
-                    <td>clean-dist</td>
-                    <td>Runs clean before creating the distribution.</td>
-                </tr>
             </table>
         </section>
     </body>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message