Attachment 4746 Details for Bug 6042 – Allow build outside the source directory: the CVS sources patch

[patch] Allow build outside the source directory: the CVS sources patch

dbus.cvs.source.patch (text/plain), 5.68 KB, created by Bernard Leak on 2006-02-26 00:13:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Leak

Created: 2006-02-26 00:13:49 UTC

Size: 5.68 KB

patch

obsolete

>#Output of diff -Nru dbus-0.60/Doxyfile.in{-old,}
>--- dbus-0.60/Doxyfile.in-old	2004-06-02 14:13:14.000000000 +0100
>+++ dbus-0.60/Doxyfile.in	2006-02-08 17:59:55.000000000 +0000
>@@ -49,7 +49,7 @@
> #---------------------------------------------------------------------------
> # configuration options related to the input files
> #---------------------------------------------------------------------------
>-INPUT                  = dbus glib
>+INPUT                  = @top_srcdir@/dbus @top_srcdir@/glib
> FILE_PATTERNS          = *.c *.h
> RECURSIVE              = YES
> #EXCLUDE                = test
>
>#Output of diff -Nru dbus-0.60/gcj/org/freedesktop/dbus/Makefile.am{-old,}
>--- dbus-0.60/gcj/org/freedesktop/dbus/Makefile.am-old	2005-09-06 23:38:54.000000000 +0100
>+++ dbus-0.60/gcj/org/freedesktop/dbus/Makefile.am	2006-02-24 18:16:57.000000000 +0000
>@@ -1,4 +1,5 @@
> INCLUDES=						\
>+	-I$(top_builddir)	\
> 	-I$(top_srcdir) 				\
> 	-I$(top_builddir)/gcj/org/freedesktop/dbus	\
> 	 $(DBUS_CLIENT_CFLAGS) 
>
>#Output of diff -Nru dbus-0.60/python/Makefile.am{-old,}
>--- dbus-0.60/python/Makefile.am-old	2005-10-05 21:43:46.000000000 +0100
>+++ dbus-0.60/python/Makefile.am	2006-02-24 19:09:08.000000000 +0000
>@@ -46,7 +46,7 @@
> 
> 
> dbus_bindings.pxd: $(srcdir)/dbus_bindings.pxd.in $(srcdir)/extract.py
>-	-$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(srcdir)/$(top_builddir)  -I$(srcdir) > $@.tmp && mv $@.tmp $@
>+	-$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(top_builddir)  -I$(srcdir) > $@.tmp && mv $@.tmp $@
> 
> dbus_bindings.c: $(srcdir)/dbus_bindings.pyx dbus_bindings.pxd 
> 	pyrexc $(srcdir)/dbus_bindings.pyx -I. -o ./dbus_bindings.c
>
>#Output of diff -Nru dbus-0.60/test/glib/run-test.sh{-old,}
>--- dbus-0.60/test/glib/run-test.sh-old	2005-03-17 17:48:29.000000000 +0000
>+++ dbus-0.60/test/glib/run-test.sh	2006-02-24 19:34:01.000000000 +0000
>@@ -10,7 +10,7 @@
> if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
>   DBUS_TEST_GLIB_IN_RUN_TEST=1
>   export DBUS_TEST_GLIB_IN_RUN_TEST
>-  exec $DBUS_TOP_BUILDDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
>+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
> fi  
> 
> if test x$MODE = xprofile ; then
>@@ -26,7 +26,7 @@
>   if test x$DEBUG = x ; then
>       ARGS="--services org.freedesktop.DBus org.freedesktop.DBus.TestSuiteGLibService"
>   fi
>-  libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/tools/dbus-viewer $ARGS || die "could not run dbus-viewer"
>+  libtool --mode=execute $DEBUG $DBUS_TOP_SRCDIR/tools/dbus-viewer $ARGS || die "could not run dbus-viewer"
> elif test x$MODE = xwait ; then
>   echo "Waiting DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
>   sleep 86400
>
>#Output of diff -Nru dbus-0.60/test/name-test/run-test.sh{-old,}
>--- dbus-0.60/test/name-test/run-test.sh-old	2005-11-22 20:37:00.000000000 +0000
>+++ dbus-0.60/test/name-test/run-test.sh	2006-02-24 19:51:17.000000000 +0000
>@@ -24,7 +24,7 @@
> if test -z "$DBUS_TEST_NAME_IN_RUN_TEST"; then
>   DBUS_TEST_NAME_IN_RUN_TEST=1
>   export DBUS_TEST_NAME_IN_RUN_TEST
>-  exec $DBUS_TOP_BUILDDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
>+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
> fi 
> echo "running test-names"
> libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-names || die "test-client failed"
>
>#Output of diff -Nru dbus-0.60/test/python/Makefile.am{-old,}
>--- dbus-0.60/test/python/Makefile.am-old	2005-08-25 01:20:41.000000000 +0100
>+++ dbus-0.60/test/python/Makefile.am	2006-02-24 22:58:24.000000000 +0000
>@@ -2,7 +2,7 @@
> ## so if adding tests not to be run in make check, don't add them to 
> ## TESTS
> if DBUS_BUILD_TESTS
>-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
>+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
> TESTS=run-test.sh
> else
> TESTS=
>
>#Output of diff -Nru dbus-0.60/test/glib/Makefile.am{-old,}
>--- dbus-0.60/test/glib/Makefile.am-old	2005-08-23 20:48:30.000000000 +0100
>+++ dbus-0.60/test/glib/Makefile.am	2006-02-25 11:25:28.000000000 +0000
>@@ -4,7 +4,7 @@
> ## so if adding tests not to be run in make check, don't add them to 
> ## TESTS
> if DBUS_BUILD_TESTS
>-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
>+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
> TESTS=run-test.sh
> else
> TESTS=
>
>#Output of diff -Nru dbus-0.60/test/name-test/Makefile.am{-old,}
>--- dbus-0.60/test/name-test/Makefile.am-old	2005-11-22 20:37:00.000000000 +0000
>+++ dbus-0.60/test/name-test/Makefile.am	2006-02-24 22:57:14.000000000 +0000
>@@ -4,7 +4,7 @@
> ## so if adding tests not to be run in make check, don't add them to 
> ## TESTS
> if DBUS_BUILD_TESTS
>-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
>+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
> TESTS=run-test.sh
> else
> TESTS=
>
>#Output of diff -Nru dbus-0.60/configure.in{-old,}
>--- dbus-0.60/configure.in-old	2005-11-22 20:42:49.000000000 +0000
>+++ dbus-0.60/configure.in	2006-02-24 22:55:57.000000000 +0000
>@@ -1225,11 +1225,9 @@
> AC_SUBST(DBUS_USER)
> AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon])
> 
>-#### Tell tests where to find certain stuff in builddir
>-ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`
>-
>+DBUS_PWD=`pwd`
> AC_DEFUN(TEST_PATH, [
>-TEST_$1=${ABSOLUTE_TOP_BUILDDIR}/test/$2
>+TEST_$1=${DBUS_PWD}/test/$2
> AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1",
>                    [Full path to test file test/$2 in builddir])
> AC_SUBST(TEST_$1)
>@@ -1243,7 +1240,6 @@
> TEST_PATH(EXIT_BINARY, test-exit)
> TEST_PATH(SEGFAULT_BINARY, test-segfault)
> TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
>-AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
> 
> #### Find socket directories
> if ! test -z "$TMPDIR" ; then
>

Actions: View | Splinter Review

Attachments on bug 6042: 4746 | 4747 | 4749 | 4814

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.