[Pkg-corba-commits] r222 - in /trunk/python-omniorb: examples/embed/dir.mk mk/beforeauto.mk.in modules/codesets/dir.mk modules/connections/dir.mk modules/dir.mk modules/sslTP/dir.mk python/COS/dir.mk python/omniORB/dir.mk

flub-guest at users.alioth.debian.org flub-guest at users.alioth.debian.org
Mon Aug 9 21:32:48 UTC 2010 

Author: flub-guest
Date: Mon Aug  9 21:32:47 2010
New Revision: 222

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=222
Log:
Revert to plain 3.4 state

The svn-update merging is not quite complete, the modified files where
just kept at their 3.3 state.  Reverting to plain 3.4 so that I can
create individual patches for the required changes.

Modified:
    trunk/python-omniorb/examples/embed/dir.mk
    trunk/python-omniorb/mk/beforeauto.mk.in
    trunk/python-omniorb/modules/codesets/dir.mk
    trunk/python-omniorb/modules/connections/dir.mk
    trunk/python-omniorb/modules/dir.mk
    trunk/python-omniorb/modules/sslTP/dir.mk
    trunk/python-omniorb/python/COS/dir.mk
    trunk/python-omniorb/python/omniORB/dir.mk

Modified: trunk/python-omniorb/examples/embed/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/examples/embed/dir.mk?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/examples/embed/dir.mk (original)
+++ trunk/python-omniorb/examples/embed/dir.mk Mon Aug  9 21:32:47 2010
@@ -15,15 +15,9 @@
 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)$(PYDEBUG)/Python.h>"
+PYINCFILE := "<python$(PYVERSION)/Python.h>"
 DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE)
 endif
 
@@ -32,9 +26,9 @@
 
 namespec := _embedmodule _ 1 0
 
-SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
 
 ifdef PythonLibraryPlatformLinkFlagsTemplate
 SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)

Modified: trunk/python-omniorb/mk/beforeauto.mk.in
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/mk/beforeauto.mk.in?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/mk/beforeauto.mk.in (original)
+++ trunk/python-omniorb/mk/beforeauto.mk.in Mon Aug  9 21:32:47 2010
@@ -30,6 +30,12 @@
 MAKEDIR = mk
 LIBDIR  = lib
 BINDIR  = bin
+
+ifeq ($(OMNIORB_ROOT),)
+OMNIORB_BINDIR = $(TOP)/$(BINDIR)
+else
+OMNIORB_BINDIR = $(OMNIORB_ROOT)/$(BINDIR)
+endif
 
 
 #############################################################################
@@ -271,7 +277,8 @@
 # need to preserve the old (idl-copying) behaviour for existing dir.mk
 # files.
 
-vpath %.idl $(IMPORT_TREES:%=%/idl) $(DATADIR)/idl/omniORB
+vpath %.idl $(IMPORT_TREES:%=%/idl) \
+            $(OMNIORB_ROOT)/share/idl/omniORB $(DATADIR)/idl/omniORB
 
 IMPORT_IDLFLAGS += -I. $(patsubst %,-I%,$(VPATH)) \
 		       $(patsubst %,-I%/idl,$(IMPORT_TREES))
@@ -460,7 +467,7 @@
 OMNIORB_DYNAMIC_DLL_NAME = $(patsubst %,$(LibSearchPattern),\
                            omniDynamic$(OMNIORB_MAJOR_VERSION))
 
-OMNIIDL = /usr/bin/omniidl
+OMNIIDL = $(OMNIORB_BINDIR)/omniidl
 OMNIORB_IDL_ONLY = $(OMNIIDL) -bcxx
 OMNIORB_IDL_ANY_FLAGS = -Wba
 OMNIORB_IDL = $(OMNIORB_IDL_ONLY) $(OMNIORB_IDL_ANY_FLAGS)
@@ -655,16 +662,17 @@
 CC              = @CC@
 CXX             = @CXX@
 RANLIB		= @RANLIB@
-MKDIRHIER	= mkdir -p
+MKDIRHIER	= @MKDIRHIER@
 INSTLIBFLAGS	= -m 0644
 INSTEXEFLAGS	= -m 0755
 CP		= cp
 MV		= mv -f
 CPP		= @CPP@
+OMKDEPEND	= @OMKDEPEND@
 RMDIRHIER	= $(RM) -rf
 
-CXXMAKEDEPEND   = @CXX@ -M -MD -MG
-CMAKEDEPEND     = @CC@ -M -MD -MG
+CXXMAKEDEPEND   = $(OMKDEPEND) -D__cplusplus
+CMAKEDEPEND     = $(OMKDEPEND)
 
 
 #
@@ -702,10 +710,10 @@
 #
 # Default compiler rules
 #
-CDEBUGFLAGS     = -g
+CDEBUGFLAGS     = -O
 CLINK           = $(CC)
 CLINKOPTIONS    = $(CDEBUGFLAGS) $(COPTIONS)
-CXXDEBUGFLAGS   = -g
+CXXDEBUGFLAGS   = -O2
 CXXLINK         = $(CXX)
 CXXLINKOPTIONS  = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
 
@@ -716,6 +724,8 @@
 #
 
 ifdef Compiler_GCC
+CMAKEDEPEND     += -D__GNUC__
+CXXMAKEDEPEND   += -D__GNUG__ -D__GNUC__
 CXXOPTIONS       = -Wall -Wno-unused -fexceptions
 EgcsMajorVersion = 1
 EgcsMinorVersion = 1

Modified: trunk/python-omniorb/modules/codesets/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/codesets/dir.mk?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/modules/codesets/dir.mk (original)
+++ trunk/python-omniorb/modules/codesets/dir.mk Mon Aug  9 21:32:47 2010
@@ -21,16 +21,10 @@
 #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)$(PYDEBUG)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
 DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
 DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
 
@@ -49,9 +43,9 @@
 SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
 endif
 
-SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
 
 ifdef PythonLibraryPlatformLinkFlagsTemplate
 SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)

Modified: trunk/python-omniorb/modules/connections/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/connections/dir.mk?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/modules/connections/dir.mk (original)
+++ trunk/python-omniorb/modules/connections/dir.mk Mon Aug  9 21:32:47 2010
@@ -19,16 +19,10 @@
 #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)$(PYDEBUG)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
 DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
 DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
 
@@ -56,9 +50,9 @@
 SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
 endif
 
-SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
 
 ifdef PythonLibraryPlatformLinkFlagsTemplate
 SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)

Modified: trunk/python-omniorb/modules/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/dir.mk?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/modules/dir.mk (original)
+++ trunk/python-omniorb/modules/dir.mk Mon Aug  9 21:32:47 2010
@@ -72,16 +72,10 @@
 #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)$(PYDEBUG)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
 DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
 DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
 
@@ -100,9 +94,9 @@
 SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
 endif
 
-SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
 
 ifdef PythonLibraryPlatformLinkFlagsTemplate
 SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)

Modified: trunk/python-omniorb/modules/sslTP/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/sslTP/dir.mk?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/modules/sslTP/dir.mk (original)
+++ trunk/python-omniorb/modules/sslTP/dir.mk Mon Aug  9 21:32:47 2010
@@ -20,16 +20,10 @@
 #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)$(PYDEBUG)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
 DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
 DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
 
@@ -51,9 +45,9 @@
 SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
 endif
 
-SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate   = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate  = $$1$$2.$(SHAREDLIB_SUFFIX)
 
 ifdef PythonLibraryPlatformLinkFlagsTemplate
 SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)

Modified: trunk/python-omniorb/python/COS/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/python/COS/dir.mk?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/python/COS/dir.mk (original)
+++ trunk/python-omniorb/python/COS/dir.mk Mon Aug  9 21:32:47 2010
@@ -77,6 +77,10 @@
 EXPORTEDFILES += $(foreach f, $(FILES), $(PYLIBDIR)/$(f))
 EXPORTEDFILES += $(foreach f, $(filter CosNaming%, $(FILES)), $(PYLIBROOT)/$(f))
 
+# __init__.py to make it a package
+FILES += __init__.py
+INSTALLEDFILES += $(INSTALLPYTHONDIR)/__init__.py
+
 # A .pth file to expose omniORB/COS to the global namespace
 FILES += omniORB.pth
 INSTALLEDFILES += $(INSTALLPYTHONDIR)/omniORB.pth

Modified: trunk/python-omniorb/python/omniORB/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/python/omniORB/dir.mk?rev=222&op=diff
==============================================================================
--- trunk/python-omniorb/python/omniORB/dir.mk (original)
+++ trunk/python-omniorb/python/omniORB/dir.mk Mon Aug  9 21:32:47 2010
@@ -5,6 +5,8 @@
 ir_idl.py: ir.idl
 	$(OMNIIDL) -v -p$(BASE_OMNI_TREE)/omniidl_be \
         -I$(BASE_OMNI_TREE)/idl \
+        -I$(OMNIORB_ROOT)/idl/omniORB \
+        -I$(OMNIORB_ROOT)/share/idl/omniORB \
         -I$(DATADIR)/idl/omniORB \
         -bpython -Wbno_package $^
 
@@ -17,7 +19,7 @@
         -bpython -nf -Wbno_package $^
 
 boxes_idl.py: boxes.idl
-	$(OMNIIDL) -v -p$(BASE_OMNI_TREE) \
+	$(OMNIIDL) -v -p$(BASE_OMNI_TREE)/omniidl_be \
         -I$(BASE_OMNI_TREE)/idl \
         -I$(OMNIORB_ROOT)/idl/omniORB \
         -I$(OMNIORB_ROOT)/share/idl/omniORB \

More information about the Pkg-corba-commits mailing list