Hello community,
here is the log from the commit of package daps for openSUSE:Factory checked in at 2015-09-30 05:53:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/daps (Old)
and /work/SRC/openSUSE:Factory/.daps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/daps/daps.changes 2015-08-13 18:11:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2015-09-30 05:53:30.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Sep 22 13:50:13 UTC 2015 - fsundermeyer@opensuse.org
+
+Stable release DAPS 2.1.3:
+
+* Bugfixes:
+ - Fix for issue #284 (spellcheck / getimages use wrong filelist
+ when called with --debug
+ - "--param" and "--stringparam" were missing for the subcommands
+ package-pdf and package-html
+ - all warning messages now go to STDERR, making it possible to
+ always catch the output of a DAPS command with FOO="$(daps...)
+
+* Misc:
+ - added a wrapper for jing allwing to customize java flags,
+ jars, and options
+ - standardized customising options for all java programs (fop,
+ jing, xep)
+
+-------------------------------------------------------------------
Old:
----
daps-2.1.2.tar.bz2
New:
----
daps-2.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ daps.spec ++++++
--- /var/tmp/diff_new_pack.Nr3sgl/_old 2015-09-30 05:53:31.000000000 +0200
+++ /var/tmp/diff_new_pack.Nr3sgl/_new 2015-09-30 05:53:31.000000000 +0200
@@ -17,7 +17,7 @@
Name: daps
-Version: 2.1.2
+Version: 2.1.3
Release: 0
###############################################################
++++++ daps-2.1.2.tar.bz2 -> daps-2.1.3.tar.bz2 ++++++
++++ 2016 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/ChangeLog new/daps/ChangeLog
--- old/daps/ChangeLog 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/ChangeLog 2015-09-22 15:19:13.000000000 +0200
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Tue Sep 22 11:28:03 UTC 2015 - fsundermeyer@opensuse.org
+
+Stable release DAPS 2.1.3:
+
+* Bugfixes:
+ - Fix for issue #284 (spellcheck / getimages use wrong filelist
+ when called with --debug
+ - "--param" and "--stringparam" were missing for the subcommands
+ package-pdf and package-html
+ - all warning messages now go to STDERR, making it possible to
+ always catch the output of a DAPS command with FOO="$(daps...)
+
+* Misc:
+ - added a wrapper for jing allwing to customize java flags,
+ jars, and options
+ - standardized customising options for all java programs (fop,
+ jing, xep)
+
+-------------------------------------------------------------------
Tue Aug 4 09:28:03 UTC 2015 - fsundermeyer@opensuse.org
Stable release DAPS 2.1.2:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/INSTALL.adoc new/daps/INSTALL.adoc
--- old/daps/INSTALL.adoc 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/INSTALL.adoc 2015-09-22 15:19:13.000000000 +0200
@@ -114,7 +114,7 @@
=== Installation
-1. Download the https://github.com/openSUSE/daps/archive/2.1.1.tar.gz[DAPS 2.1.1]
+1. Download the https://github.com/openSUSE/daps/archive/2.1.3.tar.gz[DAPS 2.1.3]
archive and unpack it _or_, alternatively clone the master branch from GitHub: +
`git clone https://github.com/openSUSE/daps.git -b master --single-branch`
2. Change into the daps directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/README.adoc new/daps/README.adoc
--- old/daps/README.adoc 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/README.adoc 2015-09-22 15:19:13.000000000 +0200
@@ -23,8 +23,8 @@
also been successfully tested on Debian, Fedora, and Ubuntu. See
link:INSTALL.adoc[INSTALL.adoc] for installation instructions.
-The latest version, https://github.com/openSUSE/daps/archive/2.1.1.tar.gz[DAPS
-2.1.1], was released on 2015-07-10.
+The latest version, https://github.com/openSUSE/daps/archive/2.1.3.tar.gz[DAPS
+2.1.3], was released on 2015-09-22.
Contributing
------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/bin/ccecho new/daps/bin/ccecho
--- old/daps/bin/ccecho 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/bin/ccecho 2015-09-22 15:19:13.000000000 +0200
@@ -10,11 +10,11 @@
cat < no color
- error -> bold red
- info -> purple
- result -> green
- warn -> red
+ normal -> no color, STDOUT
+ error -> bold red, STDERR
+ info -> purple, STDOUT
+ result -> green, STDOUT
+ warn -> red, STDERR
MESSAGE
The message to be printed. Needs to be quoted using double quotes.
@@ -96,4 +96,8 @@
MESSAGE=${MESSAGE//\\n/${END_COLOR}\\n${START_COLOR}}
fi
-echo -e "${START_COLOR}${MESSAGE}${END_COLOR}"
+if [[ error = "$LEVEL" || warn = "$LEVEL" ]]; then
+ echo -e "${START_COLOR}${MESSAGE}${END_COLOR}" >&2
+else
+ echo -e "${START_COLOR}${MESSAGE}${END_COLOR}"
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/bin/daps.in new/daps/bin/daps.in
--- old/daps/bin/daps.in 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/bin/daps.in 2015-09-22 15:19:13.000000000 +0200
@@ -73,8 +73,10 @@
EXPORT_DIR
FALLBACK_STYLEROOT
FOP_CONFIG_FILE
- FOP_OPTIONS
- FOP_STACKSIZE
+ FOP_CMD_OPTIONS
+ FOP_JAVA_FLAGS
+ FOP_JAVA_JARS
+ FOP_JAVA_OPTIONS
FOP_WRAPPER
FORCE_REBUILD
FORMATTER
@@ -84,13 +86,16 @@
HTML_CSS
HTMLROOT
HTMLSINGLE
- JSP
IMAGES_COLOR
IMAGES_GRAYSCALE
IMG_VIEWER
INCLUDE_MANIFEST
INK_OPTIONS
- JING_FLAGS
+ JING_JAVA_FLAGS
+ JING_JAVA_JARS
+ JING_JAVA_OPTIONS
+ JING_WRAPPER
+ JSP
LIB_DIR
LIBEXEC_DIR
LOG_DIR
@@ -141,7 +146,10 @@
VALID_ROOTELEMENTS
VERBOSITY
XEP_CONFIG_FILE
- XEP_OPTIONS
+ XEP_CMD_OPTIONS
+ XEP_JAVA_FLAGS
+ XEP_JAVA_JARS
+ XEP_JAVA_OPTIONS
XEP_WRAPPER
XML_MAIN_CATALOG
XML_USER_CATALOGS
@@ -199,6 +207,7 @@
FOP_CONFIG_FILE
FOP_WRAPPER
HTML_CSS
+ JING_WRAPPER
STATIC_DIR
STYLEDEVEL
STYLEROOT
@@ -278,9 +287,6 @@
SUBCOMMANDS+=("dapsenv=debugging")
HELP_SUBCOMMAND+=("dapsenv=DEBUGGING: Shows a list of internal variables and their values.")
-SUBCOMMANDS+=("debug=debugging")
-HELP_SUBCOMMAND+=("debug=DEBUGGING: for developing purposes only.")
-
SUBCOMMANDS+=("dist-webhelp=build_generic")
HELP_SUBCOMMAND+=("dist-webhelp=Creates a distributable tar archive of a webhelp document\n(including images and css).")
@@ -1083,6 +1089,8 @@
DEBUG=1
VERBOSITY_CMDL=2
VERBOSITY=$VERBOSITY_CMDL
+ # enable JAVA debug messages (fop, xep, jing)
+ export VERBOSE=1
shift
;;
--fb_styleroot)
@@ -1170,7 +1178,7 @@
#
if [[ -n "$FALLBACK_STYLEROOT" && -z "$STYLEROOT" ]]; then
if [[ 0 != $VERBOSITY ]]; then
- echo "Warning: --styleroot is not specified, ignoring --fb_styleroot"
+ echo "Warning: --styleroot is not specified, ignoring --fb_styleroot" >&2
fi
fi
@@ -1458,7 +1466,7 @@
[[ -n "$DOCCONF_CMDL" ]] && source "$DOCCONF_CMDL"
-# FOP/XEP CONFIG and WRAPPER
+# FOP/XEP CONFIG and WRAPPER / JING WRAPPER
# when using an SVN checkout, @sysconfdir@ and @pkgdatadir have not been
# replaced
#
@@ -1469,6 +1477,8 @@
FOP_CONFIG_FILE=${FOP_CONFIG_FILE/#@sysconfdir\@\/daps/${DAPSROOT}/etc}
FOP_WRAPPER=${FOP_WRAPPER/#@pkgdatadir\@/${DAPSROOT}}
+JING_WRAPPER=${JING_WRAPPER/#@pkgdatadir\@/${DAPSROOT}}
+
XEP_CONFIG_FILE=${XEP_CONFIG_FILE/#@sysconfdir\@\/daps/${DAPSROOT}/etc}
XEP_WRAPPER=${XEP_WRAPPER/#@pkgdatadir\@/${DAPSROOT}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/configure.ac new/daps/configure.ac
--- old/daps/configure.ac 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/configure.ac 2015-09-22 15:19:13.000000000 +0200
@@ -11,7 +11,7 @@
m4_define(daps_version_major, 2)
m4_define(daps_version_minor, 1)
-m4_define(daps_version_micro, [2])
+m4_define(daps_version_micro, [3])
# API version
m4_define([daps_api_version],[daps_version_major])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/doc/xml/art_daps_quick.xml new/daps/doc/xml/art_daps_quick.xml
--- old/daps/doc/xml/art_daps_quick.xml 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/doc/xml/art_daps_quick.xml 2015-09-22 15:19:13.000000000 +0200
@@ -252,9 +252,9 @@
<para>If you want to modify the file name and the title for the document,
use the options <option>--name</option> and <option>--title</option>:
</para>
- <screen>&prompt.user;<command>daps-init
- --docdir <replaceable>PATH_TO_DOC_DIR</replaceable> --name "my_document" --title "Example
- Documentation"</command></screen>
+ <screen>&prompt.user;<command>daps-init --docdir <replaceable>PATH_TO_DOC_DIR</replaceable> \
+ --name "my_document" \
+ --title "Example Documentation"</command></screen>
</step>
<step>
<para>If you want to create an example book file in addition to the article,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/etc/config.in new/daps/etc/config.in
--- old/daps/etc/config.in 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/etc/config.in 2015-09-22 15:19:13.000000000 +0200
@@ -281,37 +281,40 @@
# FOP_CONFIG_FILE="@sysconfdir@/daps/fop/fop-daps.xml"
FOP_CONFIG_FILE=""
-
## Key: FOP_OPTIONS
## -----------------------
## Description: Command line options for the FOP pdf formatter
## Type: String
-## Default: "-q" (turn on quiet mode)
+## Default: ""
#
# Specify command line options for the FOP formatter.
# Also see FORMATTER, FOP-*
#
-FOP_OPTIONS="-q"
+FOP_CMD_OPTIONS=""
+## Key: FOP_JAVA_FLAGS
+## ----------------------------
+## Description: Additional java properties for running fop
+## Type: String (-D<prop>)
+## Default: ""
+#
+FOP_JAVA_FLAGS=""
-## Key: FOP_STACKSIZE
-## --------------------------
-## Description: Java stack size for the FOP pdf formatter
+## Key: FOP_JAVA_JARS
+## ---------------------------
+## Description: Additional Jars for running fop
## Type: String
-## Default: "-Xss2048K"
-#
-# Needs to be specified as -Xss<size>
-# <size> can either be specified in kilobytes (K) or megabytes (m)
-# Example:
-# -Xss2048K
-# -Xss2m
-#
-# Increase this value (e.g. to 3 or 4 MB) if you experience strange
-# problems when building PDFs with FOP (especially on 64bit machines)
+## Default: ""
#
-# Also see FORMATTER, FOP-*
+FOP_JAVA_JARS=""
+
+## Key: FOP_JAVA_OPTIONS
+## ------------------------------
+## Description: Additional java options for running fop
+## Type: String (-X<option>), see java -X for help
+## Default: ""
#
-FOP_STACKSIZE="-Xss2048K"
+FOP_JAVA_OPTIONS=""
## Key: FOP_WRAPPER
## -----------------------
@@ -319,10 +322,13 @@
## Type: PATH to script
## Default: "@pkgdatadir@/libexec/daps-fop""
#
-# Optional wrapper script for calling FOP. The default "fop" will run
+# Optional wrapper script for calling fop. If set to "fop", it will run
# the first fop executable found in your path (usually this will be
# /usr/bin/fop)
-# Also see FORMATTER, FOP-*
+#
+# The default will probably not work on Debian/Ubuntu, since they
+# use a different way to set Java options. Setting up a custom wrapper
+# script for Ubuntu/Debian might be needed (not tested)
#
FOP_WRAPPER="@pkgdatadir@/libexec/daps-fop"
@@ -348,6 +354,49 @@
#
GZIP_MAN="yes"
+
+## Key: JING_JAVA_FLAGS
+## ----------------------------
+## Description: Additional java properties for running jing
+## Type: String (-D<prop>)
+## Default: ""
+#
+JING_JAVA_FLAGS=""
+
+## Key: JING_JAVA_JARS
+## ---------------------------
+## Description: Additional Jars for running jing
+## Type: String
+## Default: ""
+#
+JING_JAVA_JARS=""
+
+## Key: JING_JAVA_OPTIONS
+## ------------------------------
+## Description: Additional java options for running jing
+## Type: String (-X<option>), see java -X for help
+## Default: ""
+#
+JING_JAVA_OPTIONS=""
+
+## Key: JING_WRAPPER
+## -------------------------
+## Description: Wrapper script for Jing
+## Type: PATH to script
+## Default: "@pkgdatadir@/libexec/daps-jing"
+#
+# Optional wrapper script for calling jing. If set to "jing", it will run
+# the first jing executable found in your path (usually this will be
+# /usr/bin/jing)
+#
+# The default will probably not work on Debian/Ubuntu, since they
+# use a different way to set Java options. Setting up a custom wrapper
+# script for Ubuntu/Debian might be needed (not tested)
+#
+# Also see JING_*
+#
+JING_WRAPPER="@pkgdatadir@/libexec/daps-jing"
+
## Key: HTML5
## ------------------------
## Description: Use XHTML5 instead of XHTML1 for HTML output
@@ -693,12 +742,36 @@
## -----------------------
## Description: Command line options for the XEP pdf formatter
## Type: String
-## Default: "-q" (turn on quiet mode)
+## Default: ""
#
# Specify command line options for the XEP formatter.
# Also see FORMATTER, XEP-*
#
-XEP_OPTIONS="-q"
+XEP_CMD_OPTIONS=""
+
+## Key: XEP_JAVA_FLAGS
+## ----------------------------
+## Description: Additional java properties for running xep
+## Type: String (-D<prop>)
+## Default: ""
+#
+XEP_JAVA_FLAGS=""
+
+## Key: XEP_JAVA_JARS
+## ---------------------------
+## Description: Additional Jars for running xep
+## Type: String
+## Default: ""
+#
+XEP_JAVA_JARS=""
+
+## Key: XEP_JAVA_OPTIONS
+## ------------------------------
+## Description: Additional java options for running xep
+## Type: String (-X<option>), see java -X for help
+## Default: ""
+#
+XEP_JAVA_OPTIONS=""
## Key: XEP_WRAPPER
## -----------------------
@@ -706,10 +779,13 @@
## Type: PATH to script
## Default: "@pkgdatadir@/libexec/daps-xep"
#
-# Optional wrapper script for calling XEP. The default "xep" will run
-# the first xep binary found in your path (usually this will be
+# Optional wrapper script for calling xep. If set to "xep", it will run
+# the first xep executable found in your path (usually this will be
# /usr/bin/xep)
-# Also see FORMATTER, XEP-*
+#
+# The default will probably not work on Debian/Ubuntu, since they
+# use a different way to set Java options. Setting up a custom wrapper
+# script for Ubuntu/Debian might be needed (not tested)
#
XEP_WRAPPER="@pkgdatadir@/libexec/daps-xep"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/lib/daps_functions new/daps/lib/daps_functions
--- old/daps/lib/daps_functions 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/lib/daps_functions 2015-09-22 15:19:13.000000000 +0200
@@ -218,10 +218,10 @@
P_PAGEFILES=1
shift
;;
- --param)
- P_PARAMS="$P_PARAMS --param $2"
- shift 2
- ;;
+ --param)
+ P_PARAMS="$P_PARAMS --param $2"
+ shift 2
+ ;;
--pretty)
P_PRETTY=1
shift
@@ -255,10 +255,10 @@
sanitize_path "$2" "P_STATIC_DIR"
shift 2
;;
- --stringparam)
- P_STRINGPARAMS="$P_STRINGPARAMS --stringparam $2"
- shift 2
- ;;
+ --stringparam)
+ P_STRINGPARAMS="$P_STRINGPARAMS --stringparam $2"
+ shift 2
+ ;;
--subdirs)
P_SUBDIRS=1
shift
@@ -276,7 +276,7 @@
shift 2
;;
--xsltparam)
- ccecho -- "info" "--xsltparam is deprecated, please use --param/--stringparam."
+ ccecho -- "warn" "--xsltparam is deprecated, please use --param/--stringparam instead."
P_XSLTPARAM="$2"
shift 2
;;
@@ -422,15 +422,25 @@
###########################################################################
function call_make {
local CORE_NO DBSTYLE_FILE DBSTYLE_VERS LOGFILE MAKE_BIN
- local MAKE_OPTIONS MAKE_CMD STRING SUB_CMD
+ local MAKE_OPTIONS MAKE_CMD STRING SILENT SUB_CMD
# first argument passed to the function is the subcommand
- # in some cases, additional arguments are passed to this
+
+ # Second and optional argument is "silent" - if set all debug and
+ # verbosity settings are ignored. This allows to run call_make to set
+ # variables (e.g. FILELIST=$(call_make "list-srcfiles")
+
+ # In some cases, additional arguments are passed to this
# function - they remain in $@ and will be passed "as is" to make
#
SUB_CMD=$1
shift
+ if [[ "silent" = "$1" ]]; then
+ SILENT="1"
+ shift
+ fi
+
# Check the remaining $@ - if it contains variable definitions (FOO=BAR
# or FOO="BAR") it's OK, if it contains barewords, exit with an error
#
@@ -449,18 +459,20 @@
MAKE_OPTIONS="-f $DAPSROOT/make/selector.mk"
MAKE_BIN="/usr/bin/make"
- if [[ 1 = "$DEBUG" || 3 = "$VERBOSITY" ]]; then
- # use remake if installed when in debug or highest verbosity mode
- IS_REMAKE=$(which remake 2>/dev/null)
- [[ -n "$IS_REMAKE" ]] && MAKE_BIN="/usr/bin/remake"
- MAKE_OPTIONS="$MAKE_OPTIONS --debug=b"
+ if [[ 1 != "$SILENT" ]]; then
+ if [[ 1 = "$DEBUG" || 3 = "$VERBOSITY" ]]; then
+ # use remake if installed when in debug or highest verbosity mode
+ IS_REMAKE=$(which remake 2>/dev/null)
+ [[ -n "$IS_REMAKE" ]] && MAKE_BIN="/usr/bin/remake"
+ MAKE_OPTIONS="$MAKE_OPTIONS --debug=b"
+ fi
fi
if [[ 0 = "$VERBOSITY" || 1 = "$VERBOSITY" || 2 = "$VERBOSITY" ]]; then
# calculate Number of CPUs (cores) for -j option, set to "1" if empty
CORE_NO=$(egrep -s -m1 "cpu cores\s*:" /proc/cpuinfo 2>/dev/null | sed 's/cpu cores\s*:\s*//')
[[ -z "$CORE_NO" ]] && CORE_NO=1
MAKE_OPTIONS="$MAKE_OPTIONS -j${CORE_NO}"
- [[ 1 != $DEBUG ]] && MAKE_OPTIONS="$MAKE_OPTIONS -s"
+ [[ 1 != "$DEBUG" || 1 = "$SILENT" ]] && MAKE_OPTIONS="$MAKE_OPTIONS -s"
else
# highest verbosity level - use -j1 for a better readability
MAKE_OPTIONS="$MAKE_OPTIONS -j1"
@@ -473,7 +485,7 @@
# Variable settings summary printed on debug and high verbosity mode
- if [[ 2 -le $VERBOSITY ]]; then
+ if [[ 2 -le $VERBOSITY && 1 != "$SILENT" ]]; then
# get stylesheet version (ticket #151)
# saxon6 (at least on openSUSE) does not properly resolve http Urls
# (because it does not ask the catalog but rather directly accesses
@@ -540,24 +552,24 @@
fi
if [[ 0 != "$VERBOSITY" ]]; then
- if [[ 1 = "$WRITE_LOG" ]]; then
+ if [[ 1 = "$WRITE_LOG" ]]; then
$MAKE_CMD 2>&1 | tee -a "$LOGFILE"
# see http://www.unix.com/shell-programming-scripting/92163-command-does-not-retur...
[[ 0 = "${PIPESTATUS[0]}" ]] || exit 1
- else
- $MAKE_CMD 2>&1
- fi
+ else
+ $MAKE_CMD 2>&1
+ fi
else
if [[ 1 = "$WRITE_LOG" ]]; then
$MAKE_CMD >> "$LOGFILE" 2>&1
if [[ 0 = "$?" ]]; then
- # make command successful, only show last line (aka result)
- tail -n 1 "$LOGFILE"
+ # make command successful, only show last line (aka result)
+ tail -n 1 "$LOGFILE"
else
# an error occured in make
# show complete logfile except the first line containing the
# date
- tail -n +2 "$LOGFILE"
+ tail -n +2 "$LOGFILE"
exit 1
fi
else
@@ -617,17 +629,17 @@
#------ Computing the values returned from the parser -----
if [[ 1 = "$P_HELP" ]]; then
help_scmd_head "$SUB_CMD" "$HELP_SUBCMD"
- help_cropmarks
+ help_cropmarks
help_draft
help_formatter
- help_grayscale_pdf
+ help_grayscale_pdf
help_help
help_meta
help_name
- help_param
+ help_param
help_remarks
help_rootid
- help_stringparam
+ help_stringparam
help_xsltparam "creates the .fo file from the profiled sources"
echo
exit 0
@@ -683,16 +695,16 @@
help_draft
help_help
help_html5
- help_jsp
+ help_jsp
help_meta
help_name
help_nostatic
- help_param
+ help_param
help_remarks
help_rootid
- help_single
+ help_single
help_statdir
- help_stringparam
+ help_stringparam
help_xsltparam "creates $SUB_CMD from the profiled sources"
echo
exit 0
@@ -751,10 +763,10 @@
help_name
help_nosearch
help_nostatic
- help_param
+ help_param
help_remarks
help_rootid
- help_stringparam
+ help_stringparam
help_xsltparam "creates Webhelp HTML from the profiled sources"
echo
exit 0
@@ -814,13 +826,13 @@
help_scmd_head "$SUB_CMD" "$HELP_SUBCMD"
help_check
help_css
- help_epub3
+ help_epub3
help_help
help_name
- help_param
+ help_param
help_rootid
help_statdir
- help_stringparam
+ help_stringparam
echo
exit 0
fi
@@ -871,9 +883,9 @@
help_scmd_head "$SUB_CMD" "$HELP_SUBCMD"
help_help
help_nogzip
- help_param
+ help_param
help_rootid
- help_stringparam
+ help_stringparam
help_subdirs
echo
exit 0
@@ -910,9 +922,9 @@
help_scmd_head "$SUB_CMD" "$HELP_SUBCMD"
help_help
help_name
- help_param
+ help_param
help_rootid
- help_stringparam
+ help_stringparam
echo
exit 0
fi
@@ -1001,7 +1013,7 @@
help_name
help_noset
help_rootid
- help_optipng
+ help_optipng
echo
exit 0
fi
@@ -1062,9 +1074,9 @@
help_scmd_head "$SUB_CMD" "$HELP_SUBCMD"
help_def-file
help_help
- help_locdrop
+ help_locdrop
help_name
- help_optipng
+ help_optipng
help_set-date
echo
exit 0
@@ -1105,7 +1117,7 @@
shift
SHORT_OPTS="h"
- LONG_OPTS="cropmarks,desktopfiles,documentfiles,formatter:,grayscale,help,name:,pagefiles,rootid:,set-date:,xsltparam:"
+ LONG_OPTS="cropmarks,desktopfiles,documentfiles,formatter:,grayscale,help,name:,pagefiles,param:,rootid:,set-date:,stringparam:,xsltparam:"
parse_args "$SHORT_OPTS" "$LONG_OPTS" "$SUB_CMD" "$@"
eval set -- "$P_REMAIN_ARGS"
@@ -1120,9 +1132,11 @@
help_grayscale_pdf
help_help
help_name
+ help_param
help_pagefiles
help_rootid
help_set-date
+ help_stringparam
help_xsltparam "creates the .fo file from the profiled sources"
echo
exit 0
@@ -1135,6 +1149,8 @@
[[ 1 = "$P_GRAYSCALE" ]] && export GRAYSCALE=1
[[ -n "$P_NAME" ]] && export PDFNAME="$P_NAME" BOOK="$P_NAME"
[[ -n "$P_ROOTID" ]] && export ROOTID="$P_ROOTID"
+ [[ -n "$P_PARAMS" ]] && export PARAMS="$P_PARAMS"
+ [[ -n "$P_STRINGPARAMS" ]] && export STRINGPARAMS="$P_STRINGPARAMS"
[[ -n "$P_XSLTPARAM" ]] && export XSLTPARAM="$XSLTPARAM $P_XSLTPARAM"
if [[ -n "$P_FORMATTER" ]]; then
@@ -1168,7 +1184,7 @@
shift
SHORT_OPTS="h"
- LONG_OPTS="css:,desktopfiles,documentfiles,help,html5,jsp,name:,pagefiles,rootid:,set-date:,single,statdir:,xsltparam:"
+ LONG_OPTS="css:,desktopfiles,documentfiles,help,html5,jsp,name:,pagefiles,param:,rootid:,set-date:,single,statdir:,stringparam:,xsltparam:"
parse_args "$SHORT_OPTS" "$LONG_OPTS" "$SUB_CMD" "$@"
eval set -- "$P_REMAIN_ARGS"
@@ -1181,15 +1197,17 @@
help_documentfiles
help_help
help_html5
- help_jsp
+ help_jsp
help_name
help_pagefiles
+ help_param
help_rootid
help_set-date
- help_single
+ help_single
help_statdir
+ help_stringparam
help_xsltparam "creates the .html files from the profiled sources"
- echo
+ echo
exit 0
fi
@@ -1202,6 +1220,8 @@
[[ -n "$P_NAME" ]] && export PDFNAME="$P_NAME" BOOK="$P_NAME"
[[ -n "$P_ROOTID" ]] && export ROOTID="$P_ROOTID"
[[ -n "$P_STATIC_DIR" ]] && export STATIC_DIR="$P_STATIC_DIR"
+ [[ -n "$P_PARAMS" ]] && export PARAMS="$P_PARAMS"
+ [[ -n "$P_STRINGPARAMS" ]] && export STRINGPARAMS="$P_STRINGPARAMS"
[[ -n "$P_XSLTPARAM" ]] && export XSLTPARAM="$XSLTPARAM $P_XSLTPARAM"
# We always want to start with a clean HTML result directory for
@@ -1318,7 +1338,7 @@
if [[ -f ${P_NOTRANS_DIR}/$DC ]]; then
cp "${P_NOTRANS_DIR}/$DC" .
else
- ccecho "warn" "File does not exist: ${P_NOTRANS_DIR}/$DC" >&2
+ ccecho "warn" "File does not exist: ${P_NOTRANS_DIR}/$DC"
fi
done
@@ -1337,7 +1357,7 @@
(cd "$DIR" && ln -sf "$(realpath --relative-to="." "${P_NOTRANS_DIR}/$DATA")")
fi
else
- ccecho "warn" "File does not exist: ${P_NOTRANS_DIR}/$DATA" >&2
+ ccecho "warn" "File does not exist: ${P_NOTRANS_DIR}/$DATA"
fi
done
@@ -1349,7 +1369,7 @@
if [[ -f ${P_NOTRANS_DIR}/xml/$ENT ]]; then
(cd xml && ln -sf "$(realpath --relative-to="." "${P_NOTRANS_DIR}/xml/$ENT")")
else
- ccecho "warn" "Cannot find entity file: ${P_NOTRANS_DIR}/xml/$ENT" >&2
+ ccecho "warn" "Cannot find entity file: ${P_NOTRANS_DIR}/xml/$ENT"
fi
done
@@ -1389,7 +1409,7 @@
help_remarks
help_rootid
echo
- exit 0
+ exit 0
fi
[[ 1 = "$P_DRAFT" ]] && DRAFT="yes"
@@ -1427,7 +1447,7 @@
help_scmd_head "$SUB_CMD" "$HELP_SUBCMD"
help_remarks
echo
- exit 0
+ exit 0
fi
[[ 1 = "$P_REMARKS" ]] && REMARKS=1
@@ -1510,17 +1530,17 @@
#------ Computing the values returned from the parser -----
if [[ 1 = "$P_HELP" ]]; then
help_scmd_head "$SUB_CMD" "$HELP_SUBCMD"
- [[ "pdf-name" = "$SUB_CMD" ]] && help_cropmarks
+ [[ "pdf-name" = "$SUB_CMD" ]] && help_cropmarks
help_draft
- [[ "pdf-name" = "$SUB_CMD" ]] && help_formatter
- [[ "pdf-name" = "$SUB_CMD" ]] && help_grayscale_pdf
+ [[ "pdf-name" = "$SUB_CMD" ]] && help_formatter
+ [[ "pdf-name" = "$SUB_CMD" ]] && help_grayscale_pdf
help_help
- [[ "jsp-dir-name" = "$SUB_CMD" ]] && help_jsp
- help_meta
+ [[ "jsp-dir-name" = "$SUB_CMD" ]] && help_jsp
+ help_meta
help_name
help_remarks
help_rootid
- [[ "html-dir-name" = "$SUB_CMD" ]] && help_single
+ [[ "html-dir-name" = "$SUB_CMD" ]] && help_single
echo
exit 0
fi
@@ -1704,7 +1724,7 @@
# get the image list
# we can use projectgraphics, since it returns images for a given rootid
- IMGLIST=( $(call_make list-srcfiles LIST_NODC=1 LIST_NOENT=1 LIST_NOXML=1) )
+ IMGLIST=( $(call_make list-srcfiles silent LIST_NODC=1 LIST_NOENT=1 LIST_NOXML=1) )
if [[ 0 != $? ]]; then
exit_on_error "Failed to get list of images"
fi
@@ -1789,7 +1809,7 @@
[[ -n "$P_ROOTID" ]] && export ROOTID="$P_ROOTID"
if [[ -z "${FILELIST[0]}" ]]; then ## --file was not specified
- FILELIST=( $(call_make list-srcfiles LIST_NODC=1 LIST_NOENT=1 LIST_NOIMG=1 ) )
+ FILELIST=( $(call_make list-srcfiles silent LIST_NODC=1 LIST_NOENT=1 LIST_NOIMG=1 ) )
if [[ 0 != $? ]]; then
exit_on_error "Failed to get filelist for ROOTID \"$ROOTID\""
fi
@@ -1800,7 +1820,7 @@
if [[ -n "$P_LANG" ]]; then
ASPELL_LANG="$P_LANG"
else
- if [[ -z "ASPELL_LANG" ]]; then
+ if [[ -z "$ASPELL_LANG" ]]; then
ASPELL_LANG=$($XSLTPROC --stylesheet "${DAPSROOT}/daps-xslt/common/get-language.xsl" --file "$MAIN" "$XSLTPROCESSOR" 2>/dev/null)
if [[ -n "$ASPELL_LANG" ]]; then
ccecho "info" "Using language $ASPELL_LANG."
@@ -1958,8 +1978,8 @@
help_gen
help_grayscale_images
help_help
- help_online
- help_rootid
+ help_online
+ help_rootid
echo
exit 0
fi
@@ -2460,7 +2480,7 @@
cat <=1.1
+#
# Get the first 2 digits from the version number
# 1.0 -> 10, 1.0.1 -> 10
+#
+# Other fop command-line options can be set with FOP_OPTIONS in the
+# daps config
FOP_VERSION=$(fop -version 2>/dev/null | cut -d " " -f 3 | tr -d ".")
FOP_VERSION=${FOP_VERSION:0:2}
-# set the nocs parameter for FOP >= 1.1
-# (other command line options are defined in the DAPS config file
-# as FOP_OPTIONS)
-[[ $FOP_VERSION -ge 11 ]] && OPTS="-nocs"
+[[ $FOP_VERSION -ge 11 ]] && FOP_DEFAULT_CMD_OPTIONS="$FOP_DEFAULT_CMD_OPTIONS -nocs"
+#FOP_CONFIG_FILE=${FOP_CONFIG_FILE:-"/etc/daps/fop/fop-daps.xml"}
-#FOP_MEMORY=${FOP_MEMORY:-"-Xmx500m"}
+if [[ -n $FOP_CONFIG_FILE ]]; then
+ FOP_CMD_SWITCHES="$FOP_DEFAULT_CMD_OPTIONS -c $FOP_CONFIG_FILE $FOP_CMD_OPTIONS"
+else
+ FOP_CMD_SWITCHES="$FOP_DEFAULT_CMD_OPTIONS $FOP_CMD_OPTIONS"
+fi
+
+# set initial/maximum java heap size
+#
+#FOP_MEMORY=${FOP_MEMORY:-"-Xms400 -Xmx500m"}
+# set java thread stack size
+#
FOP_STACKSIZE=${FOP_STACKSIZE:-"-Xss2048K"}
-#FOP_CONFIG_FILE=${FOP_CONFIG_FILE:-"/etc/daps/fop/fop-daps.xml"}
-ADDITIONAL_FLAGS="$FOP_MEMORY $FOP_STACKSIZE" \
-ADDITIONAL_JARS="batik-all excalibur/avalon-framework-impl" \
-ADDITIONAL_OPTIONS="-Djavax.xml.transform.URIResolver=org.apache.xml.resolver.tools.CatalogResolver -Djava.util.logging.config.file=${DAPSROOT}/etc/fop/fop_logging.properties" fop $OPTS "$@"
-#fop $OPTS -c $FOP_CONFIG_FILE "$@"
+# Default JAVA/FOP setup for FOP needed by DAPS
+# ----------------------------------------------
+# do not change
+# To add additional flags/jars/options use
+#
+# FOP_FLAGS
+# FOP_JARS
+# FOP_OPTIONS
+#
+# in the config. These values will be used in addition to the default values
+# specified below
+#
+
+FOP_DEFAULT_JAVA_FLAGS="-Djavax.xml.transform.URIResolver=org.apache.xml.resolver.tools.CatalogResolver -Djava.util.logging.config.file=${DAPSROOT}/etc/fop/fop_logging.properties"
+FOP_DEFAULT_JAVA_JARS="batik-all excalibur/avalon-framework-impl"
+FOP_DEFAULT_JAVA_OPTIONS="$FOP_MEMORY $FOP_STACKSIZE"
+
+
+# Call /usr/bin/fop
+#
+ADDITIONAL_FLAGS="$FOP_DEFAULT_JAVA_FLAGS $FOP_JAVA_FLAGS" \
+ ADDITIONAL_JARS="$FOP_DEFAULT_JAVA_JARS $FOP_JAVA_JARS" \
+ ADDITIONAL_OPTIONS="$FOP_DEFAULT_JAVA_OPTIONS $FOP_JAVA_OPTIONS" \
+ fop $FOP_CMD_SWITCHES "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/libexec/daps-jing new/daps/libexec/daps-jing
--- old/daps/libexec/daps-jing 1970-01-01 01:00:00.000000000 +0100
+++ new/daps/libexec/daps-jing 2015-09-22 15:19:13.000000000 +0200
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Copyright (C) 2012-2015 SUSE Linux GmbH
+#
+# Author:
+# Frank Sundermeyer <fsundermeyer at opensuse dor org>
+# Thomas Schraitle <toms at opensuse dor org>
+#
+# Customized JING executable for DAPS
+
+
+# set initial/maximum java heap size
+#
+#JING_MEMORY=${JING_MEMORY:-"-Xms400 -Xmx500m"}
+
+# set java thread stack size
+# A minimum stack size of 3072 is needed for builds on s390 and ARM
+#
+JING_STACKSIZE=${JING_STACKSIZE:-"-Xss3072K"}
+
+#
+# Default JAVA setup for JING needed by DAPS - do not change
+# To add additional flags/jars/options use
+#
+# JING_JAVA_FLAGS
+# JING_JAVA_JARS
+# JING_JAVA_OPTIONS
+#
+# in the config. These values will be used in addition to the default values
+# specified below
+
+JING_DEFAULT_JAVA_FLAGS="-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration"
+JING_DEFAULT_JAVA_JARS="batik-all excalibur/avalon-framework-impl"
+JING_DEFAULT_JAVA_OPTIONS="$JING_MEMORY $JING_STACKSIZE"
+
+# Call /usr/bin/jing
+#
+ADDITIONAL_FLAGS="$JING_DEFAULT_JAVA_FLAGS $JING_JAVA_FLAGS" \
+ ADDITIONAL_JARS="$JING_DEFAULT_JAVA_JARS $JING_JAVA_JARS" \
+ ADDITIONAL_OPTIONS="$JING_DEFAULT_JAVA_OPTIONS $JING_JAVA_OPTIONS" \
+ jing "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/libexec/daps-xep new/daps/libexec/daps-xep
--- old/daps/libexec/daps-xep 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/libexec/daps-xep 2015-09-22 15:19:13.000000000 +0200
@@ -2,15 +2,15 @@
#
# Copyright (C) 2012-2015 SUSE Linux GmbH
#
-# Author:
+# Authors:
+# Frank Sundermeyer <fsundermeyer at opensuse dor org>
# Thomas Schraitle <toms at opensuse dot org>
#
# Customized xep executable for daps
-# Use environment variable VERBOSE to get more debugging output
#
#
-# Configuring variables
+# User config file
#
USER_XEP_CONFIG="$HOME/.config/daps/xep-config.xml"
@@ -19,4 +19,30 @@
ccecho "info" "Using XEP config file from $USER_XEP_CONFIG"
export XEP_CONFIG_FILE=${XEP_CONFIG_FILE:-"$USER_XEP_CONFIG"}
fi
-xep "$@"
+
+# Command line switches for FOP
+#------------------------------
+#
+# enable quite mode unless --debug is used
+[[ 1 -ne $DEBUG ]] && XEP_DEFAULT_CMD_OPTIONS="-q"
+
+XEP_CMD_SWITCHES="$XEP_DEFAULT_CMD_OPTIONS $XEP_CMD_OPTIONS"
+
+# set initial/maximum java heap size
+#
+#XEP_MEMORY=${XEP_MEMORY:-"-Xms400 -Xmx500m"}
+# set java thread stack size
+#
+#XEP_STACKSIZE=${XEP_STACKSIZE:-"-Xss2048K"}
+
+XEP_DEFAULT_JAVA_FLAGS=""
+XEP_DEFAULT_JAVA_JARS=""
+XEP_DEFAULT_JAVA_OPTIONS="$XEP_MEMORY $XEP_STACKSIZE"
+
+
+# Call /usr/bin/xep
+#
+ADDITIONAL_FLAGS="$XEP_DEFAULT_JAVA_FLAGS $XEP_JAVA_FLAGS" \
+ ADDITIONAL_JARS="$XEP_DEFAULT_JAVA_JARS $XEP_JAVA_JARS" \
+ ADDITIONAL_OPTIONS="$XEP_DEFAULT_JAVA_OPTIONS $XEP_JAVA_OPTIONS" \
+ xep "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/make/validate.mk new/daps/make/validate.mk
--- old/daps/make/validate.mk 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/make/validate.mk 2015-09-22 15:19:13.000000000 +0200
@@ -23,8 +23,7 @@
ifeq "$(DOCBOOK_VERSION)" "4"
xmllint --noent --postvalid --noout --xinclude $(PROFILED_MAIN)
else
- ADDITIONAL_FLAGS="$(JING_FLAGS)" jing $(JING_RNC) $(DOCBOOK5_RNG) \
- $(PROFILED_MAIN)
+ $(JING_WRAPPER) $(JING_RNC) $(DOCBOOK5_RNG) $(PROFILED_MAIN)
endif
touch $(PROFILEDIR)/.validate
# @echo "checking for unexpected characters: ... "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/man/xml/ccecho.xml new/daps/man/xml/ccecho.xml
--- old/daps/man/xml/ccecho.xml 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/man/xml/ccecho.xml 2015-09-22 15:19:13.000000000 +0200
@@ -30,7 +30,7 @@
<refnamediv>
<refname>&ccecho-command;</refname>
<refpurpose>
- ccecho (conditional color echo) let's you use colored output for STDOUT
+ ccecho (conditional color echo) lets you use colored output for STDOUT
while using regular output for log files, pipes and scripts
</refpurpose>
</refnamediv>
@@ -46,9 +46,10 @@
<refsect1 id="ccecho.description">
<title>Description</title>
<para>
- Prints a colored message string to STDOUT using bash color codes. The color
- depends on one of the LEVEL keyword. When the SHELL environment variable
- COLOR is set to either "0" or "no" no color output is generated.
+ Prints a colored message string to STDOUT or STDERR using bash color
+ codes. The color and the output channel depend on the LEVEL keyword. When
+ the SHELL environment variable COLOR is set to either "0" or "no" no color
+ output is generated.
</para>
<para>
The main purpose of this script is to provide an easy method to generate
@@ -66,11 +67,11 @@
Determines which color is used. Must be used as the first parameter. Is
ignored, when the ebvironment variable COLOR is set to "0" or "no".
</para>
- <screen>error -> bold red
-info -> purple
-normal -> no color
-result -> green
-warn -> red</screen>
+ <screen>error -> bold red, STDERR
+info -> purple, STDOUT
+normal -> no color, STDOUT
+result -> green, STDOUT
+warn -> red, STDERR</screen>
</refsect2>
<refsect2 id="ccecho.parameters.message">
<title>MESSAGE</title>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/daps/missing new/daps/missing
--- old/daps/missing 2015-08-04 11:33:56.000000000 +0200
+++ new/daps/missing 2015-09-22 15:19:13.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'autom4te' program to be rebuilt."
+ echo "the 'automa4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)