Changeset 18949

Show
Ignore:
Timestamp:
06/04/06 08:22:39 (2 years ago)
Author:
patrick
Message:

Merged updates from the trunk:

Revision 18903: Renamed $(FO_VERSION) to $(FO_TOOL) to be consistent with

other variable names for tools.

Revision 18904: Handle the use of the recent FOP 1.0 alpha and beta

releases.

Revision 18911: Removed unneeded nesting of ifeq blocks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.0/doc/docbook.mk

    r18434 r18949  
    5151BATIK_VERSION?=         1.5.1 
    5252 
     53ifeq ($(FOP_VERSION), 0.20.5) 
     54FOP_SCRIPT=     fop.sh 
     55else 
     56FOP_SCRIPT=     fop 
     57endif 
     58 
    5359# Installation paths. 
    5460DOCBOOK_ROOT?=  /home/vr/Juggler/docbook 
    …… 
    6167DVIPDF?=        dvipdf 
    6268DVIPS?=         dvips 
    63 FOP?=           sh $(DOCBOOK_ROOT)/fop-$(FOP_VERSION)/fop.sh 
     69FOP?=           sh $(DOCBOOK_ROOT)/fop-$(FOP_VERSION)/$(FOP_SCRIPT) 
    6470HTML2TXT?=      html2text 
    6571HTML2TXTOPTS?=  -ascii -nobs -style pretty -width 76 -rcfile html2text.rc 
    …… 
    8288XSLTPROC?=      /usr/bin/xsltproc 
    8389 
    84 FO_VERSION?=  FOP 
     90FO_TOOL?=     FOP 
    8591XSLT_TOOL?=     Xalan 
    8692 
    …… 
    9096# FO.  The default is to use FOP.  XEP or Passive TeX can be used instead by 
    9197# defining $(USE_XEP) or $(USE_PASSIVE_TEX) respectively. 
    92 ifeq ($(FO_VERSION), FOP) 
     98ifeq ($(FO_TOOL), FOP) 
     99ifeq ($(FOP_VERSION), 0.20.5) 
    93100   XALAN_FO_PARAMS=     -PARAM fop.extensions "1" -PARAM alignment "start" 
    94101   SAXON_FO_PARAMS=     fop.extensions=1 alignment="start" 
    95102else 
    96 ifeq ($(FO_VERSION), XEP) 
     103   XALAN_FO_PARAMS=     -PARAM fop1.extensions "1" -PARAM alignment "start" 
     104   SAXON_FO_PARAMS=     fop1.extensions=1 alignment="start" 
     105endif 
     106endif 
     107ifeq ($(FO_TOOL), XEP) 
    97108   XALAN_FO_PARAMS=     -PARAM xep.extensions "1" 
    98109   SAXON_FO_PARAMS=     xep.extensions=1 
    99 else 
    100 ifeq ($(FO_VERSION), PASSIVE_TEX) 
     110endif 
     111ifeq ($(FO_TOOL), PASSIVE_TEX) 
    101112   XALAN_FO_PARAMS=     -PARAM passivetex.extensions "1"                \ 
    102113                        -PARAM tex.math.in.alt "latex" 
    103114   SAXON_FO_PARAMS=     passivetex.extensions=1 tex.math.in.alt=latex 
    104 endif # PASSIVE_TEX 
    105 endif # XEP 
    106 endif # FOP 
     115endif 
    107116 
    108117SAXON_HTML_PARAMS=      html.stylesheet=base_style.css 
    …… 
    267276 
    268277# Generate a PDF file from an FO file using FOP. 
    269 ifeq ($(FO_VERSION), FOP) 
     278ifeq ($(FO_TOOL), FOP) 
    270279$(PDF_FILES): $(FO_FILES) 
    271280$(TXT_FILES): $(FO_FILES) 
    …… 
    307316# Generate a PDF file from an XML file using PassiveTeX.  This one requires 
    308317# that a simple TeX file be generated from the XML first (see below). 
    309 ifeq ($(FO_VERSION), PASSIVE_TEX) 
     318ifeq ($(FO_TOOL), PASSIVE_TEX) 
    310319$(PDF_FILES): $(FO_FILES) 
    311320 
    …… 
    327336# Generate a PDF file using XEP from RenderX.  This requires that an FO file 
    328337# be generated first. 
    329 ifeq ($(FO_VERSION), XEP) 
     338ifeq ($(FO_TOOL), XEP) 
    330339$(PDF_FILES): $(FO_FILES) 
    331340