[Pkg-corba-commits] r238 - in /branches/upstream/python-omniorb/current: ./ contrib/RPMs/ examples/weather/ mk/ modules/ modules/codesets/ modules/sslTP/ omniidl_be/ python/omniORB/
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Tue Mar 22 22:33:49 UTC 2011
Author: flub-guest
Date: Tue Mar 22 22:33:38 2011
New Revision: 238
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=238
Log:
[svn-upgrade] new version python-omniorb (3.5)
Added:
branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_5
branches/upstream/python-omniorb/current/bugfixes-34.xml
Removed:
branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_4
branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy_new.spec
Modified:
branches/upstream/python-omniorb/current/README.txt
branches/upstream/python-omniorb/current/ReleaseNotes.txt
branches/upstream/python-omniorb/current/aclocal.m4
branches/upstream/python-omniorb/current/configure
branches/upstream/python-omniorb/current/configure.ac
branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec
branches/upstream/python-omniorb/current/examples/weather/weatherInfo.idl
branches/upstream/python-omniorb/current/mk/version.mk
branches/upstream/python-omniorb/current/modules/codesets/pyCodeSets.cc
branches/upstream/python-omniorb/current/modules/dir.mk
branches/upstream/python-omniorb/current/modules/omnipy.cc
branches/upstream/python-omniorb/current/modules/omnipy.h
branches/upstream/python-omniorb/current/modules/pyAbstractIntf.cc
branches/upstream/python-omniorb/current/modules/pyCallDescriptor.cc
branches/upstream/python-omniorb/current/modules/pyContext.cc
branches/upstream/python-omniorb/current/modules/pyExceptions.cc
branches/upstream/python-omniorb/current/modules/pyFixed.cc
branches/upstream/python-omniorb/current/modules/pyFixed.h
branches/upstream/python-omniorb/current/modules/pyInterceptors.cc
branches/upstream/python-omniorb/current/modules/pyLocalObjects.cc
branches/upstream/python-omniorb/current/modules/pyMarshal.cc
branches/upstream/python-omniorb/current/modules/pyORBFunc.cc
branches/upstream/python-omniorb/current/modules/pyObjectRef.cc
branches/upstream/python-omniorb/current/modules/pyPOACurrentFunc.cc
branches/upstream/python-omniorb/current/modules/pyPOAFunc.cc
branches/upstream/python-omniorb/current/modules/pyPOAManagerFunc.cc
branches/upstream/python-omniorb/current/modules/pyServant.cc
branches/upstream/python-omniorb/current/modules/pyThreadCache.cc
branches/upstream/python-omniorb/current/modules/pyThreadCache.h
branches/upstream/python-omniorb/current/modules/pyTypeCode.cc
branches/upstream/python-omniorb/current/modules/pyValueType.cc
branches/upstream/python-omniorb/current/modules/pyomniFunc.cc
branches/upstream/python-omniorb/current/modules/sslTP/pysslTP.cc
branches/upstream/python-omniorb/current/omniidl_be/python.py
branches/upstream/python-omniorb/current/python/omniORB/BiDirPolicy.py
branches/upstream/python-omniorb/current/python/omniORB/CORBA.py
branches/upstream/python-omniorb/current/python/omniORB/PortableServer.py
branches/upstream/python-omniorb/current/python/omniORB/PortableServer__POA.py
branches/upstream/python-omniorb/current/python/omniORB/URI.py
branches/upstream/python-omniorb/current/python/omniORB/__init__.py
branches/upstream/python-omniorb/current/python/omniORB/codesets.py
branches/upstream/python-omniorb/current/python/omniORB/interceptors.py
branches/upstream/python-omniorb/current/python/omniORB/sslTP.py
branches/upstream/python-omniorb/current/python/omniORB/tcInternal.py
branches/upstream/python-omniorb/current/update.log
Modified: branches/upstream/python-omniorb/current/README.txt
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/README.txt?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/README.txt (original)
+++ branches/upstream/python-omniorb/current/README.txt Tue Mar 22 22:33:38 2011
@@ -1,7 +1,7 @@
omniORBpy 3
===========
-This is omniORBpy 3.4.
+This is omniORBpy 3.5.
omniORBpy is a robust high-performance CORBA ORB for Python.
Modified: branches/upstream/python-omniorb/current/ReleaseNotes.txt
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/ReleaseNotes.txt?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/ReleaseNotes.txt (original)
+++ branches/upstream/python-omniorb/current/ReleaseNotes.txt Tue Mar 22 22:33:38 2011
@@ -1,10 +1,18 @@
RELEASE NOTES
=============
-This is omniORBpy 3.4.
+This is omniORBpy 3.5.
See README.txt for building instructions.
See the documentation in the doc directory for more information.
+
+
+Changes since omniORBpy 3.4
+---------------------------
+
+ - Bug fixes. See bugfixes-34.xml.
+ - Allow passing of peer address and identity to interceptors.
+ - Exceptions can be pickled.
Changes since omniORBpy 3.3
Added: branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_5
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_5?rev=238&op=file
==============================================================================
--- branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_5 (added)
+++ branches/upstream/python-omniorb/current/THIS_IS_OMNIORBPY_3_5 Tue Mar 22 22:33:38 2011
@@ -1,0 +1,1 @@
+
Modified: branches/upstream/python-omniorb/current/aclocal.m4
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/aclocal.m4?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/aclocal.m4 (original)
+++ branches/upstream/python-omniorb/current/aclocal.m4 Tue Mar 22 22:33:38 2011
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,122 +11,204 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- AC_MSG_CHECKING(for $2)
-
- if $PKG_CONFIG --exists "$2" ; then
- AC_MSG_RESULT(yes)
- succeeded=yes
-
- AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
- AC_MSG_RESULT($$1_CFLAGS)
-
- AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
- AC_MSG_RESULT($$1_LIBS)
- else
- $1_CFLAGS=""
- $1_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- ifelse([$4], ,echo $$1_PKG_ERRORS,)
- fi
-
- AC_SUBST($1_CFLAGS)
- AC_SUBST($1_LIBS)
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- ifelse([$3], , :, [$3])
- else
- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
- fi
-])
-
-
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-
+# ---------------------------------------------------------------------------
# Adds support for distributing Python modules and packages. To
# install modules, copy them to $(pythondir), using the python_PYTHON
# automake variable. To install a package with the same name as the
# automake package, install to $(pkgpythondir), or use the
# pkgpython_PYTHON automake variable.
-
+#
# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
# locations to install python extension modules (shared libraries).
# Another macro is required to find the appropriate flags to compile
# extension modules.
-
+#
# If your package is configured with a different prefix to python,
# users will have to add the install directory to the PYTHONPATH
# environment variable, or create a .pth file (see the python
# documentation for details).
-
+#
# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
# cause an error if the version of python installed on the system
# doesn't meet the requirement. MINIMUM-VERSION should consist of
# numbers and dots only.
-
AC_DEFUN([AM_PATH_PYTHON],
[
- dnl Find a Python interpreter. Python versions prior to 1.5 are not
- dnl supported because the default installation locations changed from
- dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
- dnl in 1.5.
- m4_define([_AM_PYTHON_INTERPRETER_LIST],
- [python python2 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0 python1.6 python1.5])
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not
+ dnl supported. (2.0 was released on October 16, 2000).
+ m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+python2.1 python2.0])
m4_if([$1],[],[
dnl No version check is needed.
# Find any Python interpreter.
if test -z "$PYTHON"; then
- PYTHON=:
- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
+ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
fi
am_display_PYTHON=python
], [
@@ -167,7 +249,7 @@
dnl library.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
dnl Use the values of $prefix and $exec_prefix for the corresponding
@@ -182,7 +264,7 @@
dnl to know which OS platform Python thinks this is.
AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
- [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
@@ -197,8 +279,29 @@
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ [if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
@@ -214,8 +317,29 @@
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+ [if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
@@ -235,15 +359,16 @@
# Run ACTION-IF-FALSE otherwise.
# This test uses sys.hexversion instead of the string equivalent (first
# word of sys.version), in order to cope with versions such as 2.2c1.
-# hexversion has been introduced in Python 1.5.2; it's probably not
-# worth to support older versions (1.5.1 was released on October 31, 1998).
+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys, string
+ [prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
Added: branches/upstream/python-omniorb/current/bugfixes-34.xml
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/bugfixes-34.xml?rev=238&op=file
==============================================================================
--- branches/upstream/python-omniorb/current/bugfixes-34.xml (added)
+++ branches/upstream/python-omniorb/current/bugfixes-34.xml Tue Mar 22 22:33:38 2011
@@ -1,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
+<?xml-stylesheet type="text/xml" href="buglayout.xml"?>
+
+<!-- The following bugs have been fixed since the omniORBpy 3.4 -->
+<!-- release. This file is transformed into html with bugfixes.xsl. -->
+
+<!-- Editors: make sure the content you add is well-formed XML. -->
+
+<buglist version="3.4">
+
+<bug id="1" date="Fri May 14 13:52:49 BST 2010" user="dgrisby">
+ <summary>Failure using properties as valuetype attributes</summary>
+ <text>
+ A reference counting assumption was not true in the case that a
+ valuetype used a property to implement an attribute, leading to a
+ crash due to premature deallocation.
+ </text>
+</bug>
+
+</buglist>
Modified: branches/upstream/python-omniorb/current/configure
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/configure?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/configure (original)
+++ branches/upstream/python-omniorb/current/configure Tue Mar 22 22:33:38 2011
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for omniORBpy 3.4.
+# Generated by GNU Autoconf 2.63 for omniORBpy 3.5.
#
# Report bugs to <bugs at omniorb-support.com>.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='omniORBpy'
PACKAGE_TARNAME='omniorbpy'
-PACKAGE_VERSION='3.4'
-PACKAGE_STRING='omniORBpy 3.4'
+PACKAGE_VERSION='3.5'
+PACKAGE_STRING='omniORBpy 3.5'
PACKAGE_BUGREPORT='bugs at omniorb-support.com'
ac_unique_file="python/omniORB/CORBA.py"
@@ -705,7 +705,10 @@
CXX
CXXFLAGS
CCC
-CPP'
+CPP
+PKG_CONFIG
+OPENSSL_CFLAGS
+OPENSSL_LIBS'
# Initialize some variables set by options.
@@ -1258,7 +1261,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures omniORBpy 3.4 to adapt to many kinds of systems.
+\`configure' configures omniORBpy 3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1323,7 +1326,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of omniORBpy 3.4:";;
+ short | recursive ) echo "Configuration of omniORBpy 3.5:";;
esac
cat <<\_ACEOF
@@ -1344,6 +1347,11 @@
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ OPENSSL_CFLAGS
+ C compiler flags for OPENSSL, overriding pkg-config
+ OPENSSL_LIBS
+ linker flags for OPENSSL, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1411,7 +1419,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-omniORBpy configure 3.4
+omniORBpy configure 3.5
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1425,7 +1433,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by omniORBpy $as_me 3.4, which was
+It was created by omniORBpy $as_me 3.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -3678,8 +3686,7 @@
# Find any Python interpreter.
if test -z "$PYTHON"; then
- PYTHON=:
- for ac_prog in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+ for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3723,6 +3730,7 @@
test -n "$PYTHON" && break
done
+test -n "$PYTHON" || PYTHON=":"
fi
am_display_PYTHON=python
@@ -3740,7 +3748,7 @@
if test "${am_cv_python_version+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
@@ -3759,7 +3767,7 @@
if test "${am_cv_python_platform+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
$as_echo "$am_cv_python_platform" >&6; }
@@ -3773,8 +3781,29 @@
if test "${am_cv_python_pythondir+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+ if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
$as_echo "$am_cv_python_pythondir" >&6; }
@@ -3790,8 +3819,29 @@
if test "${am_cv_python_pyexecdir+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+ if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
$as_echo "$am_cv_python_pyexecdir" >&6; }
@@ -3854,39 +3904,12 @@
OMNIORB_ROOT=$omni_cv_omniorb_root
-{ $as_echo "$as_me:$LINENO: checking for OpenSSL root" >&5
-$as_echo_n "checking for OpenSSL root... " >&6; }
-if test "${omni_cv_openssl_root+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
-# Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then
- withval=$with_openssl; omni_cv_openssl_root=$withval
-else
- if test "x$prefix" != "xNONE"; then
- omni_cv_openssl_root=$prefix/openssl
- else
- omni_cv_openssl_root=$ac_default_prefix/openssl
- fi
- if test -d $omni_cv_openssl_root/lib; then
- :
- else
- omni_cv_openssl_root=no
- fi
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $omni_cv_openssl_root" >&5
-$as_echo "$omni_cv_openssl_root" >&6; }
-
-
-if test "$omni_cv_openssl_root" = "no"; then
- :
-else
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
@@ -3912,7 +3935,6 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
@@ -3926,12 +3948,110 @@
fi
- if test "$PKG_CONFIG" != "no" ; then
-
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+{ $as_echo "$as_me:$LINENO: checking for OpenSSL root" >&5
+$as_echo_n "checking for OpenSSL root... " >&6; }
+if test "${omni_cv_openssl_root+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then
+ withval=$with_openssl; omni_cv_openssl_root=$withval
+else
+ if test "x$prefix" != "xNONE"; then
+ omni_cv_openssl_root=$prefix/openssl
+ else
+ omni_cv_openssl_root=$ac_default_prefix/openssl
+ fi
+ if test -d $omni_cv_openssl_root/lib; then
+ :
+ else
+ omni_cv_openssl_root=no
+ fi
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $omni_cv_openssl_root" >&5
+$as_echo "$omni_cv_openssl_root" >&6; }
+
+
+if test "$omni_cv_openssl_root" = "no"; then
+ :
+else
+ # Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -3972,63 +4092,79 @@
fi
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- { $as_echo "$as_me:$LINENO: checking for openssl" >&5
-$as_echo_n "checking for openssl... " >&6; }
-
- if $PKG_CONFIG --exists "openssl" ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ if test "$PKG_CONFIG" != "no" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for OPENSSL" >&5
+$as_echo_n "checking for OPENSSL... " >&6; }
+
+if test -n "$OPENSSL_CFLAGS"; then
+ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+ ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$OPENSSL_LIBS"; then
+ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+ ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
+ else
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPENSSL_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ open_ssl_pkgconfig="no"
+elif test $pkg_failed = untried; then
+ open_ssl_pkgconfig="no"
+else
+ OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+ OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- succeeded=yes
-
- { $as_echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
-$as_echo_n "checking OPENSSL_CFLAGS... " >&6; }
- OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl"`
- { $as_echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
-$as_echo "$OPENSSL_CFLAGS" >&6; }
-
- { $as_echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
-$as_echo_n "checking OPENSSL_LIBS... " >&6; }
- OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl"`
- { $as_echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
-$as_echo "$OPENSSL_LIBS" >&6; }
- else
- OPENSSL_CFLAGS=""
- OPENSSL_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
-
- fi
-
-
-
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- open_ssl_root=`$PKG_CONFIG --variable=prefix openssl`
+ open_ssl_root=`$PKG_CONFIG --variable=prefix openssl`
open_ssl_cppflags="$OPENSSL_CFLAGS"
open_ssl_libs="$OPENSSL_LIBS"
open_ssl_pkgconfig="yes"
omni_cv_openssl_root="$open_ssl_root"
- else
- open_ssl_pkgconfig="no"
- fi
-
+fi
fi
if test "$omni_cv_openssl_root" = "yes"; then
if test "x$open_ssl_pkgconfig" != "yes"; then
@@ -4728,7 +4864,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by omniORBpy $as_me 3.4, which was
+This file was extended by omniORBpy $as_me 3.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4778,7 +4914,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-omniORBpy config.status 3.4
+omniORBpy config.status 3.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -4946,7 +5082,8 @@
if test -n "$CONFIG_FILES"; then
-ac_cr='
'
+ac_cr='
+'
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\\r'
Modified: branches/upstream/python-omniorb/current/configure.ac
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/configure.ac?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/configure.ac (original)
+++ branches/upstream/python-omniorb/current/configure.ac Tue Mar 22 22:33:38 2011
@@ -1,5 +1,5 @@
dnl -*- M4 -*-
-AC_INIT(omniORBpy, 3.4, bugs at omniorb-support.com)
+AC_INIT(omniORBpy, 3.5, bugs at omniorb-support.com)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(python/omniORB/CORBA.py)
Modified: branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec (original)
+++ branches/upstream/python-omniorb/current/contrib/RPMs/omniORBpy.spec Tue Mar 22 22:33:38 2011
@@ -1,122 +1,155 @@
-Summary: Python Language Mapping for omniORB
-Name: omniORBpy
-Version: 3.4
-Release: 1
-License: GPL / LGPL
-Group: System/Libraries
-Source0: %{name}-%{version}.tar.gz
-URL: http://omniorb.sourceforge.net/
-Prefix: /usr
-Prereq: /sbin/ldconfig
-Requires: omniORB = 4.1.4
-BuildRequires: omniORB-devel python
+%define version_major 3
+%define version_minor 5
+%define version_full %{version_major}.%{version_minor}
+%define version_brief %{version_major}.%{version_minor}
+
+%define lib_name %{?mklibname:%mklibname %{name} %{version_brief}}%{!?mklibname:lib%{name}%{version_brief}}
+
+%{!?py_ver: %define py_ver %(python -c "import sys;print(sys.version[0:3])")}
+%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True,0,'%{_prefix}')")}
+%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(False,0,'%{_prefix}')")}
+
+Summary: Python Language Mapping for omniORB
+Name: omniORBpy
+Version: %{version_full}
+Release: 1%{?dist}
+License: GPL / LGPL
+Group: System/Libraries
+Source0: %{name}-%{version}.tar.gz
+Prefix: /usr
+URL: http://omniorb.sourceforge.net/
+BuildRequires: gcc-c++
+BuildRequires: glibc-devel openssl-devel
+BuildRequires: omniORB-devel = %{version}
+BuildRequires: python python-devel
Buildroot: %{_tmppath}/%{name}-%{version}-root
%description
-omniORBpy is a Python language mapping for the omniORB CORBA
+%{name} is a Python language mapping for the omniORB CORBA
+Object Request Broker (ORB).
+
+%package -n %{lib_name}
+Summary: Python Language Mapping for omniORB
+Group: System/Libraries
+Requires: libomniORB = %{version}
+Provides: lib%{name} = %{version}-%{release} %{name} = %{version}-%{release}
+Provides: libomniorbpy = %{version}-%{release}
+Conflicts: libomniORBpy < %{version}-%{release}
+Obsoletes: libomniorbpy2
+
+%description -n %{lib_name}
+%{name} is a Python language mapping for the omniORB CORBA
Object Request Broker (ORB).
# "standard" part of the bundle
-%package -n %{name}-standard
-Summary: Files to provide standard top-level CORBA module for %{name}
-Group: Development/Python
-Provides: libomniorbpy-standard = %{version}-%{release} %{name}-standard = %{version}-%{release}
+%package standard
+Summary: Files to provide standard top-level CORBA module for %{name}
+Group: Development/Python
+Provides: omniorbpy-standard = %{version}-%{release}
+Conflicts: %{name}-standard < %{version}-%{release}
-%description -n %{name}-standard
+%description standard
The CORBA to Python mapping standard requires top-level CORBA and
PortableServer modules. This provides those standard modules for
%{name}. It will clash with similar packages for other Python ORBs.
# devel part of the bundle
-%package -n %{name}-devel
-Summary: Header files and libraries needed for %{name} development
-Group: Development/Python
-Requires: %{name} = %{version}-%{release} omniORB-devel
-Provides: libomniorbpy-devel = %{version}-%{release} %{name}-devel = %{version}-%{release}
+%package devel
+Summary: Header files and libraries needed for %{name} development
+Group: Development/Python
+Requires: %{lib_name} = %{version}-%{release} omniORB-devel = %{version}
+Provides: libomniorbpy-devel = %{version}-%{release} omniorbpy-devel = %{version}-%{release}
+Conflicts: %{name}-devel < %{version}-%{release}
+Obsoletes: libomniORBpy-devel
-%description -n %{name}-devel
+%description devel
The header files and libraries needed for developing programs using %{name}.
# docs and examples are in a separate package
-%package -n %{name}-doc
-Summary: Documentation needed for %{name} development
-Group: Development/Python
+%package doc
+Summary: Documentation needed for %{name} development
+Group: Development/Python
+Obsoletes: omniorbpy-doc libomniorbpy-doc
-%description -n %{name}-doc
+%description doc
Developer documentation and examples.
-
-
-%define py_ver %(python -c 'import sys;print(sys.version[0:3])')
%prep
-%setup -n %{name}-%{version}
-#%patch0 -p1
+%setup -n %{name} #-%{version}
# Needs to know where omniORB was installed if it is not in /usr.
-# If necessary, use the configure option --with-omniorb=%{prefix}
-./configure --prefix=%{prefix} --with-openssl=/usr
+# If necessary, use the configure option --with-omniorb=%{_prefix}
+%{?configure:%configure}%{!?configure:./configure --prefix=%{_prefix} --libdir=%{_libdir}} --with-openssl=%{_prefix}
+
%build
# We abuse the CPPFLAGS to pass optimisation options through.
-make IMPORT_CPPFLAGS+="$RPM_OPT_FLAGS" all
+%{?make:%make}%{!?make:make IMPORT_CPPFLAGS+="$RPM_OPT_FLAGS"} all
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+[ -z %{buildroot} ] || rm -rf %{buildroot}
+mkdir %{buildroot}
+
+%if "%{_vendor}" == "suse"
+%{?makeinstall:%makeinstall}%{!?makeinstall:make DESTDIR=%{buildroot} install}
+%else
+%{?make:%make}%{!?make:make} install DESTDIR=%{buildroot}
+%endif
# omit omniidl_be/__init__.py because it is a duplicate of the file
# already provided by omniORB.
-rm -rf $RPM_BUILD_ROOT%{prefix}/lib*/python%{py_ver}/site-packages/omniidl_be/__init__.py*
+rm -rf %{buildroot}%{python_sitelib}/omniidl_be/__init__.py*
%clean
-rm -rf $RPM_BUILD_ROOT
+[ -z %{buildroot} ] || rm -rf %{buildroot}
-%post
+%post -n %{lib_name}
/sbin/ldconfig
-%postun
+%postun -n %{lib_name}
/sbin/ldconfig
# main package includes libraries and servers
-%files
+%files -n %{lib_name}
%defattr (-,root,root)
%doc COPYING.LIB
#%doc bugfixes*
-%prefix/lib*/python%{py_ver}/site-packages/_omni*.so*
-%prefix/lib*/python%{py_ver}/site-packages/omniORB
+%{python_sitearch}/_omni*.so*
+%{python_sitelib}/omniORB
-%files -n %{name}-standard
+%files standard
%defattr(-,root,root)
-%prefix/lib*/python%{py_ver}/site-packages/*.py*
-%prefix/lib*/python%{py_ver}/site-packages/omniORB.pth
-%prefix/lib*/python%{py_ver}/site-packages/CosNaming
-%prefix/lib*/python%{py_ver}/site-packages/CosNaming__POA
+%{python_sitelib}/*.py*
+%{python_sitelib}/omniORB.pth
+%{python_sitelib}/CosNaming
+%{python_sitelib}/CosNaming__POA
-%files -n %{name}-devel
+%files devel
%defattr(-,root,root)
%doc README* ReleaseNotes* update.log
-%prefix/include/omniORBpy.h
-%prefix/include/omniORB4/pydistdate.hh
-%prefix/lib*/python%{py_ver}/site-packages/omniidl_be/python.py*
+%{_includedir}/omniORBpy.h
+%{_includedir}/omniORB4/pydistdate.hh
+%{python_sitelib}/omniidl_be/python.py*
-%files -n %{name}-doc
+%files doc
%defattr(-,root,root)
%doc doc/*
%changelog
-* Fri Dec 16 2005 Thomas Lockhart <lockhart at fourpalms.org> 2.6-3
-- Modified postun syntax to eliminate an error from ldconfig
+* Wed Nov 24 2010 Dirk O. Kaar <dok at dok-net.net> 4.2.0-2
+- Merge in improvements for current RPM from Thomas Lockhart
-* Thu Apr 21 2005 Sander Steffann <steffann at nederland.net> 2.6-2
-- Fixed packaging on RHEL and x86_64
+* Mon Sep 07 2009 Dirk O. Kaar <dok at dok-net.net> 4.2.0-1
+- Use 4.2 sources from SVN
-* Wed Apr 20 2005 Sander Steffann <steffann at nederland.net> 2.6-1
-- Upgrade to version 2.6
+* Thu May 05 2005 Dirk O. Siebnich <dok at dok-net.net> 3.0-1
+- rework package names to support x86_64
* Mon Jul 26 2004 Duncan Grisby <duncan at grisby.org> 2.4
- Bump version number to 2.4.
Modified: branches/upstream/python-omniorb/current/examples/weather/weatherInfo.idl
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/examples/weather/weatherInfo.idl?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/examples/weather/weatherInfo.idl (original)
+++ branches/upstream/python-omniorb/current/examples/weather/weatherInfo.idl Tue Mar 22 22:33:38 2011
@@ -9,13 +9,10 @@
// This server is intended to run on a system with a proper filing system,
// while the weather station is designed to run on ATMOS.
//
-// $Id: weatherInfo.idl,v 1.2.2.1 2003/03/23 21:51:57 dgrisby Exp $
+// $Id: weatherInfo.idl 4760 2003-03-23 21:51:59Z dgrisby $
// $Author: dgrisby $
/*
-$Log: weatherInfo.idl,v $
-Revision 1.2.2.1 2003/03/23 21:51:57 dgrisby
-New omnipy3_develop branch.
-
+$Log$
Revision 1.1 2000/01/06 18:38:06 dpg1
Weather station demo.
Modified: branches/upstream/python-omniorb/current/mk/version.mk
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/mk/version.mk?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/mk/version.mk (original)
+++ branches/upstream/python-omniorb/current/mk/version.mk Tue Mar 22 22:33:38 2011
@@ -4,12 +4,12 @@
OMNITHREAD_MAJOR_VERSION = $(word 1,$(subst ., ,$(OMNITHREAD_VERSION)))
OMNITHREAD_MINOR_VERSION = $(word 2,$(subst ., ,$(OMNITHREAD_VERSION)))
-OMNIORB_VERSION = 4.1.4
-OMNIORB_VERSION_HEX = 0x040104F1
+OMNIORB_VERSION = 4.1.5
+OMNIORB_VERSION_HEX = 0x040105F1
OMNIORB_MAJOR_VERSION = $(word 1,$(subst ., ,$(OMNIORB_VERSION)))
OMNIORB_MINOR_VERSION = $(word 2,$(subst ., ,$(OMNIORB_VERSION)))
OMNIORB_MICRO_VERSION = $(word 3,$(subst ., ,$(OMNIORB_VERSION)))
-OMNIPY_VERSION = 3.4
+OMNIPY_VERSION = 3.5
OMNIPY_MAJOR = $(word 1,$(subst ., ,$(OMNIPY_VERSION)))
OMNIPY_MINOR = $(word 2,$(subst ., ,$(OMNIPY_VERSION)))
Modified: branches/upstream/python-omniorb/current/modules/codesets/pyCodeSets.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/codesets/pyCodeSets.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/codesets/pyCodeSets.cc (original)
+++ branches/upstream/python-omniorb/current/modules/codesets/pyCodeSets.cc Tue Mar 22 22:33:38 2011
@@ -26,12 +26,9 @@
// Description:
// Codesets library
-// $Id: pyCodeSets.cc,v 1.1.4.1 2003/03/23 21:51:56 dgrisby Exp $
+// $Id: pyCodeSets.cc 4760 2003-03-23 21:51:59Z dgrisby $
-// $Log: pyCodeSets.cc,v $
-// Revision 1.1.4.1 2003/03/23 21:51:56 dgrisby
-// New omnipy3_develop branch.
-//
+// $Log$
// Revision 1.1.2.1 2002/09/06 21:34:26 dgrisby
// Add codesets and sslTP modules.
//
Modified: branches/upstream/python-omniorb/current/modules/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/dir.mk?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/dir.mk (original)
+++ branches/upstream/python-omniorb/current/modules/dir.mk Tue Mar 22 22:33:38 2011
@@ -1,4 +1,5 @@
-DIR_CPPFLAGS += -DOMNIPY_MAJOR=$(OMNIPY_MAJOR) -DOMNIPY_MINOR=$(OMNIPY_MINOR)
+DIR_CPPFLAGS += -DOMNIPY_MAJOR=$(OMNIPY_MAJOR) -DOMNIPY_MINOR=$(OMNIPY_MINOR) \
+ -DOMNIPY_VERSION_STRING='"$(OMNIPY_VERSION)"'
CXXSRCS = omnipy.cc \
pyORBFunc.cc \
Modified: branches/upstream/python-omniorb/current/modules/omnipy.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/omnipy.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/omnipy.cc (original)
+++ branches/upstream/python-omniorb/current/modules/omnipy.cc Tue Mar 22 22:33:38 2011
@@ -28,12 +28,9 @@
// Description:
// Main entry points for _omnipy Python module
-// $Id: omnipy.cc,v 1.1.4.21 2009/05/06 16:50:31 dgrisby Exp $
-
-// $Log: omnipy.cc,v $
-// Revision 1.1.4.21 2009/05/06 16:50:31 dgrisby
-// Updated copyright.
-//
+// $Id: omnipy.cc 5975 2010-09-07 13:37:57Z dgrisby $
+
+// $Log$
// Revision 1.1.4.20 2009/05/05 14:26:21 dgrisby
// Remove unused variable.
//
@@ -769,7 +766,7 @@
char* err = new char[80];
sprintf(err, "Operation requires %d argument%s; %d given",
arg_len, (arg_len == 1) ? "" : "s",
- PyTuple_GET_SIZE(op_args));
+ (int)PyTuple_GET_SIZE(op_args));
PyErr_SetString(PyExc_TypeError, err);
delete [] err;
@@ -1055,6 +1052,10 @@
PyObject* m = Py_InitModule((char*)"_omnipy", omnipy_methods);
PyObject* d = PyModule_GetDict(m);
+
+ PyDict_SetItemString(d, (char*)"__version__",
+ PyString_FromString(OMNIPY_VERSION_STRING));
+
PyDict_SetItemString(d, (char*)"omnipyTwinType",
(PyObject*)&omnipyTwinType);
Modified: branches/upstream/python-omniorb/current/modules/omnipy.h
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/omnipy.h?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/omnipy.h (original)
+++ branches/upstream/python-omniorb/current/modules/omnipy.h Tue Mar 22 22:33:38 2011
@@ -31,10 +31,7 @@
#ifndef _omnipy_h_
#define _omnipy_h_
-// $Log: omnipy.h,v $
-// Revision 1.3.2.15 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Log$
// Revision 1.3.2.14 2008/10/09 15:04:36 dgrisby
// Python exceptions occurring during unmarshalling were not properly
// handled. Exception state left set when at traceLevel 0 (thanks
Modified: branches/upstream/python-omniorb/current/modules/pyAbstractIntf.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyAbstractIntf.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyAbstractIntf.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyAbstractIntf.cc Tue Mar 22 22:33:38 2011
@@ -27,10 +27,7 @@
// Description:
// Abstract interface support
-// $Log: pyAbstractIntf.cc,v $
-// Revision 1.1.2.3 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Log$
// Revision 1.1.2.2 2005/06/24 17:36:08 dgrisby
// Support for receiving valuetypes inside Anys; relax requirement for
// old style classes in a lot of places.
Modified: branches/upstream/python-omniorb/current/modules/pyCallDescriptor.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyCallDescriptor.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyCallDescriptor.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyCallDescriptor.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// Implementation of Python call descriptor object
-// $Id: pyCallDescriptor.cc,v 1.1.4.4 2009/05/06 16:50:30 dgrisby Exp $
-// $Log: pyCallDescriptor.cc,v $
-// Revision 1.1.4.4 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyCallDescriptor.cc 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.3 2005/01/07 00:22:32 dgrisby
// Big merge from omnipy2_develop.
//
Modified: branches/upstream/python-omniorb/current/modules/pyContext.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyContext.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyContext.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyContext.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// Context support
-// $Id: pyContext.cc,v 1.1.4.4 2009/05/06 16:50:30 dgrisby Exp $
-// $Log: pyContext.cc,v $
-// Revision 1.1.4.4 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyContext.cc 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.3 2005/06/24 17:36:08 dgrisby
// Support for receiving valuetypes inside Anys; relax requirement for
// old style classes in a lot of places.
Modified: branches/upstream/python-omniorb/current/modules/pyExceptions.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyExceptions.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyExceptions.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyExceptions.cc Tue Mar 22 22:33:38 2011
@@ -28,12 +28,9 @@
// Description:
// Exception handling functions
-// $Id: pyExceptions.cc,v 1.1.4.10 2009/05/06 16:50:30 dgrisby Exp $
-
-// $Log: pyExceptions.cc,v $
-// Revision 1.1.4.10 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyExceptions.cc 5868 2009-05-06 16:50:31Z dgrisby $
+
+// $Log$
// Revision 1.1.4.9 2008/10/09 15:04:36 dgrisby
// Python exceptions occurring during unmarshalling were not properly
// handled. Exception state left set when at traceLevel 0 (thanks
Modified: branches/upstream/python-omniorb/current/modules/pyFixed.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyFixed.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyFixed.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyFixed.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// Implementation of Fixed type for Python
-// $Id: pyFixed.cc,v 1.1.4.3 2009/05/06 16:50:30 dgrisby Exp $
-// $Log: pyFixed.cc,v $
-// Revision 1.1.4.3 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyFixed.cc 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.2 2005/01/07 00:22:32 dgrisby
// Big merge from omnipy2_develop.
//
Modified: branches/upstream/python-omniorb/current/modules/pyFixed.h
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyFixed.h?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyFixed.h (original)
+++ branches/upstream/python-omniorb/current/modules/pyFixed.h Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// Implementation of Fixed type for Python
-// $Id: pyFixed.h,v 1.1.4.3 2009/05/06 16:50:30 dgrisby Exp $
-// $Log: pyFixed.h,v $
-// Revision 1.1.4.3 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyFixed.h 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.2 2005/01/07 00:22:32 dgrisby
// Big merge from omnipy2_develop.
//
Modified: branches/upstream/python-omniorb/current/modules/pyInterceptors.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyInterceptors.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyInterceptors.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyInterceptors.cc Tue Mar 22 22:33:38 2011
@@ -26,11 +26,8 @@
// Description:
// Python request interceptors
-// $Id: pyInterceptors.cc,v 1.1.4.4 2009/05/06 16:50:30 dgrisby Exp $
-// $Log: pyInterceptors.cc,v $
-// Revision 1.1.4.4 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyInterceptors.cc 5976 2010-09-07 15:06:04Z dgrisby $
+// $Log$
// Revision 1.1.4.3 2006/06/05 11:51:00 dgrisby
// Track ORB core interceptor change.
//
@@ -61,11 +58,13 @@
// Python lists of interceptor functions
-static PyObject* clientSendRequestFns = 0;
-static PyObject* clientReceiveReplyFns = 0;
-static PyObject* serverReceiveRequestFns = 0;
-static PyObject* serverSendReplyFns = 0;
-static PyObject* serverSendExceptionFns = 0;
+static PyObject* clientSendRequestFns = 0;
+static PyObject* clientReceiveReplyFns = 0;
+static PyObject* clientReceiveReplyCredsFns = 0;
+static PyObject* serverReceiveRequestFns = 0;
+static PyObject* serverReceiveRequestCredsFns = 0;
+static PyObject* serverSendReplyFns = 0;
+static PyObject* serverSendExceptionFns = 0;
static inline
@@ -166,17 +165,42 @@
void
getContextsAndCallInterceptors(PyObject* fnlist,
const char* opname,
+ int pass_peer_info,
+ const char* peer_address,
+ const char* peer_identity,
IOP::ServiceContextList& service_contexts,
CORBA::CompletionStatus completion)
{
int i;
int sclen = service_contexts.length();
- PyObject* argtuple = PyTuple_New(2);
+ PyObject* argtuple = PyTuple_New(pass_peer_info ? 3 : 2);
PyObject* sctuple = PyTuple_New(sclen);
PyTuple_SET_ITEM(argtuple, 0, PyString_FromString(opname));
PyTuple_SET_ITEM(argtuple, 1, sctuple);
+
+ if (pass_peer_info) {
+ PyObject* peer_info = PyDict_New();
+ PyObject* value;
+ if (peer_address) {
+ value = PyString_FromString(peer_address);
+ }
+ else {
+ Py_INCREF(Py_None);
+ value = Py_None;
+ }
+ PyDict_SetItemString(peer_info, "address", value);
+ if (peer_identity) {
+ value = PyString_FromString(peer_identity);
+ }
+ else {
+ Py_INCREF(Py_None);
+ value = Py_None;
+ }
+ PyDict_SetItemString(peer_info, "identity", value);
+ PyTuple_SET_ITEM(argtuple, 2, peer_info);
+ }
for (i=0; i < sclen; i++) {
PyObject* sc = PyTuple_New(2);
@@ -238,11 +262,30 @@
omnipyThreadCache::lock _t;
- getContextsAndCallInterceptors(clientReceiveReplyFns,
- info.giop_c.operation(),
- info.service_contexts,
- (CORBA::CompletionStatus)
- info.giop_c.completion());
+ if (PyList_Size(clientReceiveReplyFns)) {
+
+ getContextsAndCallInterceptors(clientReceiveReplyFns,
+ info.giop_c.operation(),
+ 0, 0, 0,
+ info.service_contexts,
+ (CORBA::CompletionStatus)
+ info.giop_c.completion());
+ }
+
+ if (PyList_Size(clientReceiveReplyCredsFns)) {
+
+ giopStrand& strand = (omni::giopStrand&) info.giop_c;
+ giopConnection* connection = strand.connection;
+ const char* address = connection->peeraddress();
+ const char* identity = connection->peeridentity();
+
+ getContextsAndCallInterceptors(clientReceiveReplyCredsFns,
+ info.giop_c.operation(),
+ 1, address, identity,
+ info.service_contexts,
+ (CORBA::CompletionStatus)
+ info.giop_c.completion());
+ }
return 1;
}
@@ -255,11 +298,29 @@
omnipyThreadCache::lock _t;
- getContextsAndCallInterceptors(serverReceiveRequestFns,
- info.giop_s.operation(),
- info.giop_s.service_contexts(),
- (CORBA::CompletionStatus)
- info.giop_s.completion());
+ if (PyList_Size(serverReceiveRequestFns)) {
+ getContextsAndCallInterceptors(serverReceiveRequestFns,
+ info.giop_s.operation(),
+ 0, 0, 0,
+ info.giop_s.service_contexts(),
+ (CORBA::CompletionStatus)
+ info.giop_s.completion());
+ }
+
+ if (PyList_Size(serverReceiveRequestCredsFns)) {
+
+ giopStrand& strand = (omni::giopStrand&) info.giop_s;
+ giopConnection* connection = strand.connection;
+ const char* address = connection->peeraddress();
+ const char* identity = connection->peeridentity();
+
+ getContextsAndCallInterceptors(serverReceiveRequestCredsFns,
+ info.giop_s.operation(),
+ 1, address, identity,
+ info.giop_s.service_contexts(),
+ (CORBA::CompletionStatus)
+ info.giop_s.completion());
+ }
return 1;
}
@@ -306,10 +367,10 @@
if (clientSendRequestFns)
interceptors->clientSendRequest.add(pyClientSendRequestFn);
- if (clientReceiveReplyFns)
+ if (clientReceiveReplyFns || clientReceiveReplyCredsFns)
interceptors->clientReceiveReply.add(pyClientReceiveReplyFn);
- if (serverReceiveRequestFns)
+ if (serverReceiveRequestFns || serverReceiveRequestCredsFns)
interceptors->serverReceiveRequest.add(pyServerReceiveRequestFn);
if (serverSendReplyFns)
@@ -366,7 +427,8 @@
{
PyObject* interceptor;
- if (!PyArg_ParseTuple(args, (char*)"O", &interceptor))
+ int pass_creds = 0;
+ if (!PyArg_ParseTuple(args, (char*)"O|i", &interceptor, &pass_creds))
return 0;
RAISE_PY_BAD_PARAM_IF(!PyCallable_Check(interceptor),
@@ -374,10 +436,16 @@
CHECK_ORB_NOT_INITIALISED();
- if (!clientReceiveReplyFns)
- clientReceiveReplyFns = PyList_New(0);
-
- PyList_Append(clientReceiveReplyFns, interceptor);
+ if (!clientReceiveReplyFns) {
+ clientReceiveReplyFns = PyList_New(0);
+ clientReceiveReplyCredsFns = PyList_New(0);
+ }
+
+ if (pass_creds)
+ PyList_Append(clientReceiveReplyCredsFns, interceptor);
+ else
+ PyList_Append(clientReceiveReplyFns, interceptor);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -392,7 +460,8 @@
{
PyObject* interceptor;
- if (!PyArg_ParseTuple(args, (char*)"O", &interceptor))
+ int pass_creds = 0;
+ if (!PyArg_ParseTuple(args, (char*)"O|i", &interceptor, &pass_creds))
return 0;
RAISE_PY_BAD_PARAM_IF(!PyCallable_Check(interceptor),
@@ -400,10 +469,16 @@
CHECK_ORB_NOT_INITIALISED();
- if (!serverReceiveRequestFns)
- serverReceiveRequestFns = PyList_New(0);
-
- PyList_Append(serverReceiveRequestFns, interceptor);
+ if (!serverReceiveRequestFns) {
+ serverReceiveRequestFns = PyList_New(0);
+ serverReceiveRequestCredsFns = PyList_New(0);
+ }
+
+ if (pass_creds)
+ PyList_Append(serverReceiveRequestCredsFns, interceptor);
+ else
+ PyList_Append(serverReceiveRequestFns, interceptor);
+
Py_INCREF(Py_None);
return Py_None;
}
Modified: branches/upstream/python-omniorb/current/modules/pyLocalObjects.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyLocalObjects.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyLocalObjects.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyLocalObjects.cc Tue Mar 22 22:33:38 2011
@@ -28,12 +28,9 @@
// Description:
// Implementation of Python servant object
-// $Id: pyLocalObjects.cc,v 1.1.2.3 2009/05/06 16:50:30 dgrisby Exp $
-
-// $Log: pyLocalObjects.cc,v $
-// Revision 1.1.2.3 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyLocalObjects.cc 5868 2009-05-06 16:50:31Z dgrisby $
+
+// $Log$
// Revision 1.1.2.2 2008/10/09 15:04:36 dgrisby
// Python exceptions occurring during unmarshalling were not properly
// handled. Exception state left set when at traceLevel 0 (thanks
Modified: branches/upstream/python-omniorb/current/modules/pyMarshal.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyMarshal.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyMarshal.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyMarshal.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// Marshalling / unmarshalling of Python objects
-// $Id: pyMarshal.cc,v 1.1.4.14 2009/05/06 16:50:30 dgrisby Exp $
-// $Log: pyMarshal.cc,v $
-// Revision 1.1.4.14 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyMarshal.cc 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.13 2009/05/05 14:26:54 dgrisby
// Tolerate unpickled enum items.
//
Modified: branches/upstream/python-omniorb/current/modules/pyORBFunc.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyORBFunc.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyORBFunc.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyORBFunc.cc Tue Mar 22 22:33:38 2011
@@ -28,12 +28,9 @@
// Description:
// ORB functions
-// $Id: pyORBFunc.cc,v 1.1.4.6 2009/05/06 16:50:30 dgrisby Exp $
-
-// $Log: pyORBFunc.cc,v $
-// Revision 1.1.4.6 2009/05/06 16:50:30 dgrisby
-// Updated copyright.
-//
+// $Id: pyORBFunc.cc 5868 2009-05-06 16:50:31Z dgrisby $
+
+// $Log$
// Revision 1.1.4.5 2009/03/13 13:57:56 dgrisby
// Bind orb.register_initial_reference. Thanks Wei Jiang.
//
Modified: branches/upstream/python-omniorb/current/modules/pyObjectRef.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyObjectRef.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyObjectRef.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyObjectRef.cc Tue Mar 22 22:33:38 2011
@@ -29,11 +29,8 @@
// Versions of ORB object ref functions which deal with Python
// objects, rather than C++ objects
-// $Id: pyObjectRef.cc,v 1.1.4.9 2009/05/06 16:50:28 dgrisby Exp $
-// $Log: pyObjectRef.cc,v $
-// Revision 1.1.4.9 2009/05/06 16:50:28 dgrisby
-// Updated copyright.
-//
+// $Id: pyObjectRef.cc 5940 2010-02-27 20:08:21Z dgrisby $
+// $Log$
// Revision 1.1.4.8 2008/10/09 15:04:36 dgrisby
// Python exceptions occurring during unmarshalling were not properly
// handled. Exception state left set when at traceLevel 0 (thanks
@@ -346,9 +343,12 @@
OMNIORB_ASSERT(targetRepoId);
OMNIORB_ASSERT(ior);
+ CORBA::Boolean called_create = 0;
+
if (!id) {
ior->duplicate(); // consumed by createIdentity
id = omni::createIdentity(ior, omniPy::string_Py_omniServant, locked);
+ called_create = 1;
if (!id) {
ior->release();
return 0;
@@ -383,6 +383,8 @@
{
omni_optional_lock sync(*omni::internalLock, locked, locked);
id->gainRef(objref);
+ if (called_create)
+ id->loseRef();
}
if (orbParameters::persistentId.length()) {
Modified: branches/upstream/python-omniorb/current/modules/pyPOACurrentFunc.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyPOACurrentFunc.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyPOACurrentFunc.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyPOACurrentFunc.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// PortableServer::Current functions
-// $Id: pyPOACurrentFunc.cc,v 1.1.4.4 2009/05/06 16:50:28 dgrisby Exp $
-// $Log: pyPOACurrentFunc.cc,v $
-// Revision 1.1.4.4 2009/05/06 16:50:28 dgrisby
-// Updated copyright.
-//
+// $Id: pyPOACurrentFunc.cc 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.3 2008/04/03 09:05:26 dgrisby
// Leaks of some exception classes. Thanks Luke Deller.
//
Modified: branches/upstream/python-omniorb/current/modules/pyPOAFunc.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyPOAFunc.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyPOAFunc.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyPOAFunc.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// POA functions
-// $Id: pyPOAFunc.cc,v 1.1.4.7 2009/05/06 16:50:28 dgrisby Exp $
-// $Log: pyPOAFunc.cc,v $
-// Revision 1.1.4.7 2009/05/06 16:50:28 dgrisby
-// Updated copyright.
-//
+// $Id: pyPOAFunc.cc 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.6 2008/04/03 09:05:26 dgrisby
// Leaks of some exception classes. Thanks Luke Deller.
//
Modified: branches/upstream/python-omniorb/current/modules/pyPOAManagerFunc.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyPOAManagerFunc.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyPOAManagerFunc.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyPOAManagerFunc.cc Tue Mar 22 22:33:38 2011
@@ -28,12 +28,9 @@
// Description:
// POAManager functions
-// $Id: pyPOAManagerFunc.cc,v 1.1.4.3 2009/05/06 16:50:28 dgrisby Exp $
-
-// $Log: pyPOAManagerFunc.cc,v $
-// Revision 1.1.4.3 2009/05/06 16:50:28 dgrisby
-// Updated copyright.
-//
+// $Id: pyPOAManagerFunc.cc 5868 2009-05-06 16:50:31Z dgrisby $
+
+// $Log$
// Revision 1.1.4.2 2008/04/03 09:05:25 dgrisby
// Leaks of some exception classes. Thanks Luke Deller.
//
Modified: branches/upstream/python-omniorb/current/modules/pyServant.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyServant.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyServant.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyServant.cc Tue Mar 22 22:33:38 2011
@@ -28,12 +28,9 @@
// Description:
// Implementation of Python servant object
-// $Id: pyServant.cc,v 1.1.4.13 2009/06/18 09:05:20 dgrisby Exp $
-
-// $Log: pyServant.cc,v $
-// Revision 1.1.4.13 2009/06/18 09:05:20 dgrisby
-// Suppress a compiler warning.
-//
+// $Id: pyServant.cc 5879 2009-06-18 09:05:20Z dgrisby $
+
+// $Log$
// Revision 1.1.4.12 2009/05/06 16:50:28 dgrisby
// Updated copyright.
//
Modified: branches/upstream/python-omniorb/current/modules/pyThreadCache.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyThreadCache.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyThreadCache.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyThreadCache.cc Tue Mar 22 22:33:38 2011
@@ -29,12 +29,9 @@
// Cached mapping from threads to PyThreadState and
// threading.Thread objects
-// $Id: pyThreadCache.cc,v 1.1.4.7 2009/05/06 16:50:27 dgrisby Exp $
-
-// $Log: pyThreadCache.cc,v $
-// Revision 1.1.4.7 2009/05/06 16:50:27 dgrisby
-// Updated copyright.
-//
+// $Id: pyThreadCache.cc 5868 2009-05-06 16:50:31Z dgrisby $
+
+// $Log$
// Revision 1.1.4.6 2005/07/22 17:41:07 dgrisby
// Update from omnipy2_develop.
//
Modified: branches/upstream/python-omniorb/current/modules/pyThreadCache.h
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyThreadCache.h?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyThreadCache.h (original)
+++ branches/upstream/python-omniorb/current/modules/pyThreadCache.h Tue Mar 22 22:33:38 2011
@@ -29,12 +29,9 @@
// Cached mapping from threads to PyThreadState and
// threading.Thread objects
-// $Id: pyThreadCache.h,v 1.1.4.5 2009/05/06 16:50:27 dgrisby Exp $
+// $Id: pyThreadCache.h 5868 2009-05-06 16:50:31Z dgrisby $
-// $Log: pyThreadCache.h,v $
-// Revision 1.1.4.5 2009/05/06 16:50:27 dgrisby
-// Updated copyright.
-//
+// $Log$
// Revision 1.1.4.4 2005/03/02 13:39:16 dgrisby
// Another merge from omnipy2_develop.
//
Modified: branches/upstream/python-omniorb/current/modules/pyTypeCode.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyTypeCode.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyTypeCode.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyTypeCode.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// TypeCode support
-// $Id: pyTypeCode.cc,v 1.1.4.10 2009/05/06 16:50:27 dgrisby Exp $
-// $Log: pyTypeCode.cc,v $
-// Revision 1.1.4.10 2009/05/06 16:50:27 dgrisby
-// Updated copyright.
-//
+// $Id: pyTypeCode.cc 5957 2010-05-14 12:54:47Z dgrisby $
+// $Log$
// Revision 1.1.4.9 2007/09/18 20:04:14 dgrisby
// Set _parent_id on enums generated from TypeCodes.
//
@@ -1380,9 +1377,15 @@
offset <<= stream;
position = tc_offset + 4 + offset;
- if (!odm.lookup(t_o, position))
+ if (!odm.lookup(t_o, position)) {
+ if (omniORB::trace(10)) {
+ omniORB::logger log;
+ log << "Invalid indirection " << offset << " to " << position
+ << ".\n";
+ }
OMNIORB_THROW(MARSHAL, MARSHAL_InvalidIndirection,
(CORBA::CompletionStatus)stream.completion());
+ }
d_o = PyTuple_New(2); odm.add(d_o, tc_offset);
PyTuple_SET_ITEM(d_o, 0, PyInt_FromLong(tk));
Modified: branches/upstream/python-omniorb/current/modules/pyValueType.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyValueType.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyValueType.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyValueType.cc Tue Mar 22 22:33:38 2011
@@ -27,10 +27,7 @@
// Description:
// ValueType support
-// $Log: pyValueType.cc,v $
-// Revision 1.1.2.15 2009/05/06 16:50:27 dgrisby
-// Updated copyright.
-//
+// $Log$
// Revision 1.1.2.14 2006/09/20 14:10:13 dgrisby
// Indirections could be wrong in valuebox marshalling, because alignment
// was not set before position calculation.
@@ -317,12 +314,14 @@
validateMembers(d_o, a_o, compstatus, track);
- if (track_alloc)
+ if (track_alloc) {
Py_DECREF(track);
+ }
}
catch (...) {
- if (track_alloc)
+ if (track_alloc) {
Py_DECREF(track);
+ }
throw;
}
}
@@ -527,7 +526,7 @@
name = PyTuple_GET_ITEM(d_o, j);
value = PyObject_GetAttr(a_o, name);
- Py_DECREF(value); // Safe to DECREF now because object still holds a ref
+ omniPy::PyRefHolder h(value);
omniPy::marshalPyObject(stream, PyTuple_GET_ITEM(d_o, j+1), value);
}
}
Modified: branches/upstream/python-omniorb/current/modules/pyomniFunc.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/pyomniFunc.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/pyomniFunc.cc (original)
+++ branches/upstream/python-omniorb/current/modules/pyomniFunc.cc Tue Mar 22 22:33:38 2011
@@ -28,11 +28,8 @@
// Description:
// omniORB API functions
-// $Id: pyomniFunc.cc,v 1.1.4.10 2009/05/06 16:50:26 dgrisby Exp $
-// $Log: pyomniFunc.cc,v $
-// Revision 1.1.4.10 2009/05/06 16:50:26 dgrisby
-// Updated copyright.
-//
+// $Id: pyomniFunc.cc 5868 2009-05-06 16:50:31Z dgrisby $
+// $Log$
// Revision 1.1.4.9 2008/10/09 15:04:36 dgrisby
// Python exceptions occurring during unmarshalling were not properly
// handled. Exception state left set when at traceLevel 0 (thanks
Modified: branches/upstream/python-omniorb/current/modules/sslTP/pysslTP.cc
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/modules/sslTP/pysslTP.cc?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/modules/sslTP/pysslTP.cc (original)
+++ branches/upstream/python-omniorb/current/modules/sslTP/pysslTP.cc Tue Mar 22 22:33:38 2011
@@ -26,12 +26,9 @@
// Description:
// SSL transport library
-// $Id: pysslTP.cc,v 1.1.4.1 2003/03/23 21:51:56 dgrisby Exp $
+// $Id: pysslTP.cc 4760 2003-03-23 21:51:59Z dgrisby $
-// $Log: pysslTP.cc,v $
-// Revision 1.1.4.1 2003/03/23 21:51:56 dgrisby
-// New omnipy3_develop branch.
-//
+// $Log$
// Revision 1.1.2.2 2002/12/19 11:09:10 dgrisby
// Rearrange includes to avoid crypt() clash.
//
Modified: branches/upstream/python-omniorb/current/omniidl_be/python.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/omniidl_be/python.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/omniidl_be/python.py (original)
+++ branches/upstream/python-omniorb/current/omniidl_be/python.py Tue Mar 22 22:33:38 2011
@@ -27,11 +27,8 @@
#
# Back-end for Python
-# $Id: python.py,v 1.33.2.15 2009/05/06 16:50:25 dgrisby Exp $
-# $Log: python.py,v $
-# Revision 1.33.2.15 2009/05/06 16:50:25 dgrisby
-# Updated copyright.
-#
+# $Id: python.py 5926 2009-10-07 16:25:38Z dgrisby $
+# $Log$
# Revision 1.33.2.14 2008/02/01 16:29:17 dgrisby
# Error with implementation of operations with names clashing with
# Python keywords.
@@ -993,8 +990,13 @@
if node.mainFile() or output_inline:
exported_modules[sname] = 1
+ if parentmodname == self.outpymodule:
+ end_package = ""
+ else:
+ end_package = module_package
+
self.st.out(module_end, modname=parentmodname, sname=sname,
- package=module_package)
+ package=end_package)
#
# Forward interface
Modified: branches/upstream/python-omniorb/current/python/omniORB/BiDirPolicy.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/BiDirPolicy.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/BiDirPolicy.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/BiDirPolicy.py Tue Mar 22 22:33:38 2011
@@ -27,10 +27,7 @@
# Description:
# Definitions for BiDirPolicy module
-# $Log: BiDirPolicy.py,v $
-# Revision 1.1.4.2 2009/05/06 16:50:25 dgrisby
-# Updated copyright.
-#
+# $Log$
# Revision 1.1.4.1 2005/01/07 00:22:34 dgrisby
# Big merge from omnipy2_develop.
#
Modified: branches/upstream/python-omniorb/current/python/omniORB/CORBA.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/CORBA.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/CORBA.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/CORBA.py Tue Mar 22 22:33:38 2011
@@ -29,11 +29,8 @@
# Definitions for CORBA module
-# $Id: CORBA.py,v 1.31.2.15 2009/05/06 16:50:25 dgrisby Exp $
-# $Log: CORBA.py,v $
-# Revision 1.31.2.15 2009/05/06 16:50:25 dgrisby
-# Updated copyright.
-#
+# $Id: CORBA.py 5951 2010-05-06 15:48:21Z dgrisby $
+# $Log$
# Revision 1.31.2.14 2009/03/13 13:57:56 dgrisby
# Bind orb.register_initial_reference. Thanks Wei Jiang.
#
@@ -323,6 +320,9 @@
def _tuple(self):
return tuple(self)
+
+ def __reduce__(self):
+ return (self.__class__, self.__args)
# All the standard system exceptions...
Modified: branches/upstream/python-omniorb/current/python/omniORB/PortableServer.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/PortableServer.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/PortableServer.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/PortableServer.py Tue Mar 22 22:33:38 2011
@@ -29,11 +29,8 @@
# PortableServer module
-# $Id: PortableServer.py,v 1.9.2.5 2009/05/06 16:50:24 dgrisby Exp $
-# $Log: PortableServer.py,v $
-# Revision 1.9.2.5 2009/05/06 16:50:24 dgrisby
-# Updated copyright.
-#
+# $Id: PortableServer.py 5868 2009-05-06 16:50:31Z dgrisby $
+# $Log$
# Revision 1.9.2.4 2006/01/19 17:28:44 dgrisby
# Merge from omnipy2_develop.
#
Modified: branches/upstream/python-omniorb/current/python/omniORB/PortableServer__POA.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/PortableServer__POA.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/PortableServer__POA.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/PortableServer__POA.py Tue Mar 22 22:33:38 2011
@@ -27,11 +27,8 @@
# Description:
# PortableServer skeletons
-# $Id: PortableServer__POA.py,v 1.2.2.1 2003/03/23 21:51:43 dgrisby Exp $
-# $Log: PortableServer__POA.py,v $
-# Revision 1.2.2.1 2003/03/23 21:51:43 dgrisby
-# New omnipy3_develop branch.
-#
+# $Id: PortableServer__POA.py 4760 2003-03-23 21:51:59Z dgrisby $
+# $Log$
# Revision 1.1.4.1 2002/01/18 15:49:45 dpg1
# Context support. New system exception construction. Fix None call problem.
#
Modified: branches/upstream/python-omniorb/current/python/omniORB/URI.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/URI.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/URI.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/URI.py Tue Mar 22 22:33:38 2011
@@ -27,12 +27,9 @@
# Description:
# URI handling functions
-# $Id: URI.py,v 1.2.2.1 2003/03/23 21:51:43 dgrisby Exp $
+# $Id: URI.py 4760 2003-03-23 21:51:59Z dgrisby $
-# $Log: URI.py,v $
-# Revision 1.2.2.1 2003/03/23 21:51:43 dgrisby
-# New omnipy3_develop branch.
-#
+# $Log$
# Revision 1.1.4.1 2002/03/11 15:40:05 dpg1
# _get_interface support, exception minor codes.
#
Modified: branches/upstream/python-omniorb/current/python/omniORB/__init__.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/__init__.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/__init__.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/__init__.py Tue Mar 22 22:33:38 2011
@@ -29,11 +29,8 @@
# omniORB module -- omniORB specific things
-# $Id: __init__.py,v 1.30.2.24 2009/06/18 09:13:47 dgrisby Exp $
-# $Log: __init__.py,v $
-# Revision 1.30.2.24 2009/06/18 09:13:47 dgrisby
-# Track change in Python 2.6's threading module. Thanks Luke Deller.
-#
+# $Id: __init__.py 5975 2010-09-07 13:37:57Z dgrisby $
+# $Log$
# Revision 1.30.2.23 2009/05/06 16:50:23 dgrisby
# Updated copyright.
#
@@ -257,6 +254,7 @@
import _omnipy
_coreVersion = _omnipy.coreVersion()
+__version__ = _omnipy.__version__
# Make sure _omnipy submodules are in sys.modules, and have not been
@@ -423,7 +421,14 @@
resulting string in this case is the raw marshalled form, not a CDR
encapsulation. To unmarshal it, the endianness must be known.
-Throws CORBA.BAD_PARAM if the data does not match the TypeCode."""
+CORBA.ORB_init must be called before using this function.
+
+Throws CORBA.BAD_PARAM if the data does not match the TypeCode or
+CORBA.BAD_INV_ORDER if the ORB has not been initialised."""
+
+ if orb is None:
+ raise CORBA.BAD_INV_ORDER(BAD_INV_ORDER_ORBNotInitialised,
+ CORBA.COMPLETED_NO)
if not isinstance(tc, CORBA.TypeCode):
raise TypeError("Argument 1 must be a TypeCode")
@@ -442,8 +447,14 @@
encapsulation. If the endianness does not match that used for
marshalling, invalid data may be returned, or exceptions raised.
-Throws CORBA.MARSHAL if the binary string does not match the
-TypeCode."""
+CORBA.ORB_init must be called before using this function.
+
+Throws CORBA.MARSHAL if the binary string does not match the TypeCode
+or CORBA.BAD_INV_ORDER if the ORB has not been initialised."""
+
+ if orb is None:
+ raise CORBA.BAD_INV_ORDER(BAD_INV_ORDER_ORBNotInitialised,
+ CORBA.COMPLETED_NO)
if not isinstance(tc, CORBA.TypeCode):
raise TypeError("Argument 1 must be a TypeCode")
Modified: branches/upstream/python-omniorb/current/python/omniORB/codesets.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/codesets.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/codesets.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/codesets.py Tue Mar 22 22:33:38 2011
@@ -27,11 +27,8 @@
# Description:
# Import this to get extra code sets.
-# $Id: codesets.py,v 1.1.4.1 2003/03/23 21:51:43 dgrisby Exp $
-# $Log: codesets.py,v $
-# Revision 1.1.4.1 2003/03/23 21:51:43 dgrisby
-# New omnipy3_develop branch.
-#
+# $Id: codesets.py 4760 2003-03-23 21:51:59Z dgrisby $
+# $Log$
# Revision 1.1.2.1 2002/09/06 21:34:26 dgrisby
# Add codesets and sslTP modules.
#
Modified: branches/upstream/python-omniorb/current/python/omniORB/interceptors.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/interceptors.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/interceptors.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/interceptors.py Tue Mar 22 22:33:38 2011
@@ -27,11 +27,8 @@
# Description:
# Python request interceptors
-# $Id: interceptors.py,v 1.1.4.2 2005/06/24 15:43:23 dgrisby Exp $
-# $Log: interceptors.py,v $
-# Revision 1.1.4.2 2005/06/24 15:43:23 dgrisby
-# Update documentation.
-#
+# $Id: interceptors.py 5264 2005-06-24 15:43:24Z dgrisby $
+# $Log$
# Revision 1.1.4.1 2005/01/07 00:22:35 dgrisby
# Big merge from omnipy2_develop.
#
Modified: branches/upstream/python-omniorb/current/python/omniORB/sslTP.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/sslTP.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/sslTP.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/sslTP.py Tue Mar 22 22:33:38 2011
@@ -27,11 +27,8 @@
# Description:
# Import this to enable the SSL transport.
-# $Id: sslTP.py,v 1.1.4.1 2003/03/23 21:51:43 dgrisby Exp $
-# $Log: sslTP.py,v $
-# Revision 1.1.4.1 2003/03/23 21:51:43 dgrisby
-# New omnipy3_develop branch.
-#
+# $Id: sslTP.py 4760 2003-03-23 21:51:59Z dgrisby $
+# $Log$
# Revision 1.1.2.1 2002/09/06 21:34:26 dgrisby
# Add codesets and sslTP modules.
#
Modified: branches/upstream/python-omniorb/current/python/omniORB/tcInternal.py
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/python/omniORB/tcInternal.py?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/python/omniORB/tcInternal.py (original)
+++ branches/upstream/python-omniorb/current/python/omniORB/tcInternal.py Tue Mar 22 22:33:38 2011
@@ -29,11 +29,8 @@
# TypeCode internal implementation
-# $Id: tcInternal.py,v 1.13.2.12 2009/05/06 16:50:22 dgrisby Exp $
-# $Log: tcInternal.py,v $
-# Revision 1.13.2.12 2009/05/06 16:50:22 dgrisby
-# Updated copyright.
-#
+# $Id: tcInternal.py 5868 2009-05-06 16:50:31Z dgrisby $
+# $Log$
# Revision 1.13.2.11 2007/06/06 17:59:01 dgrisby
# Allow enums to be used directly in CORBA.TypeCode().
#
Modified: branches/upstream/python-omniorb/current/update.log
URL: http://svn.debian.org/wsvn/pkg-corba/branches/upstream/python-omniorb/current/update.log?rev=238&op=diff
==============================================================================
--- branches/upstream/python-omniorb/current/update.log (original)
+++ branches/upstream/python-omniorb/current/update.log Tue Mar 22 22:33:38 2011
@@ -1,3 +1,110 @@
+Wed Dec 22 15:59:17 GMT 2010 dgrisby
+====================================
+
+- This is omniORBpy 3.5.
+
+
+Mon Dec 20 22:07:35 GMT 2010 dgrisby
+====================================
+
+- Updates for 3.5 release.
+
+README.txt
+ReleaseNotes.txt
+THIS_IS_OMNIORBPY_3_4
+THIS_IS_OMNIORBPY_3_5
+aclocal.m4
+bugfixes-34.xml
+configure.ac
+configure
+mk/version.mk
+
+
+Wed Dec 8 12:27:01 GMT 2010 dgrisby
+====================================
+
+- Updated RPM spec files from Dirk O Kaar and Thomas Lockhart.
+
+contrib/RPMs/omniORBpy.spec
+contrib/RPMs/omniORBpy_new.spec
+
+
+Tue Sep 7 16:04:46 BST 2010 dgrisby
+====================================
+
+- Allow passing of peer address and identity to interceptors. Thanks
+ Konstantin Olkhovskiy.
+
+modules/pyInterceptors.cc
+
+
+Tue Sep 7 14:36:11 BST 2010 dgrisby
+====================================
+
+- Some braces to make gcc happy.
+
+modules/pyValueType.cc
+
+- Put omniORBpy version in __version__.
+
+modules/dir.mk
+modules/omnipy.cc
+python/omniORB/__init__.py
+
+
+Fri May 14 13:52:49 BST 2010 dgrisby
+====================================
+
+- Wrong sprintf argument size.
+
+modules/omnipy.cc
+
+- Better logging when receiving invalid indirections.
+
+modules/pyTypeCode.cc
+
+- Premature decref caused problems with properties used as valuetype
+ attributes.
+
+modules/pyValueType.cc
+
+
+Thu May 6 16:47:33 BST 2010 dgrisby
+====================================
+
+- Allow exceptions to be pickled. Thanks Luke Deller.
+
+python/omniORB/CORBA.py
+
+
+Thu May 6 16:21:52 BST 2010 dgrisby
+====================================
+
+- Updated spec files from Thomas Lockhart.
+
+contrib/RPMs/omniORBpy.spec
+
+
+Sat Feb 27 20:07:35 GMT 2010 dgrisby
+====================================
+
+- Ensure a reference to the identity is held for the duration it is required.
+
+modules/pyObjectRef.cc
+
+- Raise BAD_INV_ORDER from cdrMarshal / cdrUnmarshal if ORB is not initialised.
+
+python/omniORB/__init__.py
+
+
+Wed Oct 7 17:24:23 BST 2009 dgrisby
+====================================
+
+- File __name__ set incorrectly at end of a module when using -Wbpackage.
+
+omniidl_be/python.py
+
+
Thu Jul 16 16:16:19 BST 2009 dgrisby
====================================
More information about the Pkg-corba-commits
mailing list