ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1084809 - in /ant/core/trunk: build.xml docs/ manual/ manual/cover.html manual/images/ manual/images/ant_logo_large.gif xdocs/
Date Wed, 23 Mar 2011 23:38:01 GMT
Author: hibou
Date: Wed Mar 23 23:38:00 2011
New Revision: 1084809

URL: http://svn.apache.org/viewvc?rev=1084809&view=rev
Log:
The site is now at https://svn.apache.org/repos/asf/ant/site/ant/sources
Only the manual will be in the distribution

Added:
    ant/core/trunk/manual/
      - copied from r1084800, ant/core/trunk/docs/manual/
    ant/core/trunk/manual/images/
    ant/core/trunk/manual/images/ant_logo_large.gif   (with props)
Removed:
    ant/core/trunk/docs/
    ant/core/trunk/xdocs/
Modified:
    ant/core/trunk/build.xml
    ant/core/trunk/manual/cover.html

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=1084809&r1=1084808&r2=1084809&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Wed Mar 23 23:38:00 2011
@@ -62,7 +62,7 @@
   <property name="java.dir" value="${src.dir}/main"/>
   <property name="script.dir" value="${src.dir}/script"/>
   <property name="lib.dir" value="lib"/>
-  <property name="docs.dir" value="docs"/>
+  <property name="manual.dir" value="manual"/>
   <property name="etc.dir" value="${src.dir}/etc"/>
   <property name="src.junit" value="${src.dir}/tests/junit"/>
   <property name="src.antunit" value="${src.dir}/tests/antunit"/>
@@ -152,13 +152,13 @@
   <property name="dist.dir" value="dist"/>
   <property name="dist.bin" value="${dist.dir}/bin"/>
   <property name="dist.lib" value="${dist.dir}/lib"/>
-  <property name="dist.docs" value="${dist.dir}/docs"/>
+  <property name="dist.manual" value="${dist.dir}/manual"/>
   <property name="dist.etc" value="${dist.dir}/etc"/>
-  <property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/>
+  <property name="dist.javadocs" value="${dist.dir}/manual/api"/>
 
   <property name="src.dist.dir" value="dist-src"/>
   <property name="src.dist.src" value="${src.dist.dir}/src"/>
-  <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
+  <property name="src.dist.manual" value="${src.dist.dir}/manual"/>
   <property name="src.dist.lib" value="${src.dist.dir}/lib"/>
 
   <property name="java-repository.dir" value="java-repository/${groupid}"/>
@@ -328,18 +328,6 @@
 
   <!--
        ===================================================================
-         Set up a patternsets that matches the parts of our site that
-         should not be part of the distribution.
-       ===================================================================
-  -->
-  <patternset id="site.excludes">
-    <exclude name="bindownload.html"/>
-    <exclude name="srcdownload.html"/>
-    <exclude name="*.cgi"/>
-  </patternset>
-
-  <!--
-       ===================================================================
          Check to see what optional dependencies are available
        ===================================================================
   -->
@@ -716,7 +704,7 @@
         </section>
       </manifest>
 
-      <fileset dir="${docs.dir}">
+      <fileset dir="${manual.dir}">
         <include name="images/ant_logo_large.gif"/>
       </fileset>
     </jar>
@@ -880,7 +868,7 @@
   </macrodef>
 
   <target name="internal_dist" depends="dist-lite,dist_javadocs">
-    <mkdir dir="${dist.docs}"/>
+    <mkdir dir="${dist.manual}"/>
     <mkdir dir="${dist.etc}"/>
 
     <copy todir="${dist.lib}" file="${lib.dir}/README"/>
@@ -910,17 +898,8 @@
     </copy>
 
 
-    <copy todir="${dist.docs}">
-      <fileset dir="${docs.dir}" includes="${expandproperty.files}">
-        <patternset refid="site.excludes"/>
-      </fileset>
-      <filterchain refid="ant.filters"/>
-    </copy>
-
-    <copy todir="${dist.docs}" filtering="false">
-      <fileset dir="${docs.dir}" excludes="${expandproperty.files}">
-        <patternset refid="site.excludes"/>
-      </fileset>
+    <copy todir="${dist.manual}">
+      <fileset dir="${manual.dir}" />
     </copy>
 
     <copy todir="${dist.dir}">
@@ -1014,10 +993,9 @@
       <fileset dir="${src.dir}"/>
     </copy>
 
-    <copy todir="${src.dist.docs}">
-      <fileset dir="${docs.dir}">
-        <exclude name="manual/api/"/>
-        <patternset refid="site.excludes"/>
+    <copy todir="${src.dist.manual}">
+      <fileset dir="${manual.dir}">
+        <exclude name="api/"/>
       </fileset>
     </copy>
 
@@ -1150,12 +1128,12 @@
     </checksums-mvn>
 
     <zip destfile="${dist.base.manual}/${dist.name}-manual.zip">
-      <zipfileset dir="${dist.name}/docs/manual" prefix="${dist.name}"/>
+      <zipfileset dir="${dist.name}/manual" prefix="${dist.name}"/>
       <zipfileset file="NOTICE" prefix="${dist.name}"/>
     </zip>
     <tar longfile="gnu"
          destfile="${dist.base.manual}/${dist.name}-manual.tar">
-      <tarfileset dir="${dist.name}/docs/manual" prefix="${dist.name}"/>
+      <tarfileset dir="${dist.name}/manual" prefix="${dist.name}"/>
       <tarfileset file="NOTICE" prefix="${dist.name}"/>
     </tar>
     <gzip destfile="${dist.base.manual}/${dist.name}-manual.tar.gz"

Modified: ant/core/trunk/manual/cover.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/manual/cover.html?rev=1084809&r1=1084800&r2=1084809&view=diff
==============================================================================
--- ant/core/trunk/manual/cover.html (original)
+++ ant/core/trunk/manual/cover.html Wed Mar 23 23:38:00 2011
@@ -24,7 +24,7 @@
 
 <body bgcolor="#FFFFFF">
 <div align="center"> 
-  <h1><img src="../images/ant_logo_large.gif" width="190" height="120"></h1>
+  <h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
   <h1>Apache Ant&trade; 1.8.2 Manual</h1>
   <p align="left">This is the manual for version 1.8.2 of 
   <a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>. 

Added: ant/core/trunk/manual/images/ant_logo_large.gif
URL: http://svn.apache.org/viewvc/ant/core/trunk/manual/images/ant_logo_large.gif?rev=1084809&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/core/trunk/manual/images/ant_logo_large.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif



Mime
View raw message