Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2014-05-02 13:55:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-18 14:13:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2014-05-02 13:55:10.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Apr 23 15:31:09 UTC 2014 - [email protected] + +New release DAPS 2.0~beta5: + +- fully supporting the suse-doc-style-checker (target stylecheck) +- fix for "online-docs": only tar'ing png and jpg if respective + images are available +- fix for ticket #225 (Misleading error message when xml files do + not reside in a directory named xml/) +- fix for ticket #218 (Improve error handling for --rootid + parameter) +- added tests for targets "package-html and "package-pdf" +- resulting filenames for package-html and package-pdf can now + be queried via "showvariable" + +------------------------------------------------------------------- Old: ---- daps-2.0~beta4.tar.bz2 New: ---- daps-2.0~beta5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.kNHvzg/_old 2014-05-02 13:55:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kNHvzg/_new 2014-05-02 13:55:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: daps -Version: 2.0~beta4 +Version: 2.0~beta5 Release: 0 ############################################################### @@ -134,6 +134,7 @@ Recommends: checkbot %endif Recommends: remake +Recommends: suse-doc-style-checker # Internal XEP package: Recommends: xep Recommends: xmlformat ++++++ daps-2.0~beta4.tar.bz2 -> daps-2.0~beta5.tar.bz2 ++++++ ++++ 2394 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/bin/daps.in new/daps/bin/daps.in --- old/daps/bin/daps.in 2014-01-14 13:56:19.000000000 +0100 +++ new/daps/bin/daps.in 2014-04-24 14:43:23.000000000 +0200 @@ -1,11 +1,11 @@ -#!/bin/bash +#!/bin/bash # -# Copyright (C) 2011,2012 Frank Sundermeyer <[email protected]> +# Copyright (C) 2011-2014 Frank Sundermeyer <[email protected]> # # Author: # Frank Sundermeyer <[email protected]> # -# daps = DocBook Authoring and Publishing Suite +# DAPS = DocBook Authoring and Publishing Suite VERSION=@PACKAGE_VERSION@ @@ -342,7 +342,7 @@ HELP_SUBCOMMAND+=("package-pdf-dir-name=Print the directory name that would result when building\na pdf package.") SUBCOMMANDS+=("package-src=package-src") -HELP_SUBCOMMAND+=("package-src=Creates a distributable source archive containg the profiled sources of the complete set\nincluding the original source images.") +HELP_SUBCOMMAND+=("package-src=creates a distributable source archive containg the profiled sources of the complete set\nincluding the original source images.") SUBCOMMANDS+=("package-src-name=show_names") HELP_SUBCOMMAND+=("package-src-name=Print the file name that would result when building a distributable source\narchive.") @@ -505,7 +505,7 @@ HELP_SUBCOMMAND+=("jsp=This command is deprecated, use \"html --jsp\" instead.") SUBCOMMANDS+=("jsp-dir-name=deprecated") -HELP_SUBCOMMAND+=("jsp-dir-name=This command is deprecated, use \"html --jsp\" instead.") +HELP_SUBCOMMAND+=("jsp-dir-name=This command is deprecated, use \"html-dir-name --jsp\" instead.") SUBCOMMANDS+=("link-entity-dist=deprecated") HELP_SUBCOMMAND+=("link-entity-dist=This command is no longer supported.") @@ -933,6 +933,7 @@ DOC_DIR=$(dirname "$MAIN_CMDL") DOC_DIR=${DOC_DIR%/xml*} #remove xml directory fi + [[ -e ${DOC_DIR}/xml/$(basename $MAIN_CMDL) ]] || exit_on_error "XML files must reside in an \"xml/\" directory. \"$MAIN_CMDL\" is not a valid location." else if [[ -e "xml/$MAINFILE" ]]; then # MAIN is not a valid file, but ./xml/$MAIN exists @@ -945,13 +946,8 @@ fi else if [[ -n "$DOC_DIR" ]]; then - if [[ -e "${DOC_DIR}/xml/$MAINFILE" ]]; then - MAIN_CMDL="${DOC_DIR}/xml/$MAINFILE" - elif [[ -e "${DOC_DIR}/$MAINFILE" ]]; then - MAIN_CMDL="${DOC_DIR}/$MAINFILE" - else - exit_on_error "Fatal error: ${DOC_DIR}/xml/$MAINFILE does not exist." - fi + MAIN_CMDL="${DOC_DIR}/xml/$(basename $MAINFILE)" + [[ -e $MAIN_CMDL ]] || exit_on_error "XML files must reside in an \"xml/\" directory. \"$MAIN_CMDL\" is not a valid location." else exit_on_error "Fatal error: ${PWD}/$MAINFILE does not exist." 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/configure.ac new/daps/configure.ac --- old/daps/configure.ac 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/configure.ac 2014-04-23 15:07:42.000000000 +0200 @@ -19,7 +19,7 @@ m4_define(daps_version_micro, 9dev) AC_PREREQ([2.68]) -AC_INIT([DAPS], [2.0~beta4], [https://sourceforge.net/p/daps/tickets/], [daps], [http://daps.sf.net]) +AC_INIT([DAPS], [2.0~beta5], [https://sourceforge.net/p/daps/tickets/], [daps], [http://daps.sf.net]) AC_CONFIG_MACRO_DIR([m4]) AC_MSG_NOTICE([ 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 2013-12-19 15:42:06.000000000 +0100 +++ new/daps/lib/daps_functions 2014-04-23 15:07:42.000000000 +0200 @@ -1621,7 +1621,7 @@ shift SHORT_OPTS="h" - LONG_OPTS="help,name:,rootid:,show" + LONG_OPTS="file:,help,name:,rootid:,show" parse_args $SHORT_OPTS $LONG_OPTS $SUB_CMD "$@" eval set -- "$P_REMAIN_ARGS" @@ -1629,18 +1629,35 @@ #------ Computing the values returned from the parser ----- if [[ 1 = $P_HELP ]]; then help_scmd_head "$SUB_CMD" "$HELP_SUBCMD" + help_file help_help help_name help_rootid help_show_check - echo + echo -e " NOTES: * Options --file (-f) and --rootid exclude one another.\n * If neither file nor rootid is specified, the rootid\n from the DC-file is used\n * $SUB_CMD follows xi:includes\n" exit 0 fi + if [[ -z "$P_ROOTID" && -z "$P_FILE" ]]; then + if [[ 0 != $VERBOSITY ]]; then + ccecho "info" "Neither file nor rootid specified, using rootid from DC-file" + fi + elif [[ -n "$P_ROOTID" && -n "$P_FILE" ]]; then + exit_on_error "Options --file (-f) and --rootid exclude one another.\nPlease specify only one of these options" + fi + [[ -n "$P_NAME" ]] && export PDFNAME="$P_NAME" BOOK="$P_NAME" [[ -n "$P_ROOTID" ]] && export ROOTID="$P_ROOTID" [[ -n "$P_SHOW" ]] && export SHOW=1 + if [[ -n "$P_FILE" ]]; then + if [[ -f $P_FILE ]]; then + export ROOTID=$($XSLTPROC --stylesheet $DAPSROOT/daps-xslt/common/get-rootelement-id.xsl --file $P_FILE $XSLTPROCESSOR) || exit_on_error "Cannot get a rootid from file $FILE" + else + exit_on_error "File $P_FILE does not exist" + fi + fi + call_make "$SUB_CMD" "$@" } 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/clean.mk new/daps/make/clean.mk --- old/daps/make/clean.mk 2013-10-21 16:08:24.000000000 +0200 +++ new/daps/make/clean.mk 2014-03-19 17:59:41.000000000 +0100 @@ -21,12 +21,12 @@ .PHONY: clean-package clean-package: rm -rf $(PACK_DIR) - @ccecho "info" "Successfully removed all generated package data for $(DOCCONF)" + @ccecho "info" "Successfully removed all generated package data for $(notdir $(DOCCONF))" .PHONY: clean-results clean-results: rm -rf $(RESULT_DIR) - @ccecho "info" "Successfully removed all generated books for $(DOCCONF)" + @ccecho "info" "Successfully removed all generated books for $(notdir $(DOCCONF))" .PHONY: clean-all real-clean clean-all real-clean: 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/common_variables.mk new/daps/make/common_variables.mk --- old/daps/make/common_variables.mk 2014-03-13 23:16:21.000000000 +0100 +++ new/daps/make/common_variables.mk 2014-03-31 16:39:55.000000000 +0200 @@ -336,4 +336,8 @@ HTML_GRAPH_COMMAND := cp -rs --remove-destination endif - +#----- +# Valid ROOT Elements +# A --rootid must belong to one of the following elements: +# +VALID_ROOTELEMENTS := appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex 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/filenames.mk new/daps/make/filenames.mk --- old/daps/make/filenames.mk 2013-12-17 15:51:29.000000000 +0100 +++ new/daps/make/filenames.mk 2014-03-19 17:58:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2012 SUSE Linux Products GmbH +# Copyright (C) 2012-2014 SUSE Linux Products GmbH # # Author: Frank Sundermeyer # @@ -51,14 +51,25 @@ #--------------- # Package-pdf, Package-html # -ifeq ($(TARGET),$(filter $(TARGET),package-pdf package-pdf-dir-name)) +ifeq ($(TARGET),$(filter $(TARGET),package-pdf package-pdf-dir-name showvariable)) PACKAGE_PDF_DIR := $(PACK_DIR)/pdf + PACKAGE_PDF_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).pdf DESKTOPFILES_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING)-desktop.tar.bz2 DOCUMENTFILES_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).document PAGEFILES_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).page endif -ifeq ($(TARGET),$(filter $(TARGET),package-html package-html-dir-name online-docs)) - PACKAGE_HTML_DIR := $(PACK_DIR)/html +ifeq ($(TARGET),$(filter $(TARGET),package-html package-html-dir-name online-docs showvariable)) + ifeq ($(JSP),1) + PACKAGE_HTML_DIR := $(PACK_DIR)/jsp + PACKAGE_HTML_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-jsp.tar.bz2 + else + PACKAGE_HTML_DIR := $(PACK_DIR)/html + ifeq ($(HTMLSINGLE),1) + PACKAGE_HTML_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-single-html.tar.bz2 + else + PACKAGE_HTML_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-html.tar.bz2 + endif + endif DESKTOPFILES_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-desktop.tar.bz2 DOCUMENTFILES_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING).document PAGEFILES_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING).page 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/misc.mk new/daps/make/misc.mk --- old/daps/make/misc.mk 2013-11-08 12:42:56.000000000 +0100 +++ new/daps/make/misc.mk 2014-04-23 15:07:42.000000000 +0200 @@ -74,13 +74,13 @@ stylecheck: $(BIGFILE) ifeq ($(SHOW),1) ifdef BROWSER - @docstylecheck.py --show $(BIGFILE) $(STYLECHECK_OUTFILE) + @sdsc --show $(BIGFILE) $(STYLECHECK_OUTFILE) else - @docstylecheck.py $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null + @sdsc $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null xdg-open $(STYLECHECK_OUTFILE) & endif else - @docstylecheck.py $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null + @sdsc $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null endif @ccecho "result" "Find the stylecheck report at:\n$(STYLECHECK_OUTFILE)" 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/packaging.mk new/daps/make/packaging.mk --- old/daps/make/packaging.mk 2013-12-17 16:48:11.000000000 +0100 +++ new/daps/make/packaging.mk 2014-04-22 13:42:29.000000000 +0200 @@ -73,8 +73,8 @@ @echo -e "$(subst $(SPACE),\n,$(sort $(MISSING)))" exit 1 else - cp $(PDF_RESULT) $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).pdf - @ccecho "result" "Find the package-pdf results at:\n$(PACKAGE_PDF_DIR)" + cp $(PDF_RESULT) $(PACKAGE_PDF_RESULT) + @ccecho "result" "Find the package-pdf results at:\n$(PACKAGE_PDF_DIR)/" endif #-------------- @@ -85,15 +85,6 @@ .PHONY: package-html package-html: | $(PACKAGE_HTML_DIR) -ifeq ($(JSP),1) - package-html: TARBALL := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-jsp.tar.bz2 -else - ifeq ($(HTMLSINGLE),1) - package-html: TARBALL := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-single-html.tar.bz2 - else - package-html: TARBALL := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-html.tar.bz2 - endif -endif ifeq ($(DESKTOPFILES),1) package-html: $(DESKTOPFILES_RESULT) endif @@ -109,9 +100,9 @@ @echo -e "$(subst $(SPACE),\n,$(sort $(MISSING)))" exit 1 else - BZIP2="--best" tar cfhj $(TARBALL) -C $(dir $(HTML_DIR)) $(notdir $(HTML_DIR:%/=%)) + BZIP2="--best" tar cfhj $(PACKAGE_HTML_RESULT) -C $(dir $(HTML_DIR)) $(notdir $(HTML_DIR:%/=%)) ifeq ($(TARGET),package-html) - @ccecho "result" "Find the package-html results at:\n$(PACKAGE_HTML_DIR)" + @ccecho "result" "Find the package-html results at:\n$(PACKAGE_HTML_DIR)/" endif endif @@ -245,12 +236,16 @@ ifeq ($(VERBOSITY),2) @ccecho "info" "Creating online-docs graphics tarball..." endif + ifneq "$(strip $(PNGONLINE))" "" tar chf $(OD_GRAPHICS_TMP) --exclude-vcs --ignore-failed-read \ --absolute-names --transform=s%$(IMG_GENDIR)/color%images/src/png% \ $(IMG_GENDIR)/color/*.png + endif + ifneq "$(strip $(JPGONLINE))" "" tar rhf $(OD_GRAPHICS_TMP) --exclude-vcs --ignore-failed-read \ --absolute-names --transform=s%$(IMG_GENDIR)/color%images/src/jpg% \ $(IMG_GENDIR)/color/*.jpg + endif bzip2 -9f $(OD_GRAPHICS_TMP) else @ccecho "info" "Selected set or book contains no graphics" 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/setfiles.mk new/daps/make/setfiles.mk --- old/daps/make/setfiles.mk 2013-06-12 16:53:21.000000000 +0200 +++ new/daps/make/setfiles.mk 2014-03-31 16:39:55.000000000 +0200 @@ -97,6 +97,14 @@ # XML source files for the currently used document (defined by the rootid) # ifdef ROOTSTRING + # check if ROOTID is a valid root element + # + ROOTELEMENT := $(shell xml sel -t -v "//div[@id='$(ROOTID)']/@remap" $(SETFILES_TMP)) + ifneq ($(ROOTELEMENT),$(filter $(ROOTELEMENT),$(VALID_ROOTELEMENTS))) + $(error Fatal error: ROOTID belongs to an unsupported root element ($(ROOTELEMENT)). Must be one of $(VALID_ROOTELEMENTS)) + endif + + DOCFILES := $(sort $(shell $(XSLTPROC) --stringparam "xml.or.img=xml" \ $(ROOTSTRING) --file $(SETFILES_TMP) \ --stylesheet $(DAPSROOT)/daps-xslt/common/extract-files-and-images.xsl $(XSLTPROCESSOR) )) 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/daps-envconvert.xml new/daps/man/xml/daps-envconvert.xml --- old/daps/man/xml/daps-envconvert.xml 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/man/xml/daps-envconvert.xml 2014-04-23 15:07:42.000000000 +0200 @@ -4,7 +4,7 @@ "http://www.docbook.org/xml/4.5/docbookx.dtd"; [ <!ENTITY daps_command "daps"> -<!ENTITY daps_version "2.0~beta4"> +<!ENTITY daps_version "2.0~beta5"> <!ENTITY daps_envconvert "daps-envconvert"> ]> <refentry lang="en" id="daps_envconvert"> 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/daps-init.xml new/daps/man/xml/daps-init.xml --- old/daps/man/xml/daps-init.xml 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/man/xml/daps-init.xml 2014-04-23 15:07:42.000000000 +0200 @@ -4,7 +4,7 @@ "http://www.docbook.org/xml/4.5/docbookx.dtd"; [ <!ENTITY daps_command "daps"> -<!ENTITY daps_version "2.0~beta4"> +<!ENTITY daps_version "2.0~beta5"> <!ENTITY daps_init "daps_init"> ]> <refentry lang="en" id="daps_init"> 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/daps.xml new/daps/man/xml/daps.xml --- old/daps/man/xml/daps.xml 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/man/xml/daps.xml 2014-04-23 15:07:42.000000000 +0200 @@ -4,7 +4,7 @@ "http://www.docbook.org/xml/4.5/docbookx.dtd"; [ <!ENTITY daps_command "daps"> - <!ENTITY daps_version "2.0~beta4"> + <!ENTITY daps_version "2.0~beta5"> ]> <refentry lang="en" id="daps"> 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 2013-12-04 16:35:10.000000000 +0100 +++ new/daps/missing 2014-04-23 15:07:42.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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/suse/xslt2005/xhtml/sections.xsl new/daps/suse/xslt2005/xhtml/sections.xsl --- old/daps/suse/xslt2005/xhtml/sections.xsl 2012-04-11 13:10:06.000000000 +0200 +++ new/daps/suse/xslt2005/xhtml/sections.xsl 2014-03-20 14:50:58.000000000 +0100 @@ -19,7 +19,7 @@ self::sect1 or self::sect2 or self::sect3 or - self::sect4]/@xml:base"/> + self::sect4][1]/@xml:base"/> <xsl:if test="$draft.mode = 'yes' and $xmlbase != ''"> <div class="filenameblock"> 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/suse/xslt2013/static/css/style.css new/daps/suse/xslt2013/static/css/style.css --- old/daps/suse/xslt2013/static/css/style.css 2014-03-13 14:16:42.000000000 +0100 +++ new/daps/suse/xslt2013/static/css/style.css 2014-04-14 11:53:11.000000000 +0200 @@ -1428,7 +1428,7 @@ line-height: 15px; overflow: hidden; padding: 0 3px; - border-bottom: 1px solid #FFF; + border-bottom: 1px solid transparent; background-color: #EEE; text-transform: uppercase; display: inline-block; @@ -1902,7 +1902,6 @@ max-width: 100%; min-height: 60px; text-align: center; - color: #999; margin: 24px 0 -9px; overflow: hidden; position: relative; @@ -1916,16 +1915,13 @@ text-align: center; color: #999; padding: 12px 10px; - background-color: #333; + background-color: #FFF; overflow: hidden; - border-top: 1px solid #202020; - border-left: 1px solid #202020; - border-right: 1px solid #202020; + border: 1px solid #EFEFF0; } .figure img { padding: 0; - background-color: #FFF; width: auto; margin: 0 auto; /* Please clean this mess out in ~2014 -- leave only the line with "calc" in there */ @@ -1934,7 +1930,7 @@ max-width: calc(100% - 2px); max-width: -moz-calc(100% - 2px); max-width: -webkit-calc(100% - 2px); - display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ + display: block; /* inline images weirdly have some whitespace below them, thus blocking */ } .figure-title { @@ -1944,21 +1940,11 @@ } div.figure .figure-title-wrap { - background-color: #202020; + background-color: #EFEFF0; width: 100%; overflow: hidden; } -div.figure .number, div.figure .permalink:hover, div.figure .permalink:focus, div.figure .permalink:active { - color: #76AD2D; - text-decoration: none; - font-weight: normal; -} - -div.figure .name, div.figure .permalink { - color: #FFF; -} - .informalfigure img { min-width: 50px; max-width: 100%; @@ -1966,7 +1952,7 @@ color: #999; margin: 17px 0 24px; padding: 1px; - border: 1px solid #202020; + border: 1px solid #EFEFF0; width: auto; } @@ -2333,6 +2319,36 @@ font-size: 22px; } +.hidden { + background-color: #E3C1C1; + position: static; + margin-top: 20px; + margin-left: -10px; + margin-right: -10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 10px; +} + +.hidden:before { + content: 'Hidden'; + display: block; + float: left; + background-color: #8C0000; + color: #FFF; + padding: 3px 5px; + margin-top: 10px; +} + +.hidden .hidden { + margin-top: 0; + padding-bottom: 0; +} + +.hidden .hidden:before { + content: none; +} + body.draft { background: url(../images/draft.png) no-repeat fixed left 50%; } 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/suse/xslt2013/static-daps/css/style.css new/daps/suse/xslt2013/static-daps/css/style.css --- old/daps/suse/xslt2013/static-daps/css/style.css 2014-03-13 14:16:42.000000000 +0100 +++ new/daps/suse/xslt2013/static-daps/css/style.css 2014-04-14 11:53:11.000000000 +0200 @@ -1901,7 +1901,6 @@ max-width: 100%; min-height: 60px; text-align: center; - color: #999; margin: 24px 0 -9px; overflow: hidden; position: relative; @@ -1915,16 +1914,13 @@ text-align: center; color: #999; padding: 12px 10px; - background-color: #333; + background-color: #FFF; overflow: hidden; - border-top: 1px solid #202020; - border-left: 1px solid #202020; - border-right: 1px solid #202020; + border: 1px solid #EFEFF0; } .figure img { padding: 0; - background-color: #FFF; width: auto; margin: 0 auto; /* Please clean this mess out in ~2014 -- leave only the line with "calc" in there */ @@ -1932,7 +1928,7 @@ max-width: calc(100% - 2px); max-width: -moz-calc(100% - 2px); max-width: -webkit-calc(100% - 2px); - display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ + display: block; /* inline images weirdly have some whitespace below them, thus blocking */ } .figure-title { @@ -1942,28 +1938,18 @@ } div.figure .figure-title-wrap { - background-color: #202020; + background-color: #EFEFF0; width: 100%; overflow: hidden; } -div.figure .number, div.figure .permalink:hover, div.figure .permalink:focus, div.figure .permalink:active { - color: #729FCF; - text-decoration: none; - font-weight: normal; -} - -div.figure .name, div.figure .permalink { - color: #FFF; -} - .informalfigure img { max-width: 100%; display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ color: #999; margin: 17px 0 24px; padding: 1px; - border: 1px solid #202020; + border: 1px solid #EFEFF0; width: auto; } @@ -2330,6 +2316,36 @@ font-size: 22px; } +.hidden { + background-color: #E3C1C1; + position: static; + margin-top: 20px; + margin-left: -10px; + margin-right: -10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 10px; +} + +.hidden:before { + content: 'Hidden'; + display: block; + float: left; + background-color: #8C0000; + color: #FFF; + padding: 3px 5px; + margin-top: 10px; +} + +.hidden .hidden { + margin-top: 0; + padding-bottom: 0; +} + +.hidden .hidden:before { + content: none; +} + body.draft { background: url(../images/draft.png) no-repeat fixed left 50%; } 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/suse/xslt2013/xhtml/html.xsl new/daps/suse/xslt2013/xhtml/html.xsl --- old/daps/suse/xslt2013/xhtml/html.xsl 2012-11-07 13:47:52.000000000 +0100 +++ new/daps/suse/xslt2013/xhtml/html.xsl 2014-03-26 19:16:38.000000000 +0100 @@ -36,4 +36,24 @@ </xsl:choose> </xsl:template> -</xsl:stylesheet> \ No newline at end of file + + <!-- Adapted to support hidden value of OS - currently this value + is only used in the SUSE Manager documentation. --> + <xsl:template name="common.html.attributes"> + <xsl:param name="inherit" select="0"/> + <xsl:param name="class"> + <xsl:value-of select="local-name(.)"/> + <xsl:text> </xsl:text> + <xsl:if test="($draft.mode = 'yes' or $draft.mode = 'maybe') + and normalize-space(@os) = 'hidden'"> + <xsl:value-of select="@os"/> + </xsl:if> + </xsl:param> + + <xsl:apply-templates select="." mode="common.html.attributes"> + <xsl:with-param name="class" select="$class"/> + <xsl:with-param name="inherit" select="$inherit"/> + </xsl:apply-templates> + </xsl:template> + +</xsl:stylesheet> 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/suse/xslt2013/xhtml/sections.xsl new/daps/suse/xslt2013/xhtml/sections.xsl --- old/daps/suse/xslt2013/xhtml/sections.xsl 2013-09-25 13:27:58.000000000 +0200 +++ new/daps/suse/xslt2013/xhtml/sections.xsl 2014-03-20 15:59:22.000000000 +0100 @@ -229,10 +229,18 @@ <xsl:call-template name="create.permalink"> <xsl:with-param name="object" select="$section"/> </xsl:call-template> + <xsl:call-template name="create.header.line"> + <xsl:with-param name="object" select="$section"/> + </xsl:call-template> </xsl:element> <xsl:call-template name="debug.filename-id"/> </xsl:template> +<!-- Hook for additional customizations --> +<xsl:template name="create.header.line"> + <xsl:param name="object" select="."/> +</xsl:template> + <xsl:template name="debug.filename-id"> <xsl:param name="node" select="."/> <xsl:variable name="xmlbase" @@ -245,7 +253,7 @@ self::sect1 or self::sect2 or self::sect3 or - self::sect4]/@xml:base"/> + self::sect4][1]/@xml:base"/> <xsl:if test="$draft.mode = 'yes' and $xmlbase != ''"> <div class="doc-status"> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
