qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jr...@apache.org
Subject [1/2] qpid-cpp git commit: QPID-7353: Update release-branch versions for beta; adapt cmake version handling for new version pattern
Date Wed, 17 Aug 2016 16:46:20 GMT
Repository: qpid-cpp
Updated Branches:
  refs/heads/1.35.x 04efcd908 -> 4a09c93d7


QPID-7353: Update release-branch versions for beta; adapt cmake version handling for new version
pattern


Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/bd3e43c8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/bd3e43c8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/bd3e43c8

Branch: refs/heads/1.35.x
Commit: bd3e43c84961b6818620d455d431c0128f5697d1
Parents: 04efcd9
Author: Justin Ross <jross@apache.org>
Authored: Wed Aug 17 09:44:32 2016 -0700
Committer: Justin Ross <jross@apache.org>
Committed: Wed Aug 17 09:44:32 2016 -0700

----------------------------------------------------------------------
 CMakeLists.txt             | 18 +++++++++++++-----
 VERSION.txt                |  2 +-
 docs/man/qpidd.1           |  2 +-
 management/python/setup.py |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/bd3e43c8/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 796f587..0d0a44f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,19 @@ endif (CMAKE_CONFIGURATION_TYPES)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
 
 file(READ VERSION.txt QPID_VERSION)
-string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\1" QPID_VERSION_MAJOR "${QPID_VERSION}")
-string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\2" QPID_VERSION_MINOR "${QPID_VERSION}")
-set (QPID_VERSION_FULL "${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}")
-
-set (qpidc_version ${QPID_VERSION_FULL})
+string(STRIP ${QPID_VERSION} QPID_VERSION_LINE)
+string(REPLACE "-" ";" QPID_VERSION_SPLIT "${QPID_VERSION_LINE}")
+list(GET QPID_VERSION_SPLIT 0 QPID_VERSION_CLEAN)
+list(REMOVE_AT QPID_VERSION_SPLIT 0)
+string(REPLACE ";" "-" QPID_VERSION_QUALIFIER "${QPID_VERSION_SPLIT}")
+string(REGEX MATCHALL "[0-9]+" QPID_VERSION_LIST "${QPID_VERSION_CLEAN}")
+
+list(GET QPID_VERSION_LIST 0 QPID_VERSION_MAJOR)
+list(GET QPID_VERSION_LIST 1 QPID_VERSION_MINOR)
+list(GET QPID_VERSION_LIST 2 QPID_VERSION_POINT)
+
+set(QPID_VERSION_FULL "${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}.${QPID_VERSION_POINT}")
+set(qpidc_version ${QPID_VERSION_FULL})
 
 include(BuildInstallSettings.cmake)
 

http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/bd3e43c8/VERSION.txt
----------------------------------------------------------------------
diff --git a/VERSION.txt b/VERSION.txt
index c74e8a0..4303820 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-0.35
+1.35.0-beta

http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/bd3e43c8/docs/man/qpidd.1
----------------------------------------------------------------------
diff --git a/docs/man/qpidd.1 b/docs/man/qpidd.1
index 2ec1fc0..3eb1afd 100644
--- a/docs/man/qpidd.1
+++ b/docs/man/qpidd.1
@@ -17,7 +17,7 @@
 .\" under the License.
 .\"
 
-.TH QPIDD "1" "June 2015" "qpidd (qpid-cpp) version 0.35" "User Commands"
+.TH QPIDD "1" "August 2016" "qpidd (qpid-cpp) version 1.35.0" "User Commands"
 .SH NAME
 
 qpidd \- the Qpid AMQP Message Broker Daemon

http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/bd3e43c8/management/python/setup.py
----------------------------------------------------------------------
diff --git a/management/python/setup.py b/management/python/setup.py
index 8eb26c3..c68fc9d 100755
--- a/management/python/setup.py
+++ b/management/python/setup.py
@@ -57,7 +57,7 @@ if platform.system() == "Windows":
     scripts.append("bin/qpid-tool.bat")
 
 setup(name="qpid-tools",
-      version="0.35",
+      version="1.35.0",
       author="Apache Qpid",
       author_email="users@qpid.apache.org",
       package_dir={'' : 'lib'},


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message