Hello community,
here is the log from the commit of package yast2-devtools
checked in at Sat Aug 2 01:48:11 CEST 2008.
--------
--- yast2-devtools/yast2-devtools.changes 2008-07-18 11:16:07.000000000 +0200
+++ yast2-devtools/yast2-devtools.changes 2008-07-30 15:20:09.000000000 +0200
@@ -1,0 +2,26 @@
+Wed Jul 30 15:19:51 CEST 2008 - mvidner@suse.cz
+
+- Added yastdoc (http://en.opensuse.org/YaST/yastdoc).
+- Create a disambiguation chapter only if requested by a xslt
+ parameter.
+- 2.17.5
+
+-------------------------------------------------------------------
+Tue Jul 29 09:38:52 CEST 2008 - mvidner@suse.cz
+
+- Recommend libtool for svn builds of binary packages.
+- YDoxygen:
+ - Updated template Doxyfile to doxygen 1.5.5, enabled built in STL
+ support.
+ - Made it easier to troubleshoot by using a real config file instead
+ of a pipe, pointed out the log (bnc#412465).
+- Stylesheets for documentation of builtins (and WFM, Pkg):
+ - Assist a straightforward mapping between source code
+ usage and reference docs URLs: list::reduce should be
+ .../ycp/list/reduce.html, not .../YCPListBuiltins_reduce.html.
+ - Enabled processing multiple chapters at once to make overload
+ disambiguation possible.
+ - Minor Docbook validity fixes.
+- 2.17.4
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-2.17.3.tar.bz2
New:
----
yast2-devtools-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.e17471/_old 2008-08-02 01:43:27.000000000 +0200
+++ /var/tmp/diff_new_pack.e17471/_new 2008-08-02 01:43:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-devtools (Version 2.17.3)
+# spec file for package yast2-devtools (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-devtools
-Version: 2.17.3
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-devtools-2.17.3.tar.bz2
+Source0: yast2-devtools-2.17.5.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel
Requires: perl
@@ -30,6 +30,8 @@
Recommends: cmake
# /usr/lib/YaST2/bin/ydoxygen needs it
Recommends: doxygen
+# for svn builds of binary packages
+Recommends: libtool
Provides: ycpdoc ydoc
Obsoletes: ycpdoc ydoc
Provides: yast2-config-newmodule yast2-trans-newmodule
@@ -54,7 +56,7 @@
Michal Svec
%prep
-%setup -n yast2-devtools-2.17.3
+%setup -n yast2-devtools-2.17.5
%build
autoreconf --force --install
@@ -82,6 +84,7 @@
%files
%defattr(-,root,root)
%{prefix}/bin/y2tool
+%{prefix}/bin/yastdoc
%dir %{prefix}/share/emacs
%dir %{prefix}/share/emacs/site-lisp
%{prefix}/share/emacs/site-lisp/*ycp-mode.el
@@ -100,6 +103,26 @@
%{prefix}/share/pkgconfig/yast2-devtools.pc
%doc %{prefix}/share/doc/packages/yast2-devtools
%changelog
+* Wed Jul 30 2008 mvidner@suse.cz
+- Added yastdoc (http://en.opensuse.org/YaST/yastdoc).
+- Create a disambiguation chapter only if requested by a xslt
+ parameter.
+- 2.17.5
+* Tue Jul 29 2008 mvidner@suse.cz
+- Recommend libtool for svn builds of binary packages.
+- YDoxygen:
+ - Updated template Doxyfile to doxygen 1.5.5, enabled built in STL
+ support.
+ - Made it easier to troubleshoot by using a real config file instead
+ of a pipe, pointed out the log (bnc#412465).
+- Stylesheets for documentation of builtins (and WFM, Pkg):
+ - Assist a straightforward mapping between source code
+ usage and reference docs URLs: list::reduce should be
+ .../ycp/list/reduce.html, not .../YCPListBuiltins_reduce.html.
+ - Enabled processing multiple chapters at once to make overload
+ disambiguation possible.
+ - Minor Docbook validity fixes.
+- 2.17.4
* Fri Jul 18 2008 mvidner@suse.cz
- The previous change broke the few packages that do not need
yast2-core. Only use yast2-core.pc when it is present.
++++++ yast2-devtools-2.17.3.tar.bz2 -> yast2-devtools-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/configure new/yast2-devtools-2.17.5/configure
--- old/yast2-devtools-2.17.3/configure 2008-07-18 11:18:31.000000000 +0200
+++ new/yast2-devtools-2.17.5/configure 2008-07-30 15:20:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-devtools 2.17.3.
+# Generated by GNU Autoconf 2.61 for yast2-devtools 2.17.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-devtools'
PACKAGE_TARNAME='yast2-devtools'
-PACKAGE_VERSION='2.17.3'
-PACKAGE_STRING='yast2-devtools 2.17.3'
+PACKAGE_VERSION='2.17.5'
+PACKAGE_STRING='yast2-devtools 2.17.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1451,7 +1451,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 yast2-devtools 2.17.3 to adapt to many kinds of systems.
+\`configure' configures yast2-devtools 2.17.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1522,7 +1522,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-devtools 2.17.3:";;
+ short | recursive ) echo "Configuration of yast2-devtools 2.17.5:";;
esac
cat <<\_ACEOF
@@ -1631,7 +1631,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-devtools configure 2.17.3
+yast2-devtools configure 2.17.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1645,7 +1645,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-devtools $as_me 2.17.3, which was
+It was created by yast2-devtools $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2466,7 +2466,7 @@
# Define the identity of the package.
PACKAGE='yast2-devtools'
- VERSION='2.17.3'
+ VERSION='2.17.5'
cat >>confdefs.h <<_ACEOF
@@ -2694,7 +2694,7 @@
-VERSION="2.17.3"
+VERSION="2.17.5"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -21571,7 +21571,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-devtools $as_me 2.17.3, which was
+This file was extended by yast2-devtools $as_me 2.17.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21618,7 +21618,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-devtools config.status 2.17.3
+yast2-devtools config.status 2.17.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/configure.in new/yast2-devtools-2.17.5/configure.in
--- old/yast2-devtools-2.17.3/configure.in 2008-07-18 11:18:20.000000000 +0200
+++ new/yast2-devtools-2.17.5/configure.in 2008-07-30 15:20:27.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-devtools
dnl
-dnl -- This file is generated by y2autoconf 2.17.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-devtools, 2.17.3, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 2.17.5, http://bugs.opensuse.org/, yast2-devtools)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.3"
+VERSION="2.17.5"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/devtools/bin/Makefile.am new/yast2-devtools-2.17.5/devtools/bin/Makefile.am
--- old/yast2-devtools-2.17.3/devtools/bin/Makefile.am 2007-11-13 09:27:03.000000000 +0100
+++ new/yast2-devtools-2.17.5/devtools/bin/Makefile.am 2008-07-30 14:57:29.000000000 +0200
@@ -4,7 +4,7 @@
pkgdatadir = @YAST2DEVTOOLS@/bin
-bin_SCRIPTS = y2tool
+bin_SCRIPTS = y2tool yastdoc
ybin_SCRIPTS = ycpmakedep
pkgdata_SCRIPTS = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/devtools/bin/Makefile.in new/yast2-devtools-2.17.5/devtools/bin/Makefile.in
--- old/yast2-devtools-2.17.3/devtools/bin/Makefile.in 2008-07-18 11:18:32.000000000 +0200
+++ new/yast2-devtools-2.17.5/devtools/bin/Makefile.in 2008-07-30 15:20:40.000000000 +0200
@@ -209,7 +209,7 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-bin_SCRIPTS = y2tool
+bin_SCRIPTS = y2tool yastdoc
ybin_SCRIPTS = ycpmakedep
pkgdata_SCRIPTS = \
checkin-stable \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/devtools/bin/version new/yast2-devtools-2.17.5/devtools/bin/version
--- old/yast2-devtools-2.17.3/devtools/bin/version 2008-07-18 11:18:46.000000000 +0200
+++ new/yast2-devtools-2.17.5/devtools/bin/version 2008-07-30 15:20:50.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 2.17.3
+echo 2.17.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/devtools/bin/yastdoc new/yast2-devtools-2.17.5/devtools/bin/yastdoc
--- old/yast2-devtools-2.17.3/devtools/bin/yastdoc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-devtools-2.17.5/devtools/bin/yastdoc 2008-07-30 14:58:41.000000000 +0200
@@ -0,0 +1,29 @@
+#!/bin/sh
+# http://en.opensuse.org/YaST/yastdoc
+self=`basename $0`
+if [ "$1" = "--prefix" -o "$1" = "-p" ]; then
+ shift
+ PREFIX="$1"
+ shift
+fi
+# run the tools that are in the same prefix as we are
+if [ -z "$PREFIX" ]; then
+ PREFIX=${0%/bin/$self}
+fi
+
+YASTDOCDIR=$PREFIX/share/doc/yastdoc/html
+
+browse() {
+ w3m "$@"
+}
+
+Q="${1-index}"
+
+#ls -r is a heuristic to prefer the ycp section
+for SECTIONDIR in `ls -dr $YASTDOCDIR/*`; do
+ F="$SECTIONDIR/${Q//::/\/}.html"
+ if [ -f "$F" ]; then
+ browse "$F"
+ break
+ fi
+done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/docbook/stylesheets/ydoc.xsl new/yast2-devtools-2.17.5/docbook/stylesheets/ydoc.xsl
--- old/yast2-devtools-2.17.3/docbook/stylesheets/ydoc.xsl 2008-06-09 11:54:20.000000000 +0200
+++ new/yast2-devtools-2.17.5/docbook/stylesheets/ydoc.xsl 2008-07-30 09:40:15.000000000 +0200
@@ -1,51 +1,97 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY undocumented "">
+<!ENTITY undocumented2 "[DOCS MISSING]">
+]>
http://www.w3.org/1999/XSL/Transform">
-
+
+
+
xsl:apply-templates/
+
+
+
-
- <reference>
-
-
-
- <title>
-
- </title>
-
-
-
-
+
+ <!-- googled "xslt grouping":
+ http://www.jenitennison.com/xslt/grouping/muenchian.html -->
+
+
+
+
+
+
+
+ <reference id="{filename}">
+ <title>
+
+ </title>
+
+
+
+
</reference>
+
+
+
+
-
- <refentry>
-
-
-
- xsl:text_
-
+ <!-- dirsep must be allowed in IDs -->
+ .
+
xsl:choose
-
-
+
+
xsl:otherwise
-
+
-
-
- xsl:text_widget
-
-
+
+
+
+
+
+
+
+
+ xsl:choose
+
+
+
+ xsl:otherwise
+
+
+
+
+
+
+
+
+
+ <!-- produce file names according to yastdoc rules -->
+
+
+ xsl:textdir="
+
+ xsl:text"
+
+
+
+ xsl:textfilename="
+
+ xsl:text.html"
+
<refmeta>
<refentrytitle>
@@ -54,8 +100,21 @@
</refentrytitle>
- <manvolnum>3</manvolnum>
+ <manvolnum>
+
+ xsl:text,
+
+ </manvolnum>
</refmeta>
+
+
+
+
+ <refentry>
+
+
+
+
<refnamediv>
<refname>
@@ -318,9 +377,7 @@
</programlisting>
xsl:otherwise
- <para>
- </para>
</para>
@@ -363,6 +420,9 @@
</type>
</term>
<listitem>
+
+ <para>&undocumented;</para>
+
<para>
@@ -375,6 +435,45 @@
+ <!-- create add.html for add-list.html and add-map.html -->
+
+ <reference id="Disambiguation">
+ <title>Disambiguation</title>
+
+ <!-- id!='' assumes all duplicates have id defined. -->
+
+
+
+ <refentry>
+
+
+ <refnamediv>
+ <refname>
+
+ </refname>
+ <refpurpose>disambiguation</refpurpose>
+ </refnamediv>
+
+ <refsect1>
+ <title>Variants</title>
+ <simplelist>
+
+
+ <member>
+ <xref linkend="{id}" />
+ </member>
+
+ </simplelist>
+ </refsect1>
+
+ </refentry>
+
+
+ </reference>
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/doxygen/Doxyfile new/yast2-devtools-2.17.5/doxygen/Doxyfile
--- old/yast2-devtools-2.17.3/doxygen/Doxyfile 2006-10-13 13:48:40.000000000 +0200
+++ new/yast2-devtools-2.17.5/doxygen/Doxyfile 2008-07-28 10:38:28.000000000 +0200
@@ -1,30 +1,41 @@
-# Doxyfile 1.3.4
+# Doxyfile 1.5.5
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
PROJECT_NAME =
PROJECT_NUMBER =
OUTPUT_DIRECTORY =
+CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = NO
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = NO
STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
+QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = NO
INHERIT_DOCS = YES
-DISTRIBUTE_GROUP_DOC = YES
+SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 8
ALIASES =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
+BUILTIN_STL_SUPPORT = YES
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
+DISTRIBUTE_GROUP_DOC = YES
SUBGROUPING = YES
+TYPEDEF_HIDES_STRUCT = NO
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
@@ -32,6 +43,8 @@
EXTRACT_PRIVATE = YES
EXTRACT_STATIC = YES
EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = NO
+EXTRACT_ANON_NSPACES = NO
HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
HIDE_FRIEND_COMPOUNDS = NO
@@ -42,6 +55,9 @@
SHOW_INCLUDE_FILES = YES
INLINE_INFO = YES
SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_GROUP_NAMES = NO
+SORT_BY_SCOPE_NAME = NO
GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
@@ -49,6 +65,8 @@
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = NO
+FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -56,22 +74,26 @@
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE = doxygen.log
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = ../../src
+INPUT_ENCODING = UTF-8
FILE_PATTERNS =
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
INPUT_FILTER =
+FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
@@ -81,6 +103,8 @@
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
@@ -99,6 +123,10 @@
HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
+GENERATE_DOCSET = NO
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = org.doxygen.Project
+HTML_DYNAMIC_SECTIONS = NO
CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO
@@ -146,6 +174,7 @@
XML_OUTPUT = xml
XML_SCHEMA =
XML_DTD =
+XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
@@ -170,11 +199,9 @@
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
-TAGFILES = /usr/share/doc/packages/liby2util/autodocs/liby2util.tag=/usr/share/doc/packages/liby2util/autodocs \
- /usr/share/doc/packages/yast2-packagemanager/autodocs/yast2-packagemanager.tag=/usr/share/doc/packages/yast2-packagemanager/autodocs \
- /usr/share/doc/packages/yast2-core/autodocs/yast2-core.tag=/usr/share/doc/packages/yast2-core/autodocs
+TAGFILES = /usr/share/doc/packages/yast2-core/autodocs/yast2-core.tag=/usr/share/doc/packages/yast2-core/autodocs
GENERATE_TAGFILE = doxygen.tag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
@@ -183,25 +210,30 @@
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
+MSCGEN_PATH =
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = NO
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
UML_LOOK = NO
TEMPLATE_RELATIONS = NO
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
CALL_GRAPH = NO
+CALLER_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
DOT_PATH =
DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
+DOT_GRAPH_MAX_NODES = 50
MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = YES
+DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
+# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/doxygen/ydoxygen new/yast2-devtools-2.17.5/doxygen/ydoxygen
--- old/yast2-devtools-2.17.3/doxygen/ydoxygen 2006-10-13 13:48:40.000000000 +0200
+++ new/yast2-devtools-2.17.5/doxygen/ydoxygen 2008-07-28 10:10:24.000000000 +0200
@@ -1,5 +1,5 @@
#! /usr/bin/perl -w
-# $Id: ydoxygen 26771 2006-01-04 13:06:02Z mvidner $
+# $Id: ydoxygen 49440 2008-07-28 08:10:23Z mvidner $
#
# Run doxygen with a default configuration file for YaST
# but allow overriding some values
@@ -33,7 +33,7 @@
=item B<-d>, B<--debug>
Show what is substituted.
-Write doxygen.log and doxygen.conf.
+Keep doxygen.conf.
=item I<param>=I<value>
@@ -108,15 +108,9 @@
# open input file
open (IN, "<$template") or die "Cannot open $template: $!";
-# open output - pipe
-# man perlipc
-$SIG{PIPE} = 'IGNORE';
-my $run_doxygen = "|doxygen -";
-if ($debug)
-{
- $run_doxygen = "|tee doxygen.conf ". $run_doxygen;
-}
-open (OUT, $run_doxygen) or die "can't fork doxygen: $!";
+# open output
+my $conf = "doxygen.conf";
+open (OUT, ">$conf") or die "Cannot open $conf for writing: $!";
# $_ holds the whole definition of a parameter
# that may be split over multiple lines
@@ -153,9 +147,28 @@
$_ = "$param$ws= $value";
}
- print OUT "$_\n" or die "can't write to doxygen: $!";
+ print OUT "$_\n" or die "Cannot write to $conf: $!";
$_ = ""; # this line does not continue
}
-close(OUT) or die "can't close pipe to doxygen: status=$?";
+close(OUT) or die "Cannot close $conf: $!";
close(IN);
+
+# config is ready, run it:
+my $doxygen = "doxygen";
+print "$doxygen $conf\n";
+system($doxygen, $conf);
+
+if ($? == -1) {
+ die "Cannot run $doxygen: $!";
+}
+elsif ($? & 127) {
+ my $s = $? & 127;
+ die "$doxygen died with signal $s";
+}
+elsif ($? != 0) {
+ my $e = $? >> 8;
+ die "$doxygen exited with value $e, see doxygen.log";
+}
+
+unlink $conf unless $debug;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/VERSION new/yast2-devtools-2.17.5/VERSION
--- old/yast2-devtools-2.17.3/VERSION 2008-07-18 11:14:38.000000000 +0200
+++ new/yast2-devtools-2.17.5/VERSION 2008-07-30 15:18:28.000000000 +0200
@@ -1 +1 @@
-2.17.3
+2.17.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.17.3/ydoc/src/ydoc2 new/yast2-devtools-2.17.5/ydoc/src/ydoc2
--- old/yast2-devtools-2.17.3/ydoc/src/ydoc2 2008-06-09 11:20:07.000000000 +0200
+++ new/yast2-devtools-2.17.5/ydoc/src/ydoc2 2008-07-28 16:35:05.000000000 +0200
@@ -39,8 +39,6 @@
{
my ($file) = @_;
- tie @{$f->{"entries"}}, "entries";
-
my $in_comment = 0;
my $line = ''; # collected input line
my $comment = ''; # last comment block
@@ -740,9 +738,12 @@
sub main ()
{
+ tie @{$f->{"entries"}}, "entries";
parse_arguments();
- ($filename,$filepath,$filesuffix) = fileparse($ARGV[0],qr{\.cc});
- scan_file($ARGV[0]);
+ foreach my $arg (@ARGV) {
+ ($filename,$filepath,$filesuffix) = fileparse($arg,qr{\.cc});
+ scan_file($arg);
+ }
yastdoc::XML::write_docs();
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org