[omniORB] Patch for supporting PYDEBUG builds in omniORBpy

[Floris Bruynooghe]

Hi Duncan

If we're into reminding of unapplied patches, this one is still not
applied or has had any other feedback.  I've also posted another one
on omniorb-dev recently which I'd be interested in getting feedback
on.

Cheers
Floris

(resending from subscribed email address)

On Mon, Jan 11, 2010 at 06:57:05PM +0000, Floris Bruynooghe wrote:
> On Mon, Jan 11, 2010 at 10:55:25AM +0000, Duncan Grisby wrote:
> > On Sun, 2010-01-10 at 12:53 +0000, Floris Bruynooghe wrote:
> > 
> > > Attached is a patch that supports PYDEBUG builds for the modules of
> > > omniORBpy.
> > 
> > You forgot the patch... ;-)
> 
> Oops!  This time better...
> 
> 
> Floris
> 
> -- 
> Debian GNU/Linux -- The Power of Freedom
> www.debian.org | www.gnu.org | www.kernel.org

> Index: omniORBpy/modules/connections/dir.mk
> ===================================================================
> --- omniORBpy/modules/connections/dir.mk	(revision 5934)
> +++ omniORBpy/modules/connections/dir.mk	(working copy)
> @@ -19,10 +19,16 @@
>  #CXXDEBUGFLAGS = -g
>  
>  PYPREFIX  := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
> +PYDEBUG   := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
>  PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
> +ifeq ($(PYDEBUG),True)
> +PYDEBUG   := _d
> +else
> +PYDEBUG   :=
> +endif
>  PYINCDIR  := $(PYPREFIX)/include
> -PYINCFILE := "<python$(PYVERSION)/Python.h>"
> -PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
> +PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
> +PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
>  DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
>  DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
>  
> @@ -50,9 +56,9 @@
>  SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
>  endif
>  
> -SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
> -SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
> -SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
> +SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
> +SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
> +SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
>  
>  ifdef PythonLibraryPlatformLinkFlagsTemplate
>  SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
> Index: omniORBpy/modules/dir.mk
> ===================================================================
> --- omniORBpy/modules/dir.mk	(revision 5934)
> +++ omniORBpy/modules/dir.mk	(working copy)
> @@ -72,10 +72,16 @@
>  #CXXDEBUGFLAGS = -g
>  
>  PYPREFIX  := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
> +PYDEBUG   := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
>  PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
> +ifeq ($(PYDEBUG),True)
> +PYDEBUG   := _d
> +else
> +PYDEBUG   :=
> +endif
>  PYINCDIR  := $(PYPREFIX)/include
> -PYINCFILE := "<python$(PYVERSION)/Python.h>"
> -PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
> +PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
> +PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
>  DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
>  DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
>  
> @@ -94,9 +100,9 @@
>  SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
>  endif
>  
> -SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
> -SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
> -SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
> +SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
> +SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
> +SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
>  
>  ifdef PythonLibraryPlatformLinkFlagsTemplate
>  SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
> Index: omniORBpy/modules/sslTP/dir.mk
> ===================================================================
> --- omniORBpy/modules/sslTP/dir.mk	(revision 5934)
> +++ omniORBpy/modules/sslTP/dir.mk	(working copy)
> @@ -20,10 +20,16 @@
>  #CXXDEBUGFLAGS = -g
>  
>  PYPREFIX  := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
> +PYDEBUG   := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
>  PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
> +ifeq ($(PYDEBUG),True)
> +PYDEBUG   := _d
> +else
> +PYDEBUG   :=
> +endif
>  PYINCDIR  := $(PYPREFIX)/include
> -PYINCFILE := "<python$(PYVERSION)/Python.h>"
> -PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
> +PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
> +PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
>  DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
>  DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
>  
> @@ -45,9 +51,9 @@
>  SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
>  endif
>  
> -SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
> -SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
> -SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
> +SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
> +SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
> +SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
>  
>  ifdef PythonLibraryPlatformLinkFlagsTemplate
>  SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
> Index: omniORBpy/modules/codesets/dir.mk
> ===================================================================
> --- omniORBpy/modules/codesets/dir.mk	(revision 5934)
> +++ omniORBpy/modules/codesets/dir.mk	(working copy)
> @@ -21,10 +21,16 @@
>  #CXXDEBUGFLAGS = -g
>  
>  PYPREFIX  := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
> +PYDEBUG   := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
>  PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
> +ifeq ($(PYDEBUG),True)
> +PYDEBUG   := _d
> +else
> +PYDEBUG   :=
> +endif
>  PYINCDIR  := $(PYPREFIX)/include
> -PYINCFILE := "<python$(PYVERSION)/Python.h>"
> -PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
> +PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
> +PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
>  DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
>  DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
>  
> @@ -43,9 +49,9 @@
>  SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
>  endif
>  
> -SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
> -SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
> -SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
> +SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
> +SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
> +SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
>  
>  ifdef PythonLibraryPlatformLinkFlagsTemplate
>  SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
> Index: omniORBpy/examples/embed/dir.mk
> ===================================================================
> --- omniORBpy/examples/embed/dir.mk	(revision 5934)
> +++ omniORBpy/examples/embed/dir.mk	(working copy)
> @@ -15,9 +15,15 @@
>  ifdef UnixPlatform
>  CXXDEBUGFLAGS = -g
>  PYPREFIX  := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
> +PYDEBUG   := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
>  PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
> +ifeq ($(PYDEBUG),True)
> +PYDEBUG   := _d
> +else
> +PYDEBUG   :=
> +endif
>  PYINCDIR  := $(PYPREFIX)/include
> -PYINCFILE := "<python$(PYVERSION)/Python.h>"
> +PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
>  DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE)
>  endif
>  
> @@ -26,9 +32,9 @@
>  
>  namespec := _embedmodule _ 1 0
>  
> -SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
> -SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
> -SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
> +SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
> +SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
> +SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
>  
>  ifdef PythonLibraryPlatformLinkFlagsTemplate
>  SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)

> _______________________________________________
> omniORB-list mailing list
> omniORB-list at omniorb-support.com
> http://www.omniorb-support.com/mailman/listinfo/omniorb-list


-- 
Debian GNU/Linux -- The Power of Freedom
www.debian.org | www.gnu.org | www.kernel.org