diff options
| author | Antonin Descampe <antonin@gmail.com> | 2016-09-29 21:44:38 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2016-09-29 21:44:38 +0200 |
| commit | 110d31891b459c673c7c788cf8170cadfd2201bf (patch) | |
| tree | 0ea9b19f6b8d91414bfe992f1e55236ea4d4f220 | |
| parent | cc0c71c30b2f9c3c28b67a027b39df1fda0d1c9b (diff) | |
fix abi-check
| -rw-r--r-- | tools/abi-tracker/openjpeg.json | 6 | ||||
| -rwxr-xr-x | tools/travis-ci/abi-check.sh | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/abi-tracker/openjpeg.json b/tools/abi-tracker/openjpeg.json index ff0e1125..192dd5fe 100644 --- 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 ec9d89b8..6845ed0a 100755 --- 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 |