You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2015/11/23 18:57:31 UTC
[03/50] [abbrv] qpid-proton git commit: PROTON-1031: bump the version
number used by the setup.py script
PROTON-1031: bump the version number used by the setup.py script
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/badf8ef4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/badf8ef4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/badf8ef4
Branch: refs/heads/go1
Commit: badf8ef40e03962dcaf6288ac3d92ccf972e61b8
Parents: 7c132f3
Author: Ken Giusti <kg...@apache.org>
Authored: Thu Oct 29 11:39:42 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Thu Oct 29 11:39:42 2015 -0400
----------------------------------------------------------------------
proton-c/bindings/python/proton/__init__.py | 2 ++
proton-c/bindings/python/setup.py | 5 +++--
proton-c/bindings/python/setuputils/bundle.py | 10 ++++------
proton-j/src/main/resources/cproton.py | 1 +
4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/badf8ef4/proton-c/bindings/python/proton/__init__.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py
index 0567095..2a87fe7 100644
--- a/proton-c/bindings/python/proton/__init__.py
+++ b/proton-c/bindings/python/proton/__init__.py
@@ -115,6 +115,8 @@ except NameError:
VERSION_MAJOR = PN_VERSION_MAJOR
VERSION_MINOR = PN_VERSION_MINOR
+VERSION_POINT = PN_VERSION_POINT
+VERSION = (VERSION_MAJOR, VERSION_MINOR, VERSION_POINT)
API_LANGUAGE = "C"
IMPLEMENTATION_LANGUAGE = "C"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/badf8ef4/proton-c/bindings/python/setup.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/setup.py b/proton-c/bindings/python/setup.py
index 91cc24e..db9bfca 100755
--- a/proton-c/bindings/python/setup.py
+++ b/proton-c/bindings/python/setup.py
@@ -191,7 +191,7 @@ class Configure(build_ext):
env={'PYTHONPATH': proton_base}, stdout=header)
# Create a custom, temporary, version.h file mapping the
- # major and minor versions from the downloaded tarbal. This version should
+ # major and minor versions from the downloaded tarball. This version should
# match the ones in the bundle module
with open(os.path.join(build_include, 'proton', 'version.h'), "wb") as ver:
version_text = """
@@ -199,8 +199,9 @@ class Configure(build_ext):
#define _PROTON_VERSION_H 1
#define PN_VERSION_MAJOR %i
#define PN_VERSION_MINOR %i
+#define PN_VERSION_POINT %i
#endif /* version.h */
-""" % bundle.min_qpid_proton
+""" % bundle.bundled_version
ver.write(version_text.encode('utf-8'))
# Collect all the Proton C files that need to be built.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/badf8ef4/proton-c/bindings/python/setuputils/bundle.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/setuputils/bundle.py b/proton-c/bindings/python/setuputils/bundle.py
index 29b1cac..668bf88 100644
--- a/proton-c/bindings/python/setuputils/bundle.py
+++ b/proton-c/bindings/python/setuputils/bundle.py
@@ -32,13 +32,11 @@ from . import log
#-----------------------------------------------------------------------------
# Constants
#-----------------------------------------------------------------------------
-min_qpid_proton = (0, 10)
-min_qpid_proton_str = "%i.%i" % min_qpid_proton
+min_qpid_proton = (0, 12, 0)
+min_qpid_proton_str = "%i.%i.%i" % min_qpid_proton
-bundled_version = (0, 10, 0)
-bundled_version_str = ("%i.%i" % bundled_version[:-1]
- if bundled_version[-1] == 0 else
- "%i.%i.%i" % bundled_version)
+bundled_version = (0, 12, 0)
+bundled_version_str = "%i.%i.%i" % bundled_version
libqpid_proton = "qpid-proton-%s.tar.gz" % bundled_version_str
libqpid_proton_url = ("http://www.apache.org/dist/qpid/proton/%s/%s" %
(bundled_version_str, libqpid_proton))
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/badf8ef4/proton-j/src/main/resources/cproton.py
----------------------------------------------------------------------
diff --git a/proton-j/src/main/resources/cproton.py b/proton-j/src/main/resources/cproton.py
index 2b2f66c..0840273 100644
--- a/proton-j/src/main/resources/cproton.py
+++ b/proton-j/src/main/resources/cproton.py
@@ -26,6 +26,7 @@ against both the C and Java protocol implementations.
# @todo(kgiusti) dynamically set these via filters in the pom.xml file
PN_VERSION_MAJOR = 0
PN_VERSION_MINOR = 0
+PN_VERSION_POINT = 0
from ctypes import *
from cobject import *
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org