Add ABI check for PR

diff --git a/tools/abi-tracker/openjpeg.json b/tools/abi-tracker/openjpeg.json
index 14653472183459928272654c4597b38c542057dd..2cfa4438d417334057111650cd3e9c1e919417b5 100644 (file)
--- a/tools/abi-tracker/openjpeg.json
+++ b/tools/abi-tracker/openjpeg.json
@@ -6,6 +6,7 @@
   "Maintainer":     "Antonin D.",
   "MaintainerUrl":  "http://www.openjpeg.org/",
   "Package":        "version.",
+  "Configure":      "-DCMAKE_C_FLAGS='-fvisibility=hidden -g -Og -w -fpermissive'",
 
   "Versions": [
   {

diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh
index 1a904d27953f139d8bb53b84bae30214d2bd40f1..3eb6e18fc18ed1eb517a5290aff8ef10d4e053d8 100755 (executable)
--- a/tools/travis-ci/abi-check.sh
+++ b/tools/travis-ci/abi-check.sh
@@ -55,7 +55,12 @@ cd tracker
 # Let's create all we need
 grep -v Git ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json > ./openjpeg.json
 abi-monitor ${OPJ_LIMIT_ABI_BUILDS} -get openjpeg.json
-cp -f ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json ./openjpeg.json
+if [ "${OPJ_LIMIT_ABI_BUILDS}" != "" ]; then
+       cp -f ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json ./openjpeg.json
+else
+       # Old versions of openjpeg don't like -fvisibility=hidden...
+       grep -v Configure ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json > ./openjpeg.json
+fi
 cp -rf ${OPJ_SOURCE_DIR} src/openjpeg/current
 abi-monitor ${OPJ_LIMIT_ABI_BUILDS} -build openjpeg.json
 abi-tracker -build openjpeg.json
@@ -66,8 +71,11 @@ EXIT_CODE=0
 abi-compliance-checker -l openjpeg -old $(find ./abi_dump/openjpeg/2.1 -name '*.dump') -new $(find ./abi_dump/openjpeg/current -name '*.dump') -header openjpeg.h -api -s || EXIT_CODE=1
 
 # Check ABI
-# Disabled for now, problems with symbol visibility...
-# abi-compliance-checker -l openjpeg -old $(find ./abi_dump/openjpeg/2.1 -name '*.dump') -new $(find ./abi_dump/openjpeg/current -name '*.dump') -header openjpeg.h -abi -s || EXIT_CODE=1
+if [ "${OPJ_LIMIT_ABI_BUILDS}" != "" ]; then
+       abi-compliance-checker -l openjpeg -old $(find ./abi_dump/openjpeg/2.1 -name '*.dump') -new $(find ./abi_dump/openjpeg/current -name '*.dump') -header openjpeg.h -abi -s || EXIT_CODE=1
+else
+       echo "Disable ABI check for now, problems with symbol visibility..."
+fi
 
 rm -rf src installed