process-cpp

Merge lp:~vorlon/process-cpp/explicit-gcc-version into lp:process-cpp

  1. explicit-gcc-version
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Superseded
Proposed branch: lp:~vorlon/process-cpp/explicit-gcc-version
Merge into: lp:process-cpp
Prerequisite: lp:~thomas-voss/process-cpp/bump-so-name-and-major-version
Diff against target: 101 lines (+25/-6)
5 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+6/-0)
debian/control (+6/-2)
debian/libprocess-cpp2.symbols (+1/-2)
debian/rules (+10/-0)
To merge this branch: bzr merge lp:~vorlon/process-cpp/explicit-gcc-version
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Abstain
PS Jenkins bot continuous-integration Approve
Review via email: mp+226569@code.launchpad.net

This proposal has been superseded by a proposal from 2014-07-12.

Commit message

Bump major revision and so name to account for toolchain update.

Description of the change

Bump major revision and so name to account for toolchain update.

To post a comment you must log in.
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Steve:

This branch duplicates changes already appearing in lp:~thomas-voss/process-cpp/bump-so-name-and-major-version

Could you please, rebase this branch so that your diff shows only the additions you've made.

review: Needs Fixing
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Otherwise, is it not cleaner to just have tvoss update his branch with this change?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:54
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vorlon/process-cpp/explicit-gcc-version/+merge/226569/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/process-cpp-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/process-cpp-ci/68/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Steve Langasek (vorlon) wrote :

Marcus,

"prerequisite" implies that the other branch should be merged independently and that my branch should be merged afterwards. As I described at <https://code.launchpad.net/~thomas-voss/process-cpp/explicit-gcc-version/+merge/224755>, which I have marked as rejected, Thomas's branch is broken and causes a build failure on one architecture and can therefore not be landed. There is no reason for these branches to be landed serially when the first one is broken.

As for asking tvoss to include the changes in his own branch, this is part of a landing of 17 distinct branches that have been pending since the 27th of June and are blocking a toolchain update for Utopic. As I'm working on getting the landing unstuck by clearing the build failures, it would not make sense to wait until Thomas can merge these changes into his branch when I can just raise a new MP myself.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/process-cpp-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/process-cpp-ci/69/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

> Marcus,
>
> "prerequisite" implies that the other branch should be merged independently
> and that my branch should be merged afterwards. As I described at
> <https://code.launchpad.net/~thomas-voss/process-cpp/explicit-gcc-
> version/+merge/224755>, which I have marked as rejected, Thomas's branch is
> broken and causes a build failure on one architecture and can therefore not be
> landed. There is no reason for these branches to be landed serially when the
> first one is broken.

Ah, forgive me for finding this arrangement of branches confusing. So there is a 3rd branch with the exact same stuff in it? Perhaps you should reject lp:~thomas-voss/process-cpp/bump-so-name-and-major-version as well. Its difficult to tell which branch is the master.

>
> As for asking tvoss to include the changes in his own branch, this is part of
> a landing of 17 distinct branches that have been pending since the 27th of
> June and are blocking a toolchain update for Utopic. As I'm working on
> getting the landing unstuck by clearing the build failures, it would not make
> sense to wait until Thomas can merge these changes into his branch when I can
> just raise a new MP myself.

I've clearly intruded on something you're in control of. Sorry.

review: Abstain
Revision history for this message
Steve Langasek (vorlon) wrote :

Aha, thanks, I didn't even notice that the branch you mentioned wasn't the same one I had superseded the MP for! Yes, I'll mark that other MP rejected as well now.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-05-21 16:56:20 +0000
+++ CMakeLists.txt 2014-07-12 10:26:29 +0000
@@ -56,9 +56,9 @@
56 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )56 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
57ENDIF(cmake_build_type_lower MATCHES coverage)57ENDIF(cmake_build_type_lower MATCHES coverage)
5858
59set(PROCESS_CPP_VERSION_MAJOR 1)59set(PROCESS_CPP_VERSION_MAJOR 2)
60set(PROCESS_CPP_VERSION_MINOR 0)60set(PROCESS_CPP_VERSION_MINOR 0)
61set(PROCESS_CPP_VERSION_PATCH 1)61set(PROCESS_CPP_VERSION_PATCH 0)
6262
63include(CTest)63include(CTest)
6464
6565
=== modified file 'debian/changelog'
--- debian/changelog 2014-05-22 09:49:51 +0000
+++ debian/changelog 2014-07-12 10:26:29 +0000
@@ -1,3 +1,9 @@
1process-cpp (2.0.0) UNRELEASED; urgency=medium
2
3 * Bump major revision and so name to account for toolchain update.
4
5 -- Thomas Voß <thomas.voss@canonical.com> Fri, 27 Jun 2014 09:49:30 +0200
6
1process-cpp (1.0.1+14.10.20140522-0ubuntu1) utopic; urgency=medium7process-cpp (1.0.1+14.10.20140522-0ubuntu1) utopic; urgency=medium
28
3 [ Pete Woods ]9 [ Pete Woods ]
410
=== modified file 'debian/control'
--- debian/control 2014-03-24 17:12:32 +0000
+++ debian/control 2014-07-12 10:26:29 +0000
@@ -6,6 +6,10 @@
6 doxygen,6 doxygen,
7 google-mock,7 google-mock,
8 graphviz,8 graphviz,
9# We rely on C++11 features, and to prevent from ABI breaks
10# in libstdc++ causing us issues, we explicitly select a G++
11# version.
12 g++-4.9,
9 libboost-dev,13 libboost-dev,
10 libboost-iostreams-dev,14 libboost-iostreams-dev,
11 libboost-system-dev,15 libboost-system-dev,
@@ -19,7 +23,7 @@
19Vcs-Bzr: https://code.launchpad.net/~phablet-team/content-hub/trunk23Vcs-Bzr: https://code.launchpad.net/~phablet-team/content-hub/trunk
20Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/process-cpp/trunk/files24Vcs-Browser: https://bazaar.launchpad.net/~phablet-team/process-cpp/trunk/files
2125
22Package: libprocess-cpp126Package: libprocess-cpp2
23Architecture: any27Architecture: any
24Multi-Arch: same28Multi-Arch: same
25Pre-Depends: ${misc:Pre-Depends},29Pre-Depends: ${misc:Pre-Depends},
@@ -35,7 +39,7 @@
35Architecture: any39Architecture: any
36Multi-Arch: same40Multi-Arch: same
37Recommends: libprocess-cpp-doc,41Recommends: libprocess-cpp-doc,
38Depends: libprocess-cpp1 (= ${binary:Version}),42Depends: libprocess-cpp2 (= ${binary:Version}),
39 ${misc:Depends},43 ${misc:Depends},
40 libproperties-cpp-dev,44 libproperties-cpp-dev,
41Description: C++11 library for handling processes - dev headers and libraries45Description: C++11 library for handling processes - dev headers and libraries
4246
=== renamed file 'debian/libprocess-cpp1.install' => 'debian/libprocess-cpp2.install'
=== renamed file 'debian/libprocess-cpp1.symbols' => 'debian/libprocess-cpp2.symbols'
--- debian/libprocess-cpp1.symbols 2014-05-22 09:49:50 +0000
+++ debian/libprocess-cpp2.symbols 2014-07-12 10:26:29 +0000
@@ -1,4 +1,4 @@
1libprocess-cpp.so.1 libprocess-cpp1 #MINVER#1libprocess-cpp.so.2 libprocess-cpp2 #MINVER#
2 (c++)"core::posix::Signalable::send_signal(core::posix::Signal, std::error_code&)@Base" 1.0.0+14.04.20140326.22 (c++)"core::posix::Signalable::send_signal(core::posix::Signal, std::error_code&)@Base" 1.0.0+14.04.20140326.2
3 (c++)"core::posix::Signalable::send_signal_or_throw(core::posix::Signal)@Base" 1.0.0+14.04.20140326.23 (c++)"core::posix::Signalable::send_signal_or_throw(core::posix::Signal)@Base" 1.0.0+14.04.20140326.2
4 (c++)"core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(std::shared_ptr<core::posix::SignalTrap>)@Base" 1.0.0+14.04.20140326.24 (c++)"core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(std::shared_ptr<core::posix::SignalTrap>)@Base" 1.0.0+14.04.20140326.2
@@ -8,7 +8,6 @@
8 (c++)"core::posix::ChildProcess::invalid()@Base" 0.0.1+14.04.201403118 (c++)"core::posix::ChildProcess::invalid()@Base" 0.0.1+14.04.20140311
9 (c++)"core::posix::ChildProcess::wait_for(core::posix::wait::Flags const&)@Base" 0.0.1+14.04.201403119 (c++)"core::posix::ChildProcess::wait_for(core::posix::wait::Flags const&)@Base" 0.0.1+14.04.20140311
10 (c++)"core::posix::ChildProcess::~ChildProcess()@Base" 1.0.0+14.04.20140326.210 (c++)"core::posix::ChildProcess::~ChildProcess()@Base" 1.0.0+14.04.20140326.2
11 (c++|arch=ppc64el)"core::posix::ChildProcess::ChildProcess(core::posix::ChildProcess const&)@Base" 1.0.0+14.04.20140326.2
12 (c++)"core::posix::this_process::cin()@Base" 1.0.0+14.04.20140326.211 (c++)"core::posix::this_process::cin()@Base" 1.0.0+14.04.20140326.2
13 (c++)"core::posix::this_process::env::get_or_throw(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.212 (c++)"core::posix::this_process::env::get_or_throw(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
14 (c++)"core::posix::this_process::env::set_or_throw(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.213 (c++)"core::posix::this_process::env::set_or_throw(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.04.20140326.2
1514
=== modified file 'debian/rules'
--- debian/rules 2013-10-21 12:07:28 +0000
+++ debian/rules 2014-07-12 10:26:29 +0000
@@ -3,5 +3,15 @@
33
4export DPKG_GENSYMBOLS_CHECK_LEVEL=44export DPKG_GENSYMBOLS_CHECK_LEVEL=4
55
6include /usr/share/dpkg/default.mk
7
8# Explicitly selecting a G{CC,++}-version here to avoid accidental
9# ABI breaks introduced by toolchain updates.
10export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
11export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
12
6%:13%:
7 dh $@ --fail-missing14 dh $@ --fail-missing
15
16override_dh_auto_configure:
17 dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)

Subscribers

People subscribed via source and target branches