Merge lp:~unity-team/unity-scopes-api/require-g++-4.9 into lp:unity-scopes-api

[Thomas Voß]

Force building with g++ 4.9

Allow different gcc micro versions

[lp:~unity-team/unity-scopes-api/require-g++-4.9]

400. By Thomas Voß on 2014-07-18

[ Michal Hruby ]
* Sync with devel.
[ Pete Woods ]
* Sync with devel.
[ Marcus Tomlinson ]
* Sync with devel.
[ Tarmac ]
* Sync with devel.
[ CI bot ]
* Sync with devel.
[ Michi Henning ]
* Sync with devel.
[ Michal Hruby ]
* Added CannedQuery parameter to Category
[ Michi Henning ]
* Added support for scope settings.
[ Ubuntu daily release ]
* debian/*symbols: auto-update new symbols to released version
* New rebuild forced

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:400
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/~unity-team/unity-scopes-api/require-g++-4.9/+merge/227386/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/400/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/400/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-07 06:21:59 +0000
+++ CMakeLists.txt	2014-07-18 19:29:21 +0000
@@ -122,11 +122,14 @@
     ${OTHER_INCLUDE_DIRS}
 )
 
-# When building the library, we set the default symbol visibility
-# to "hidden", so we don't export things by default.
-# Exported functions and classes are prefixed by a UNITY_API macro,
-# which explicitly exports a symbol if UNITY_DLL_EXPORTS is defined.
-add_definitions(-DUNITY_DLL_EXPORTS)
+# We require g++ 4.9, to avoid ABI breakage with earlier version.
+# Note that this must match what is specifed in debian/control.
+set(cxx_version_required 4.9)
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if (NOT CMAKE_CXX_COMPILER_VERSION MATCHES "^${cxx_version_required}")
+        message(FATAL_ERROR "g++ version must be ${cxx_version_required}!")
+    endif()
+endif()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wno-variadic-macros -Wextra -fPIC")
 

=== modified file 'debian/control'
--- debian/control	2014-06-24 15:20:03 +0000
+++ debian/control	2014-07-18 19:29:21 +0000
@@ -1,7 +1,8 @@
 Source: unity-scopes-api
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9),
+Build-Depends: g++-4.9,
+               debhelper (>= 9),
                click-dev (>= 0.2.2),
                cmake,
                doxygen,

=== modified file 'debian/libunity-scopes2.symbols'
--- debian/libunity-scopes2.symbols	2014-07-09 14:26:28 +0000
+++ debian/libunity-scopes2.symbols	2014-07-18 19:29:21 +0000
@@ -382,13 +382,11 @@
  (c++)"unity::scopes::testing::OutOfProcessBenchmark::~OutOfProcessBenchmark()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::Result::Result()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::Result::~Result()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::testing::Sample::~Sample()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::Benchmark::Result::save_to_xml(std::basic_ostream<char, std::char_traits<char> >&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::Benchmark::Result::load_from_xml(std::basic_istream<char, std::char_traits<char> >&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::Benchmark::Result::Timing::~Timing()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::Benchmark::Result::save_to(std::basic_ostream<char, std::char_traits<char> >&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::Benchmark::Result::load_from(std::basic_istream<char, std::char_traits<char> >&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::testing::Benchmark::~Benchmark()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::operator==(unity::scopes::testing::Benchmark::Result const&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::operator<<(std::basic_ostream<char, std::char_traits<char> >&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::CategoryRenderer const&)@Base" 0.4.0+14.04.20140312.1

=== modified file 'debian/rules'
--- debian/rules	2014-04-04 14:03:41 +0000
+++ debian/rules	2014-07-18 19:29:21 +0000
@@ -5,6 +5,10 @@
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+# We require a specific gcc version to avoid ABI breakage.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
+
 %:
 	dh $@ --parallel --fail-missing --with click