Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2015-07-21 13:27:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-08 06:59:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2015-07-21 13:27:10.000000000 +0200 @@ -1,0 +2,27 @@ +Fri Jul 10 08:38:00 UTC 2015 - [email protected] + +- Stable release DAPS 2.1.1: + +* Bugfixes: + - Fix for issue #274 (PDF Index Building Fails Because of Empty + Profiling Directory) + - fix for issue #275 (Avoid Same Target Names in Different + Makefiles) + - fix for issue #276 (PROFILE_URN Detection Depends on Position of PI + in Document) + - fix for issue #277 (Debugging Targets Fail when xml:lang is + not set) + - fix for issue #278 (Avoid Using "LANGUAGE" as a Variable Name) + - fix for issue #280 (Webhelp: Common/ Directory Contains Dead + Symbolic Links) + +* New Features: + - added support for profiling attribute "outputformat" by + intrducing PROFOUTPUTFORMAT (issue #279) + +* Miscellaneous: + - replaced Chinese font "FZSongTi" with "wqy-microhei" in the + default config file for XEP + (XEP_CONFIG_FILE=etc/xep/xep-daps.xml) + +------------------------------------------------------------------- Old: ---- daps-2.1.tar.bz2 New: ---- daps-2.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.QKQymt/_old 2015-07-21 13:27:11.000000000 +0200 +++ /var/tmp/diff_new_pack.QKQymt/_new 2015-07-21 13:27:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: daps -Version: 2.1 +Version: 2.1.1 Release: 0 ############################################################### ++++++ daps-2.1.tar.bz2 -> daps-2.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/ChangeLog new/daps/ChangeLog --- old/daps/ChangeLog 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/ChangeLog 2015-07-10 10:18:13.000000000 +0200 @@ -1,5 +1,32 @@ ------------------------------------------------------------------- -Fri Jul 02 14:38:11 UTC 2015 - [email protected] +Fri Jul 10 07:47:38 UTC 2015 - [email protected] + +Stable release DAPS 2.1.1: + +* Bugfixes: + - Fix for issue #274 (PDF Index Building Fails Because of Empty + Profiling Directory) + - fix for issue #275 (Avoid Same Target Names in Different + Makefiles) + - fix for issue #276 (PROFILE_URN Detection Depends on Position of PI + in Document) + - fix for issue #277 (Debugging Targets Fail when xml:lang is + not set) + - fix for issue #278 (Avoid Using "LANGUAGE" as a Variable Name) + - fix for issue #280 (Webhelp: Common/ Directory Contains Dead + Symbolic Links) + +* New Features: + - added support for profiling attribute "outputformat" by + intrducing PROFOUTPUTFORMAT (issue #279) + +* Miscellaneous: + - replaced Chinese font "FZSongTi" with "wqy-microhei" in the + default config file for XEP + (XEP_CONFIG_FILE=etc/xep/xep-daps.xml) + +------------------------------------------------------------------- +Thu Jul 02 14:38:11 UTC 2015 - [email protected] Stable release DAPS 2.1: - added support for webhelp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/INSTALL.adoc new/daps/INSTALL.adoc --- old/daps/INSTALL.adoc 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/INSTALL.adoc 2015-07-10 10:18:13.000000000 +0200 @@ -115,7 +115,7 @@ === Installation -1. Download the https://github.com/openSUSE/daps/archive/2.1.tar.gz[DAPS 2.1] +1. Download the https://github.com/openSUSE/daps/archive/2.1.1.tar.gz[DAPS 2.1.1] 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' old/daps/README.adoc new/daps/README.adoc --- old/daps/README.adoc 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/README.adoc 2015-07-10 10:18:13.000000000 +0200 @@ -20,8 +20,8 @@ also been successfully tested on Debian, Fedora, and Ubuntu. See https://github.com/openSUSE/daps/blob/master/INSTALL.adoc for installation instructions. -The latest version, https://github.com/openSUSE/daps/archive/2.1.tar.gz[DAPS -2.1], was released on 2015-07-02. +The latest version, https://github.com/openSUSE/daps/archive/2.1.1.tar.gz[DAPS +2.1.1], was released on 2015-07-10. Contributing ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/bin/daps.in new/daps/bin/daps.in --- old/daps/bin/daps.in 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/bin/daps.in 2015-07-10 10:18:13.000000000 +0200 @@ -116,6 +116,7 @@ PROFILE_URN PROFLANG PROFOS + PROFOUTPUTFORMAT PROFREVISION PROFREVISIONFLAG PROFROLE @@ -181,7 +182,7 @@ ) unset "${UNSETLIST[@]}" -# PATHLIST contains all variables holding a path. Relative paths need to be +# PATHLIST contains all variables holding a path. Relative paths need to be # made absolute and we need this list in order to know which variables hold # path information # @@ -214,7 +215,7 @@ # default config file DEFAULT_CONFIG="@sysconfdir@/daps/config" -# The default DAPSROOT +# The default DAPSROOT DAPSROOT_DEFAULT="@pkgdatadir@" # default libdir @@ -240,7 +241,7 @@ # Fake Associative Array (for bash 3 compatibility) # Key = subcommand # Value = function call (from lib/daps_functions) -# +# # use VALUE=$(arrayGet "ARRAYNAME" "KEY") to get the value # arrayGet returns 1 if KEY was not found # @@ -635,7 +636,7 @@ --commands Show a list of available DAPS sub commands --debug Print debugging messages. Alternatively see the --verbose options for an output that is better - readable. + readable. --docconfig=DC-file, -d DC-file Path to doc config file to use. Mandatory unless there is only a single DC-file in the current @@ -677,7 +678,7 @@ the XML files. Currently supported are \"xsltproc\" and \"saxon\" (version 6). Default: xsltproc - + Subcommands: help Print this help @@ -686,7 +687,7 @@ html HTML book (chunked or single file HTML, jsp) man man pages mobi Amazon Kindle eBook - pdf PDF book (color, grayscale, printable) + pdf PDF book (color, grayscale, printable) text ASCII book webhelp HTML book with collapsable TOC and search @@ -832,7 +833,7 @@ # $3 = additional base dir for $1 (optional) # # sets absolute path without trailing / for $1, links are being followed - # also tests if paths are valid + # also tests if paths are valid # # in case of a non-existing path, returns 2 if variablename matches # _WRAPPER, else returns 1 @@ -855,7 +856,7 @@ MYPATH=${MYPATH%/} # remove trailing slash if [[ $MYPATH =~ ^~.* ]]; then - # 2. Replace ~/ with $HOME + # 2. Replace ~/ with $HOME if [[ $MYPATH =~ ^~/.* ]]; then MYPATH=${MYPATH/#\~\//$HOME/} else @@ -1016,7 +1017,7 @@ export POSIXLY_CORRECT=1 -# So, the first getopt go will parse all parameters listed directly after the +# So, the first getopt go will parse all parameters listed directly after the # daps command, leaving an array ($@) with the subcommand and it's # parameters, which can be parsed in a second getopt go. @@ -1026,7 +1027,7 @@ # If variables such as $BUILD_DIR, $DOCCONF, and $DAPSROOT are set via command # line switch, we do not want to overwrite them by any other file we source # at a later stage (command line always wins). -# Declaring the variables as readonly is unfortunately not an option, since +# Declaring the variables as readonly is unfortunately not an option, since # every attempt to (un)set a read-only variable throws an error - something # we do not want when sourcing a config-file. # Therefore we need to save each variable twice in order to recover the @@ -1240,7 +1241,7 @@ # The environment is set up using the following hierachy # (1 == always wins) # -# 1. Command line +# 1. Command line # - either as a real option # - or as variable declaration (FOO=bar) --> debugging and developing # 2. DC-file @@ -1251,7 +1252,7 @@ # DAPSROOT, allowing to have multiple daps versions installed into # different directories. You can switch between them by setting DAPSROOT # accordingly. Either by command line switch --dtdroot or in your user -# config file (DAPSROOT="<path>") +# config file (DAPSROOT="<path>") # # Since commandline values take precedence we need to recover them every # time we source a file @@ -1262,7 +1263,7 @@ ############# INTERLUDE: Copy/Move USER_CONFIG_OLD ##################### # -# Move/copy an old DAPS config directory to ~/.config if not already existing +# Move/copy an old DAPS config directory to ~/.config if not already existing # MOVE_CONFIG="" if [[ -f $USER_CONFIG_OLD && ! -f $USER_CONFIG ]]; then @@ -1550,7 +1551,7 @@ DOCBOOK_VERSION=$($XSLTPROC --stylesheet "${DAPSROOT}/daps-xslt/common/get-docbook-version.xsl" --file "$MAIN" "$XSLTPROCESSOR") || exit_on_error "Could not get DocBook version. Seems $MAIN is either not well-formed." # || { DOCBOOK_VERSION=4; \ -# "Could not get DocBook version, assuming DocBook 4"; } +# "Could not get DocBook version, assuming DocBook 4"; } # ... now resolve the style URI via catalogs if [[ 5 = "$DOCBOOK_VERSION" ]]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/configure new/daps/configure --- old/daps/configure 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/configure 2015-07-10 10:18:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for DAPS 2.1.0. +# Generated by GNU Autoconf 2.69 for DAPS 2.1.1. # # Report bugs to <https://github.com/openSUSE/daps>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='DAPS' PACKAGE_TARNAME='daps' -PACKAGE_VERSION='2.1.0' -PACKAGE_STRING='DAPS 2.1.0' +PACKAGE_VERSION='2.1.1' +PACKAGE_STRING='DAPS 2.1.1' PACKAGE_BUGREPORT='https://github.com/openSUSE/daps' PACKAGE_URL='http://opensuse.github.io/daps' @@ -1264,7 +1264,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures DAPS 2.1.0 to adapt to many kinds of systems. +\`configure' configures DAPS 2.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1330,7 +1330,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of DAPS 2.1.0:";; + short | recursive ) echo "Configuration of DAPS 2.1.1:";; esac cat <<\_ACEOF @@ -1419,7 +1419,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -DAPS configure 2.1.0 +DAPS configure 2.1.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1436,7 +1436,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by DAPS $as_me 2.1.0, which was +It was created by DAPS $as_me 2.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1788,8 +1788,8 @@ DAPS_VERSION_MAJOR=2 DAPS_VERSION_MINOR=1 -DAPS_VERSION_MICRO=0 -DAPS_VERSION=2.1.0 +DAPS_VERSION_MICRO=1 +DAPS_VERSION=2.1.1 DAPS_API_VERSION=2 @@ -2349,7 +2349,7 @@ # Define the identity of the package. PACKAGE='daps' - VERSION='2.1.0' + VERSION='2.1.1' cat >>confdefs.h <<_ACEOF @@ -4537,7 +4537,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by DAPS $as_me 2.1.0, which was +This file was extended by DAPS $as_me 2.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4591,7 +4591,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -DAPS config.status 2.1.0 +DAPS config.status 2.1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -5746,7 +5746,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by DAPS $as_me 2.1.0, which was +This file was extended by DAPS $as_me 2.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5800,7 +5800,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -DAPS config.status 2.1.0 +DAPS config.status 2.1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/configure.ac new/daps/configure.ac --- old/daps/configure.ac 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/configure.ac 2015-07-10 10:18:13.000000000 +0200 @@ -11,7 +11,7 @@ m4_define(daps_version_major, 2) m4_define(daps_version_minor, 1) -m4_define(daps_version_micro, [0]) +m4_define(daps_version_micro, [1]) # API version m4_define([daps_api_version],[daps_version_major]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/daps-xslt/common/get-xml-stylesheet.xsl new/daps/daps-xslt/common/get-xml-stylesheet.xsl --- old/daps/daps-xslt/common/get-xml-stylesheet.xsl 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/daps-xslt/common/get-xml-stylesheet.xsl 2015-07-10 10:18:13.000000000 +0200 @@ -20,8 +20,7 @@ --> -<xsl:stylesheet - version="1.0" +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/lib/lib.xsl"/> @@ -34,7 +33,7 @@ <xsl:template match="/"> <xsl:variable name="pi"> - <xsl:apply-templates/> + <xsl:apply-templates select="processing-instruction('xml-stylesheet')"/> </xsl:variable> <xsl:choose> @@ -47,7 +46,6 @@ </xsl:choose> </xsl:template> - <xsl:template match="/processing-instruction('xml-stylesheet')[1]"> <!--<xsl:message> PI: xml-stylesheet <xsl:value-of select="."/> </xsl:message>--> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/etc/config.in new/daps/etc/config.in --- old/daps/etc/config.in 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/etc/config.in 2015-07-10 10:18:13.000000000 +0200 @@ -517,6 +517,16 @@ # PROFOS="" +## Key: PROFOUTPUTFORMAT +## ------------------- +## Description: Profiling values for the attribute outputformat="" +## Type: String +## Default: "" +# +# This value is usually set in a book specific DC-file. +# +PROFOUTPUTFORMAT="" + ## Key: PROFVENDOR ## ----------------------- ## Description: Profiling values for the attribute vendor="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/etc/xep/xep-daps.xml new/daps/etc/xep/xep-daps.xml --- old/daps/etc/xep/xep-daps.xml 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/etc/xep/xep-daps.xml 2015-07-10 10:18:13.000000000 +0200 @@ -251,36 +251,36 @@ <!-- --> <font-group label="ChineseFonts" embed="true" subset="true"> <font-family name="Chinese"> - <!-- <font><font-data ttf="bkai00mp.ttf"/></font> --> <font> - <font-data ttf="FZSongTi.ttf"/> + <font-data ttc="wqy-microhei.ttc" subfont="1"/> </font> <font style="italic"> - <font-data ttf="FZSongTi.ttf"/> - <transform slant-angle="12"/> + <font-data ttc="wqy-microhei.ttc" subfont="1"/> + <transform slant-angle="12"/> </font> <font weight="bold"> - <font-data ttf="FZHeiTi.ttf"/> + <!--<font-data ttf="FZHeiTi.ttf"/>--> + <font-data ttc="wqy-microhei.ttc" subfont="1"/> </font> <font style="italic" weight="bold"> - <font-data ttf="FZHeiTi.ttf"/> + <font-data ttc="wqy-microhei.ttc" subfont="1"/> <transform slant-angle="12"/> </font> </font-family> <font-family name="ChineseMono"> <font> - <font-data ttf="FZFangSong.ttf"/> + <font-data ttc="wqy-microhei.ttc" subfont="2"/> </font> <font style="italic"> - <font-data ttf="FZFangSong.ttf"/> + <font-data ttc="wqy-microhei.ttc" subfont="2"/> <transform slant-angle="12"/> </font> <font weight="bold"> - <font-data ttf="FZFangSong.ttf"/> + <font-data ttc="wqy-microhei.ttc" subfont="2"/> <transform slant-angle="12"/> </font> <font weight="bold" style="italic"> - <font-data ttf="FZFangSong.ttf"/> + <font-data ttc="wqy-microhei.ttc" subfont="2"/> <transform slant-angle="12"/> </font> </font-family> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/common_variables.mk new/daps/make/common_variables.mk --- old/daps/make/common_variables.mk 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/make/common_variables.mk 2015-07-10 10:18:13.000000000 +0200 @@ -157,6 +157,10 @@ PROFILEDIR := $(PROFILEDIR)_$(PROFOS) PROFSTRINGS += --stringparam "profile.os=$(PROFOS)" endif + ifdef PROFOUTPUTFORMAT + PROFILEDIR := $(PROFILEDIR)_$(PROFOUTPUTFORMAT) + PROFSTRINGS += --stringparam "profile.os=$(PROFOUTPUTFORMAT)" + endif ifdef PROFREVISION PROFILEDIR := $(PROFILEDIR)_$(PROFREVISION) PROFSTRINGS += --stringparam "profile.revision=$(PROFREVISION)" @@ -363,11 +367,11 @@ # Stylesheets do) # -LANGUAGE ?= $(shell $(XSLTPROC) --stylesheet $(STYLELANG) --file $(MAIN) $(XSLTPROCESSOR) | tr - _ ) +XMLLANG ?= $(shell $(XSLTPROC) --stylesheet $(STYLELANG) --file $(MAIN) $(XSLTPROCESSOR) | tr - _ ) -ifneq "$(strip $(LANGUAGE))" "" - LL ?= $(shell tr '[:upper:]' '[:lower:]' <<< $(LANGUAGE)) - LANGSTRING := _$(LANGUAGE) +ifneq "$(strip $(XMLLANG))" "" + LL ?= $(shell tr '[:upper:]' '[:lower:]' <<< $(XMLLANG)) + LANGSTRING := _$(XMLLANG) endif #----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/html.mk new/daps/make/html.mk --- old/daps/make/html.mk 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/make/html.mk 2015-07-10 10:18:13.000000000 +0200 @@ -186,9 +186,9 @@ endif html: list-images-multisrc list-images-missing ifdef ONLINE_IMAGES - html: $(ONLINE_IMAGES) copy_inline_images + html: $(ONLINE_IMAGES) copy_inline_images_html endif -html: copy_static_images +html: copy_static_images_html html: $(HTML_RESULT) ifeq "$(TARGET)" "html" @ccecho "result" "$(RESULT_NAME) book built with REMARKS=$(REMARKS), DRAFT=$(DRAFT) and META=$(META):\n$(HTML_DIR)/" @@ -210,13 +210,13 @@ # static target needs to be PHONY, since I do not know which files need to # be copied/linked, we just copy/link the whole directory # -.PHONY: copy_static_images +.PHONY: copy_static_images_html ifneq "$(IS_STATIC)" "static" - copy_static_images: | $(HTML_DIR)/static + copy_static_images_html: | $(HTML_DIR)/static ifdef HTML_CSS - copy_static_images: | $(HTML_DIR)/static/css + copy_static_images_html: | $(HTML_DIR)/static/css endif - copy_static_images: $(STYLEIMG) + copy_static_images_html: $(STYLEIMG) ifeq "$(STATIC_HTML)" "0" $(HTML_GRAPH_COMMAND) $(STYLEIMG) $(HTML_DIR)/static else @@ -224,11 +224,11 @@ (cd $(HTML_DIR)/static; tar xpv) >/dev/null endif else - copy_static_images: | $(HTML_DIR)/static + copy_static_images_html: | $(HTML_DIR)/static ifdef HTML_CSS - copy_static_images: | $(HTML_DIR)/static/css + copy_static_images_html: | $(HTML_DIR)/static/css endif - copy_static_images: $(STYLEIMG) + copy_static_images_html: $(STYLEIMG) ifeq "$(STATIC_HTML)" "0" $(HTML_GRAPH_COMMAND) $</* $(HTML_DIR)/static else @@ -249,9 +249,9 @@ # Thus we also need the ugly for loop instead of creating images by # $(HTML_DIR)/images/% rule # -.PHONY: copy_inline_images -copy_inline_images: | $(HTML_DIR)/images -copy_inline_images: $(ONLINE_IMAGES) +.PHONY: copy_inline_images_html +copy_inline_images_html: | $(HTML_DIR)/images +copy_inline_images_html: $(ONLINE_IMAGES) for IMG in $(ONLINE_IMAGES); do $(HTML_GRAPH_COMMAND) $$IMG $(HTML_DIR)/images; done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/pdf.mk new/daps/make/pdf.mk --- old/daps/make/pdf.mk 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/make/pdf.mk 2015-07-10 10:18:13.000000000 +0200 @@ -170,7 +170,7 @@ #-------------- # Generate Index # -$(PROFILEDIR)/$(DOCNAME).ind: +$(PROFILEDIR)/$(DOCNAME).ind: $(PROFILES) ifeq "$(VERBOSITY)" "2" @ccecho "info" " Creating Index..." endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/text.mk new/daps/make/text.mk --- old/daps/make/text.mk 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/make/text.mk 2015-07-10 10:18:13.000000000 +0200 @@ -33,7 +33,7 @@ ifeq "$(VERBOSITY)" "2" @ccecho "info" " Creating ASCII file" endif - LANG=$(LANGUAGE) w3m -dump $< > $@ + LANG=$(XMLLANG) w3m -dump $< > $@ # The text file is generated via w3m from a single HTML file. We do not need # to create images, css files and stuff, therefore we create a temporary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/webhelp.mk new/daps/make/webhelp.mk --- old/daps/make/webhelp.mk 2015-07-02 17:46:15.000000000 +0200 +++ new/daps/make/webhelp.mk 2015-07-10 10:18:13.000000000 +0200 @@ -18,11 +18,12 @@ # if no language is set in the XML file, we need to exit, because the # indexer would not work # -ifndef LL - $(error "The language needs to be set via xml:lang attribute in\n$(MAIN)\notherwise the indexer will not work correctly") +ifeq "$(MAKECMDGOALS)" "webhelp" + ifndef LL + $(error "The language needs to be set via xml:lang attribute in\n$(MAIN)\notherwise the indexer will not work correctly") + endif endif - #---------- # webhelp is special, because it also needs the extensions from # STYLEROOT/extensions and other resources @@ -196,9 +197,9 @@ endif webhelp: list-images-multisrc list-images-missing ifdef ONLINE_IMAGES - webhelp: $(ONLINE_IMAGES) copy_inline_images + webhelp: $(ONLINE_IMAGES) copy_inline_images_wh endif -webhelp: copy_static_images +webhelp: copy_static_images_wh webhelp: $(WEBHELP_RESULT) ifeq "$(TARGET)" "webhelp" @ccecho "result" "Webhelp book built with REMARKS=$(REMARKS), DRAFT=$(DRAFT):\n$(WEBHELP_DIR)/" @@ -218,13 +219,13 @@ # static target needs to be PHONY, since I do not know which files need to # be copied/linked, we just copy/link the whole directory # -.PHONY: copy_static_images +.PHONY: copy_static_images_wh ifneq "$(IS_STATIC)" "static" - copy_static_images: | $(WEBHELP_DIR)/static + copy_static_images_wh: | $(WEBHELP_DIR)/static ifdef HTML_CSS - copy_static_images: | $(WEBHELP_DIR)/static/css + copy_static_images_wh: | $(WEBHELP_DIR)/static/css endif - copy_static_images: $(STYLEIMG) + copy_static_images_wh: $(STYLEIMG) ifeq "$(STATIC_HTML)" "0" $(HTML_GRAPH_COMMAND) $(STYLEIMG) $(WEBHELP_DIR)/static else @@ -232,11 +233,11 @@ (cd $(WEBHELP_DIR)/static; tar xpv) >/dev/null endif else - copy_static_images: | $(WEBHELP_DIR)/static + copy_static_images_wh: | $(WEBHELP_DIR)/static ifdef HTML_CSS - copy_static_images: | $(WEBHELP_DIR)/static/css + copy_static_images_wh: | $(WEBHELP_DIR)/static/css endif - copy_static_images: $(STYLEIMG) + copy_static_images_wh: $(STYLEIMG) ifeq "$(STATIC_HTML)" "0" $(HTML_GRAPH_COMMAND) $</* $(WEBHELP_DIR)/static else @@ -257,9 +258,9 @@ # Thus we also need the ugly for loop instead of creating images by # $(WEBHELP_DIR)/images/% rule # -.PHONY: copy_inline_images -copy_inline_images: | $(WEBHELP_DIR)/images -copy_inline_images: $(ONLINE_IMAGES) +.PHONY: copy_inline_images_wh +copy_inline_images_wh: | $(WEBHELP_DIR)/images +copy_inline_images_wh: $(ONLINE_IMAGES) for IMG in $(ONLINE_IMAGES); do $(HTML_GRAPH_COMMAND) $$IMG $(WEBHELP_DIR)/images; done @@ -268,8 +269,8 @@ # copy_common: | $(WEBHELP_DIR) $(WEBHELP_DIR)/search copy_common: - cp -r $(WH_COMMON_DIR) $(WEBHELP_DIR) - cp -r $(WH_SEARCH_DIR)/* $(WEBHELP_DIR)/search + $(HTML_GRAPH_COMMAND) $(WH_COMMON_DIR) $(WEBHELP_DIR) + $(HTML_GRAPH_COMMAND) $(WH_SEARCH_DIR)/* $(WEBHELP_DIR)/search #--------------- # Generate WEBHELP from profiled xml
