fix abi-check

diff --git a/tools/abi-tracker/openjpeg.json b/tools/abi-tracker/openjpeg.json
index ff0e112586718fffded6e3f7868fbb8db434ab3e..192dd5fe19058383340855099d52d94651f0c652 100644 (file)
--- a/tools/abi-tracker/openjpeg.json
+++ b/tools/abi-tracker/openjpeg.json
@@ -5,8 +5,8 @@
   "Git":            "https://github.com/uclouvain/openjpeg.git",
   "Maintainer":     "OpenJPEG team",
   "MaintainerUrl":  "http://www.openjpeg.org/",
-  "Package":        "version.",
   "Configure":      "-DCMAKE_C_FLAGS='-fvisibility=hidden -g -Og -w -fpermissive'",
+  "Package":        "version.",
 
   "Versions": [
   {
@@ -24,7 +24,7 @@
   {
     "Number":         "2.1.2",
     "Installed":      "installed/openjpeg/2.1.2",
-    "Source":         "src/openjpeg/2.1.2/v2.1.2.tar.gz",
+    "Source":         "src/openjpeg/2.1.2/version.-2.1.2.tar.gz",
     "Changelog":      "CHANGELOG.md",
     "HeadersDiff":    "On",
     "PkgDiff":        "Off",
@@ -36,7 +36,7 @@
   {
     "Number":         "2.1.1",
     "Installed":      "installed/openjpeg/2.1.1",
-    "Source":         "src/openjpeg/2.1.1/v2.1.1.tar.gz",
+    "Source":         "src/openjpeg/2.1.1/version.-2.1.1.tar.gz",
     "Changelog":      "CHANGELOG.md",
     "HeadersDiff":    "On",
     "PkgDiff":        "Off",

diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh
index ec9d89b84098ca52a485f20fd6beb9d35c6b0433..6845ed0abe9b93138019d5a1ebfb022f4a78851e 100755 (executable)
--- a/tools/travis-ci/abi-check.sh
+++ b/tools/travis-ci/abi-check.sh
@@ -71,7 +71,7 @@ rm -rf installed/openjpeg/current/*
 
 # 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
+abi-monitor ${OPJ_LIMIT_ABI_BUILDS} -get openjpeg.json
 if [ "${OPJ_LIMIT_ABI_BUILDS}" != "" ]; then
        cp -f ${OPJ_SOURCE_DIR}/tools/abi-tracker/openjpeg.json ./openjpeg.json
 else
@@ -79,7 +79,11 @@ else
        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} -rebuild openjpeg.json
+abi-monitor -v current -build openjpeg.json
+abi-monitor -v ${OPJ_LATEST_VERSION} -build openjpeg.json
+if [ "${OPJ_PREVIOUS_VERSION:-}" != "" ]; then
+       abi-monitor -v ${OPJ_PREVIOUS_VERSION} -build openjpeg.json
+fi
 abi-tracker -build openjpeg.json
 
 EXIT_CODE=0