From 680d57db9f0ac917071fcc4e85b51953fee90058 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sun, 20 Sep 2009 07:42:21 +0000 Subject: Fix tests patch to work fully without system gtk-doc (Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64) --- .../gtk-doc/files/gtk-doc-1.11-tests-fixes.patch | 201 +++++++++++++++++++++ 1 file changed, 201 insertions(+) (limited to 'dev-util/gtk-doc/files') diff --git a/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch b/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch index 8e28f540c633..6b3f5835d1f0 100644 --- a/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch +++ b/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch @@ -95,6 +95,21 @@ index 4281c5c..1b05e7a 100644 endif +diff --git a/tests/Makefile.in b/tests/Makefile.in +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -193,7 +193,10 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = gobject bugs annotations . + @BUILD_TESTS_TRUE@TESTS = gobject.sh bugs.sh annotations.sh +-@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = PATH=$(top_builddir):$(srcdir):$(PATH) ++@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \ ++@BUILD_TESTS_TRUE@ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ ++@BUILD_TESTS_TRUE@ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ++ + EXTRA_DIST = gtkdoctest.sh \ + gobject.sh bugs.sh annotations.sh + diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make index 1c37e9b..b18c405 100644 --- a/tests/gtk-doc.make @@ -197,6 +212,192 @@ index 2b92d57..694c4c5 100755 # xmllint --noout --nonet --schema ../devhelp2.xsd ./bugs/docs/html/tester.devhelp2 # +--- a/tests/annotations/docs/Makefile.am ++++ b/tests/annotations/docs/Makefile.am +@@ -76,3 +76,10 @@ + gtkdoc-mkhtml.log \ + gtkdoc-fixxref.log + ++if BUILD_TESTS ++ ++TESTS_ENVIRONMENT = \ ++ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ ++ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ++ ++endif +--- a/tests/annotations/docs/Makefile.in ++++ b/tests/annotations/docs/Makefile.in +@@ -295,6 +295,10 @@ + gtkdoc-mkhtml.log \ + gtkdoc-fixxref.log + ++@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \ ++@BUILD_TESTS_TRUE@ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ ++@BUILD_TESTS_TRUE@ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ++ + all: all-am + + .SUFFIXES: +@@ -482,10 +486,10 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -502,7 +506,7 @@ + sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +@@ -516,11 +520,11 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \ ++ @cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +--- a/tests/bugs/docs/Makefile.am ++++ b/tests/bugs/docs/Makefile.am +@@ -76,3 +76,10 @@ + gtkdoc-mkhtml.log \ + gtkdoc-fixxref.log + ++if BUILD_TESTS ++ ++TESTS_ENVIRONMENT = \ ++ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ ++ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ++ ++endif +--- a/tests/bugs/docs/Makefile.in ++++ b/tests/bugs/docs/Makefile.in +@@ -295,6 +295,10 @@ + gtkdoc-mkhtml.log \ + gtkdoc-fixxref.log + ++@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \ ++@BUILD_TESTS_TRUE@ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ ++@BUILD_TESTS_TRUE@ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ++ + all: all-am + + .SUFFIXES: +@@ -482,10 +486,10 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -502,7 +506,7 @@ + sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +@@ -516,11 +520,11 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \ ++ @cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +--- a/tests/gobject/docs/Makefile.am ++++ b/tests/gobject/docs/Makefile.am +@@ -76,3 +76,10 @@ + gtkdoc-mkhtml.log \ + gtkdoc-fixxref.log + ++if BUILD_TESTS ++ ++TESTS_ENVIRONMENT = \ ++ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ ++ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ++ ++endif +--- a/tests/gobject/docs/Makefile.in ++++ b/tests/gobject/docs/Makefile.in +@@ -295,6 +295,10 @@ + gtkdoc-mkhtml.log \ + gtkdoc-fixxref.log + ++@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \ ++@BUILD_TESTS_TRUE@ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ ++@BUILD_TESTS_TRUE@ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ++ + all: all-am + + .SUFFIXES: +@@ -482,10 +486,10 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -502,7 +506,7 @@ + sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +@@ -516,11 +520,11 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \ ++ @cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ ++ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ + gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + -- 1.6.1.3 -- cgit v1.2.3-65-gdbad