gtk-doc r594 - trunk
- From: stefkost svn gnome org
- To: svn-commits-list gnome org
- Subject: gtk-doc r594 - trunk
- Date: Mon, 21 Jul 2008 10:47:16 +0000 (UTC)
Author: stefkost
Date: Mon Jul 21 10:47:16 2008
New Revision: 594
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=594&view=rev
Log:
* gtk-doc.make:
* gtk-doc.notmpl.make:
Only specify options if gtkdoc-mkhtml can take them. Fixes #543855.
* gtkdoc-mkhtml.in:
Don't use bash specific features. Be more flexible so that we can add
more options.
Modified:
trunk/ChangeLog
trunk/gtk-doc.make
trunk/gtk-doc.notmpl.make
trunk/gtkdoc-mkhtml.in
Modified: trunk/gtk-doc.make
==============================================================================
--- trunk/gtk-doc.make (original)
+++ trunk/gtk-doc.make Mon Jul 21 10:47:16 2008
@@ -107,7 +107,12 @@
@-chmod -R u+w $(srcdir)
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
+ mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+ fi
+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
Modified: trunk/gtk-doc.notmpl.make
==============================================================================
--- trunk/gtk-doc.notmpl.make (original)
+++ trunk/gtk-doc.notmpl.make Mon Jul 21 10:47:16 2008
@@ -92,7 +92,12 @@
@-chmod -R u+w $(srcdir)
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
+ mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+ fi
+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
Modified: trunk/gtkdoc-mkhtml.in
==============================================================================
--- trunk/gtkdoc-mkhtml.in (original)
+++ trunk/gtkdoc-mkhtml.in Mon Jul 21 10:47:16 2008
@@ -6,12 +6,18 @@
#echo "args $0\n";
+# parse options, ignore unknown options for future extensions
+
searchpath=
-case "X$1" in
- X--version) echo "@VERSION@"; exit 0;;
- X--help) echo "$usage"; exit 0;;
- X--path=*) searchpath="${1#*=}"; shift;;
-esac
+while true; do
+ case "X$1" in
+ X--version) echo "@VERSION@"; exit 0;;
+ X--help) echo "$usage"; exit 0;;
+ X--path=*) searchpath=`echo $1 | sed s/.*=//`; shift;;
+ X--*) shift;;
+ X*) break;;
+ esac
+done
if test $# -lt 2; then
echo "${usage}" 1>&2
@@ -29,6 +35,7 @@
gtkdocdir=`dirname $0`
else
# installed
+ # the first two are needed to resolve datadir
prefix= prefix@
datarootdir= datarootdir@
gtkdocdir= datadir@/gtk-doc/data
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]