db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r433873 - in /db/derby/docs/trunk: build.xml lib/apache-license-html.html
Date Wed, 23 Aug 2006 04:05:50 GMT
Author: fuzzylogic
Date: Tue Aug 22 21:05:49 2006
New Revision: 433873

URL: http://svn.apache.org/viewvc?rev=433873&view=rev
Log:
DERBY-1565: Prepend Apache license text as a comment to each individual HTML
files in the multiple-HTML documentation.

Added:
    db/derby/docs/trunk/lib/apache-license-html.html   (with props)
Modified:
    db/derby/docs/trunk/build.xml

Modified: db/derby/docs/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/build.xml?rev=433873&r1=433872&r2=433873&view=diff
==============================================================================
--- db/derby/docs/trunk/build.xml (original)
+++ db/derby/docs/trunk/build.xml Tue Aug 22 21:05:49 2006
@@ -39,7 +39,7 @@
     <mkdir dir="${dita.temp.dir}"/>
     <copy todir="${dita.output.dir}/images">
       <fileset dir="${dita.src.dir}/images"/>
-    </copy> 
+    </copy>
   </target>
 
   <target name="check.dita">
@@ -101,18 +101,33 @@
   </target>
 
   <target name="html.dita">
+    <!-- build to temp directory, then move the files over to the correct -->
+    <!-- directory name, prepending the Apache License as we go.          -->
     <mkdir dir="${dita.dir}/temp"/>
-    <mkdir dir="${basedir}/out/${manual.name}"/>
-    <copy todir="${basedir}/out/${manual.name}">
+    <mkdir dir="${basedir}/out/${manual.name}temp"/>
+    <copy todir="${basedir}/out/${manual.name}temp">
       <fileset dir="${dita.dir}/resource"
                includes="index.html"/>
     </copy>
 			
     <ant dir="${dita.dir}" antfile="conductor.xml" target="dita2xhtml" inheritAll="true">
       <property name="args.input" value="${basedir}${file.separator}src${file.separator}${manual.name}${file.separator}${manual.ditamap}"/>
-      <property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}"/>
+      <property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}temp"/>
       <property name="args.xhtml.toc" value="toc"/>
     </ant>
+    <move todir="${basedir}/out/${manual.name}">
+      <fileset dir="${basedir}/out/${manual.name}temp">
+        <include name="**/*.html"/>
+        <exclude name="**/*.gif"/>
+      </fileset>
+      <filterchain>
+        <concatfilter prepend="${basedir}/lib/apache-license-html.html"/>
+      </filterchain>
+    </move>
+    <!-- move any remaining files over -->
+    <move todir="${basedir}/out/${manual.name}">
+      <fileset dir="${basedir}/out/${manual.name}temp"/>
+    </move>
   </target>
 
   <target name="check.regex.done">

Added: db/derby/docs/trunk/lib/apache-license-html.html
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/apache-license-html.html?rev=433873&view=auto
==============================================================================
--- db/derby/docs/trunk/lib/apache-license-html.html (added)
+++ db/derby/docs/trunk/lib/apache-license-html.html Tue Aug 22 21:05:49 2006
@@ -0,0 +1,16 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->

Propchange: db/derby/docs/trunk/lib/apache-license-html.html
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message