Changeset 6490


Ignore:
Timestamp:
Jun 23, 2014, 1:38:21 PM (7 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #1817: Do not generate BASE documentation PDF

Location:
trunk
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r6465 r6490  
    164164      <fileset dir="doc/api" defaultexcludes="no" />
    165165      <fileset dir="doc/html" defaultexcludes="no" />
    166       <fileset file="doc/base.pdf" />
    167166      <fileset file="data/helptexts.xml" />
    168167    </delete>
     
    947946    </path>
    948947    <property name="docbook.html.out" location="${doc}/html" />
    949     <property name="docbook.pdf.out" location="${doc}" />
    950948  </target>
    951949 
     
    10561054  <target
    10571055    name="doc.docbook"
    1058     depends="doc.init,doc.docbook.html,doc.docbook.pdf"
     1056    depends="doc.init,doc.docbook.html"
    10591057    description="Generate docbook user and admin documentation."
    10601058    >
     
    11311129 
    11321130  <target
    1133     name="doc.docbook.pdf"
    1134     depends="dev.init,doc.init"
    1135     >
    1136     <!-- Generate a pdf file from the documentation source -->
    1137     <mkdir dir="${build}/docbook/pdf" />
    1138     <echo>Generate pdf file</echo>
    1139     <ant antfile="${lib}/docbook/ant-build-docbook.xml" inheritall="false" target="pdf.fop">
    1140       <property name="ant.docbook.styler.dir" location="${lib}/docbook" />
    1141       <property name="docbook.xml.dir" location="${docbook.src}" />
    1142       <property name="docbook.resources.dir" location="${docbook.src}/figures" />
    1143       <property name="distribution.dir" location="${docbook.pdf.out}" />
    1144       <property name="build.dir" location="${build}/docbook/pdf" />
    1145       <property name="pdf.name" value="base.pdf" />
    1146       <property name="base.version" value="${base.version}${base.versionsuffix}"/>
    1147     </ant>
    1148   </target>
    1149  
    1150   <target
    11511131    name="doc.dist"
    11521132    description="Copy documentation to the binary distribution"
  • trunk/lib/docbook/ant-build-docbook.xml

    r6404 r6490  
    2727  <!-- Start file for Docbook processing. -->
    2828  <property name="index.name"              value="${manual.name}" />
    29  
    30   <!-- Ouput file name for the docbook pdf file-->
    31   <property name="pdf.name"         value="base"/>
    3229 
    3330  <property name="docbook.style"           value="plain" />
     
    215212
    216213
    217   <!-- ########################################################## -->
    218   <!-- ### {{{ builds PDF documentation using FOP             ### -->
    219   <!-- ########################################################## -->
    220   <property name="module.fop.basedir" location="${ant.docbook.styler.dir}/module-fop" />
    221   <target name="pdf.fop" depends="modules.detection,pdf.fop.internal">
    222     <fail unless="module.fop.present">
    223     ### ERROR: module for PDF FOP rendering not installed. Please download
    224     it, and reinstall the styler using 'ant -f ant-build.docbook.xml install'.
    225     </fail>
    226   </target>
    227 
    228   <target name="pdf.fop.internal" depends="disable.resources.copy,docbook.consolidate" if="module.fop.present">
    229    
    230     <!-- Get the revision number and the datetime when the latest file was commited -->
    231     <svn refid="svnSettings">
    232     <status path="../../doc/src/docbook" lastChangedRevisionProperty="doc.revision" />
    233       <status path="../../doc/src/docbook" lastChangedDateProperty="doc.last.modified" />
    234   </svn>
    235 
    236     <copy file="${module.fop.basedir}/conf/config.xml"
    237       tofile="${build.dir}/config.xml"
    238       overwrite="true"
    239     >
    240         <filterset refid="filterset.fileuris" />
    241     </copy>
    242    
    243     <copy file="${docbook.styles}/${docbook.style}/xsl/customized.pdf-fop.xsl"
    244           tofile="${build.dir}/customized.pdf-fop.xsl.tmp"
    245           overwrite="true"
    246     >
    247         <filterset refid="filterset.fileuris" />
    248       <filterset>
    249           <filter token="doc.revision" value="${doc.revision}" />
    250           <filter token="doc.last.modified" value="${doc.last.modified}" />
    251           <filter token="base.version" value="${base.version}" />
    252         </filterset>
    253     </copy>
    254 
    255     <xslt
    256         in      = "${temp:docbook.ready.file}"
    257         style   = "${build.dir}/customized.pdf-fop.xsl.tmp"
    258         out     = "${build.dir}/fop-ready.fo"
    259         processor = "${xslt.processor}"
    260         >
    261         <classpath refid="ant-extensions" />
    262     </xslt>
    263 
    264     <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop">
    265              <classpath>
    266                 <fileset dir="${module.fop.basedir}">
    267                     <include name="**/*.jar" />
    268                 </fileset>
    269               <fileset dir="../dist">
    270                 <include name="commons-logging-*.jar" />
    271               </fileset>
    272              </classpath>
    273     </taskdef>
    274 
    275     <fop format     = "application/pdf"
    276          fofile     = "${build.dir}/fop-ready.fo"
    277          outfile    = "${distribution.dir}/${pdf.name}"
    278          messagelevel = "warn"
    279          userconfig = "${build.dir}/config.xml"
    280        basedir="${build.dir}"
    281         />
    282 
    283   </target>
    284   <!-- }}} -->
    285    
    286214  <!-- ########################################################## -->
    287215  <!-- ### {{{ builds HTML documentation (single and chunked) ### -->
Note: See TracChangeset for help on using the changeset viewer.