You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2010/10/15 19:13:55 UTC
svn commit: r1023023 - in /db/derby/docs/trunk: ./ src/adminguide/
src/devguide/ src/getstart/ src/ref/ src/tools/ src/tuning/
Author: rhillegas
Date: Fri Oct 15 17:13:54 2010
New Revision: 1023023
URL: http://svn.apache.org/viewvc?rev=1023023&view=rev
Log:
DERBY-4851: parameterize copyright years in the user docs so that the master release script can replace them with the current year when we build release distributions.
Modified:
db/derby/docs/trunk/ (props changed)
db/derby/docs/trunk/build.xml
db/derby/docs/trunk/docs.properties
db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
db/derby/docs/trunk/src/adminguide/radmincopyright.dita
db/derby/docs/trunk/src/devguide/derbydev.ditamap
db/derby/docs/trunk/src/devguide/rdevcopyright.dita
db/derby/docs/trunk/src/getstart/getstartderby.ditamap
db/derby/docs/trunk/src/getstart/rgscopyright.dita
db/derby/docs/trunk/src/ref/refderby.ditamap
db/derby/docs/trunk/src/ref/rrefcopyright.dita
db/derby/docs/trunk/src/tools/derbytools.ditamap
db/derby/docs/trunk/src/tools/rtoolscopyright.dita
db/derby/docs/trunk/src/tuning/rtuncopyright.dita
db/derby/docs/trunk/src/tuning/tuningderby.ditamap
Propchange: db/derby/docs/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 15 17:13:54 2010
@@ -3,3 +3,4 @@ conrefs.dita
out
temp
devguide
+temp_source
Modified: db/derby/docs/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/build.xml?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/build.xml (original)
+++ db/derby/docs/trunk/build.xml Fri Oct 15 17:13:54 2010
@@ -117,6 +117,9 @@ limitations under the License.
</target>
<target name="html.dita">
+ <!-- replace tokens with release variables -->
+ <antcall target="preprocess"/>
+
<!-- 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"/>
@@ -132,7 +135,7 @@ limitations under the License.
</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="args.input" value="${temp.source}${file.separator}${manual.name}${file.separator}${manual.ditamap}"/>
<property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}temp"/>
<property name="args.xhtml.toc" value="toc"/>
</ant>
@@ -207,13 +210,16 @@ limitations under the License.
</target>
<target name="pdf.dita">
+ <!-- replace tokens with release variables -->
+ <antcall target="preprocess"/>
+
<mkdir dir="${dita.dir}/temp"/>
<mkdir dir="${dita.output.dir}/${manual.name}"/>
<copy todir="${dita.output.dir}/${manual.name}">
<fileset dir="${dita.src.dir}/${manual.name}" includes="*.jpg"/>
</copy>
<ant dir="${dita.dir}" antfile="conductor.xml" target="dita2pdf" inheritAll="true">
- <property name="args.input" value="${basedir}${file.separator}src${file.separator}${manual.name}${file.separator}${manual.ditamap}"/>
+ <property name="args.input" value="${temp.source}${file.separator}${manual.name}${file.separator}${manual.ditamap}"/>
<property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}"/>
</ant>
</target>
@@ -275,9 +281,40 @@ limitations under the License.
style="${basedir}/lib/fo2html.xsl"/>
</target>
+ <!-- Preprocess source, replacing ant variables with release-specific constants -->
+ <target name="preprocess">
+ <delete dir="${temp.source}"/>
+ <mkdir dir="${temp.source}"/>
+ <mkdir dir="${temp.source}${file.separator}${manual.name}"/>
+
+ <antcall target="preprocess-copy">
+ <param name="source.dir" value="${basedir}${file.separator}src"/>
+ <param name="target.dir" value="${temp.source}"/>
+ <param name="inclusions" value="*.dita"/>
+ </antcall>
+
+ <antcall target="preprocess-copy">
+ <param name="source.dir" value="${basedir}${file.separator}src${file.separator}${manual.name}"/>
+ <param name="target.dir" value="${temp.source}${file.separator}${manual.name}"/>
+ <param name="inclusions" value="*.dita,*.ditamap"/>
+ </antcall>
+
+ </target>
+
+ <!-- Copy files, replacing ant variables with release-specific constants -->
+ <target name="preprocess-copy">
+ <copy todir="${target.dir}">
+ <fileset dir="${source.dir}" includes="${inclusions}"/>
+ <filterset>
+ <filter token="COPYRIGHT_YEAR" value="${copyright.year}"/>
+ </filterset>
+ </copy>
+ </target>
+
<target name="clean">
<delete dir="${dita.output.dir}"/>
<delete dir="${dita.temp.dir}"/>
+ <delete dir="${temp.source}"/>
</target>
<target name="clobber" depends="clean">
Modified: db/derby/docs/trunk/docs.properties
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/docs.properties?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/docs.properties (original)
+++ db/derby/docs/trunk/docs.properties Fri Oct 15 17:13:54 2010
@@ -9,4 +9,6 @@ dita.src.dir=${basedir}/src
dita.temp.dir=${basedir}/temp
dita.lib.dir=${basedir}/lib
dita.extname=.dita
+temp.source=${basedir}/temp_source
+copyright.year=2010
args.csspath=
Modified: db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Fri Oct 15 17:13:54 2010
@@ -25,7 +25,7 @@
<map title="Server and Administration Guide">
<topicmeta>
<copyright>
-<copyryear year="2004, 2010"/>
+<copyryear year="2004, @COPYRIGHT_YEAR@"/>
<copyrholder>Apache Software Foundation</copyrholder>
</copyright>
<prodinfo>
Modified: db/derby/docs/trunk/src/adminguide/radmincopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmincopyright.dita?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radmincopyright.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radmincopyright.dita Fri Oct 15 17:13:54 2010
@@ -22,7 +22,7 @@ limitations under the License.
<title>Copyright</title>
<refbody>
<section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-@COPYRIGHT_YEAR@ The Apache Software Foundation</p> <p> Licensed
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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>
Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Fri Oct 15 17:13:54 2010
@@ -21,7 +21,7 @@ limitations under the License.
<map title="Developer's Guide">
<topicmeta>
<copyright>
-<copyryear year="2004, 2010"/>
+<copyryear year="2004, @COPYRIGHT_YEAR@"/>
<copyrholder>Apache Software Foundation</copyrholder>
</copyright>
<prodinfo>
Modified: db/derby/docs/trunk/src/devguide/rdevcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcopyright.dita?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcopyright.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcopyright.dita Fri Oct 15 17:13:54 2010
@@ -22,7 +22,7 @@ limitations under the License.
<title>Copyright</title>
<refbody>
<section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-@COPYRIGHT_YEAR@ The Apache Software Foundation</p> <p> Licensed
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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>
Modified: db/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/getstart/getstartderby.ditamap Fri Oct 15 17:13:54 2010
@@ -21,7 +21,7 @@ limitations under the License.
<map title="Getting Started with Derby">
<topicmeta>
<copyright>
-<copyryear year="2004, 2010"/>
+<copyryear year="2004, @COPYRIGHT_YEAR@"/>
<copyrholder>Apache Software Foundation</copyrholder>
</copyright>
<prodinfo>
Modified: db/derby/docs/trunk/src/getstart/rgscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgscopyright.dita?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgscopyright.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgscopyright.dita Fri Oct 15 17:13:54 2010
@@ -22,7 +22,7 @@ limitations under the License.
<title>Copyright</title>
<refbody>
<section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-@COPYRIGHT_YEAR@ The Apache Software Foundation</p> <p> Licensed
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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0"
Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Fri Oct 15 17:13:54 2010
@@ -21,7 +21,7 @@ limitations under the License.
<map title="Reference Manual">
<topicmeta>
<copyright>
-<copyryear year="2004, 2010"/>
+<copyryear year="2004, @COPYRIGHT_YEAR@"/>
<copyrholder>Apache Software Foundation</copyrholder>
</copyright>
<prodinfo>
Modified: db/derby/docs/trunk/src/ref/rrefcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcopyright.dita?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcopyright.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcopyright.dita Fri Oct 15 17:13:54 2010
@@ -22,7 +22,7 @@ limitations under the License.
<title>Copyright</title>
<refbody>
<section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-@COPYRIGHT_YEAR@ The Apache Software Foundation</p> <p> Licensed
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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>
Modified: db/derby/docs/trunk/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/derbytools.ditamap?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/trunk/src/tools/derbytools.ditamap Fri Oct 15 17:13:54 2010
@@ -21,7 +21,7 @@ limitations under the License.
<map title="Tools and Utilities Guide">
<topicmeta>
<copyright>
-<copyryear year="2004, 2010"/>
+<copyryear year="2004, @COPYRIGHT_YEAR@"/>
<copyrholder>Apache Software Foundation</copyrholder>
</copyright>
<prodinfo>
Modified: db/derby/docs/trunk/src/tools/rtoolscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolscopyright.dita?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolscopyright.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolscopyright.dita Fri Oct 15 17:13:54 2010
@@ -22,7 +22,7 @@ limitations under the License.
<title>Copyright</title>
<refbody>
<section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-@COPYRIGHT_YEAR@ The Apache Software Foundation</p> <p> Licensed
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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>
Modified: db/derby/docs/trunk/src/tuning/rtuncopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/rtuncopyright.dita?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/rtuncopyright.dita (original)
+++ db/derby/docs/trunk/src/tuning/rtuncopyright.dita Fri Oct 15 17:13:54 2010
@@ -22,7 +22,7 @@ limitations under the License.
<title>Copyright</title>
<refbody>
<section> <p><image href="../images/logowithtext.jpg"><alt>Logo for Apache
-Derby</alt></image></p> <p>Copyright 2004-2010 The Apache Software Foundation</p> <p> Licensed
+Derby</alt></image></p> <p>Copyright 2004-@COPYRIGHT_YEAR@ The Apache Software Foundation</p> <p> Licensed
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 <xref format="html" href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">http://www.apache.org/licenses/LICENSE-2.0</xref>.</p> </section>
Modified: db/derby/docs/trunk/src/tuning/tuningderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/tuningderby.ditamap?rev=1023023&r1=1023022&r2=1023023&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/tuningderby.ditamap (original)
+++ db/derby/docs/trunk/src/tuning/tuningderby.ditamap Fri Oct 15 17:13:54 2010
@@ -21,7 +21,7 @@ limitations under the License.
<map title="Tuning Derby">
<topicmeta>
<copyright>
-<copyryear year="2004, 2010"/>
+<copyryear year="2004, @COPYRIGHT_YEAR@"/>
<copyrholder>Apache Software Foundation</copyrholder>
</copyright>
<prodinfo>