Merge lp:~albaguirre/mir/fix-abi-base-dump into lp:mir

[Alberto Aguirre]

fix make abi-dump-base target

fix make abi-dump-base target

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2618
http://jenkins.qa.ubuntu.com/job/mir-ci/3996/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2643
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2643/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5489
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20946

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3996/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Ah, right. Yeah, seems reasonable.

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	2015-05-19 21:34:34 +0000
+++ cmake/ABICheck.cmake	2015-06-03 22:18:10 +0000
@@ -71,7 +71,7 @@
 endfunction()
 
 #These headers are not part of the libmircommon ABI
-set(mircommon-exclude-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/input")
+set(mircommon-exclude-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/input\n    ${CMAKE_SOURCE_DIR}/src/include/common/mir/events")
 
 #These headers are not part of the libmirplatform ABI
 set(mirplatform-exclude-headers "${CMAKE_SOURCE_DIR}/include/platform/mir/input")

=== modified file 'tools/generate-abi-base-dump.sh'
--- tools/generate-abi-base-dump.sh	2015-04-01 03:07:18 +0000
+++ tools/generate-abi-base-dump.sh	2015-06-03 22:18:10 +0000
@@ -6,6 +6,13 @@
 MIR_RELEASE_DIR=$(find -maxdepth 1 -name mir-\* -type d)
 ln -sf ${MIR_RELEASE_DIR}/ mir-prev-release
 cd ${MIR_RELEASE_DIR}
+
+#NOTE: patch needed since mir 0.13.x fails to generate base dump for libmircommon
+abi_check_file_fixed=$(grep -c common\/mir\/events cmake/ABICheck.cmake)
+if [ "${abi_check_file_fixed}" -eq 0 ]; then
+    sed -i 's/common\/mir\/input/&\n\$\{CMAKE_SOURCE_DIR\}\/src\/include\/common\/mir\/events/' cmake/ABICheck.cmake
+fi
+
 debian/rules override_dh_auto_configure
 cd obj-$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 make -j${NUM_JOBS} abi-dump-base

=== modified file 'tools/run_abi_compliance_checker.sh'
--- tools/run_abi_compliance_checker.sh	2015-04-01 20:32:12 +0000
+++ tools/run_abi_compliance_checker.sh	2015-06-03 22:18:10 +0000
@@ -82,13 +82,8 @@
 then
     if [ ! -f "${OLD_ABI_DUMP}" ];
     then
-        # This does not return an error code on purpose
-        # The previous release source may not have the required changes
-        # to generate an ABI dump of the requested library
-        # TODO: Exit with error code once the archive mir release
-        # can dump ABI for all libraries of interest
-        echo "Warning: No base abi dump exists for ${LIB_NAME}"
-        echo "skipping abi-compliance-checker for ${LIB_NAME}"
+        echo "Error: No base abi dump exists for ${LIB_NAME}"
+        exit 1;
     else
         echo "Running abi-compliance-checker for ${LIB_NAME}"
         abi-compliance-checker -l ${LIB_NAME} -old "${OLD_ABI_DUMP}" -new "${NEW_ABI_DUMP}" -check-implementation ${SKIP_SYMBOLS_OPT}