From: mayeut <mayeut@users.noreply.github.com>
Date: Wed, 14 Oct 2015 20:43:39 +0000 (+0200)
Subject: Add ABI check for PR
X-Git-Tag: v2.1.1~22^2~30
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=9729405a8f481bab0a3d638949ee148ab341ee68;p=openjpeg.git

Add ABI check for PR
---

diff --git a/tools/abi-tracker/openjpeg.json b/tools/abi-tracker/openjpeg.json
index 14653472..2cfa4438 100644
--- 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 1a904d27..3eb6e18f 100755
--- 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