diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2016-04-24 01:17:15 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2016-04-25 13:57:17 +0200 |
| commit | 030a8e69dbb9458892f33808f29e50dcc2415eda (patch) | |
| tree | 4b55093bf6fa038c43db64cf4bd68bfb4394958b | |
| parent | 018ce536c1b0c0b440dc49fe3b4eba8fc2f7d4fa (diff) | |
diff-api: rename to decent name COMPARE_BUILDDIR
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
| -rwxr-xr-x | diff-api.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/diff-api.sh b/diff-api.sh index 2feca31..f64f40b 100755 --- a/diff-api.sh +++ b/diff-api.sh @@ -10,7 +10,7 @@ export GIT_BRANCH="${GIT_BRANCH:-master}" export COMPARE_BRANCH="${COMPARE_BRANCH:-api-next}" export GENERIC_SRCDIR="${GENERIC_SRCDIR:-${SRCDIR}/odp}" export GENERIC_BUILDDIR="${GENERIC_BUILDDIR:-${BUILDDIR}/odp_diff}" -export GENERIC_BUILDDIR_2="${GENERIC_BUILDDIR_2:-${BUILDDIR}/odp_diff_2}" +export COMPARE_BUILDDIR="${COMPARE_BUILDDIR:-${BUILDDIR}/odp_diff_2}" export CLEANUP="${CLEANUP:-1}" export COMPARE_REPO="${COMPARE_REPO:-""}" PLATFORM=${PLATFORM:-linux-generic} @@ -26,7 +26,7 @@ cleanup_exit() { if [[ ${CLEANUP} -eq 1 ]]; then rm -rf ${GENERIC_BUILDDIR} - rm -rf ${GENERIC_BUILDDIR_2} + rm -rf ${COMPARE_BUILDDIR} rm -rf odp_diff* ${PLATFORM_SHORT}_cleanup fi @@ -69,14 +69,14 @@ if [ ! -d "$GENERIC_BUILDDIR" ]; then generic_new_workdir "${GENERIC_SRCDIR}" "${remote_name}/${GIT_BRANCH}" "${GENERIC_BUILDDIR}" fi -if [ ! -d "$GENERIC_BUILDDIR_2" ]; then +if [ ! -d "$COMPARE_BUILDDIR" ]; then echo "Pulling from ${COMPARE_REPO}, branch ${COMPARE_BRANCH}" remote_name="$(remote_name ${COMPARE_REPO})" generic_fetch "${COMPARE_REPO}" "${GENERIC_SRCDIR}" "${remote_name}" - generic_new_workdir "${GENERIC_SRCDIR}" "${remote_name}/${COMPARE_BRANCH}" "${GENERIC_BUILDDIR_2}" + generic_new_workdir "${GENERIC_SRCDIR}" "${remote_name}/${COMPARE_BRANCH}" "${COMPARE_BUILDDIR}" fi -if [[ -d ${GENERIC_BUILDDIR_2}/platform/linux-dpdk ]]; then +if [[ -d ${COMPARE_BUILDDIR}/platform/linux-dpdk ]]; then source ${ROOT_DIR}/helper/platform/dpdk dpdk_prepare dpdk_get @@ -84,6 +84,6 @@ if [[ -d ${GENERIC_BUILDDIR_2}/platform/linux-dpdk ]]; then fi ${ROOT_DIR}/helper/api_diff/dox_api_signature.pl --generate --in_dir=${GENERIC_BUILDDIR} >/dev/null -${ROOT_DIR}/helper/api_diff/dox_api_signature.pl --generate --configure="${CONFIGURE_FLAGS}" --in_dir=${GENERIC_BUILDDIR_2} >/dev/null -${ROOT_DIR}/helper/api_diff/dox_diff_repos.pl ${DETAILED_DIFF_FLAGS} --git_dir=${GENERIC_BUILDDIR} --git_dir=${GENERIC_BUILDDIR_2} --no-generate | tee ${publishing}/$(basename ${GIT_URL})-${GIT_BRANCH}_VS_$(basename ${COMPARE_REPO})-${COMPARE_BRANCH}-api-diff.txt +${ROOT_DIR}/helper/api_diff/dox_api_signature.pl --generate --configure="${CONFIGURE_FLAGS}" --in_dir=${COMPARE_BUILDDIR} >/dev/null +${ROOT_DIR}/helper/api_diff/dox_diff_repos.pl ${DETAILED_DIFF_FLAGS} --git_dir=${GENERIC_BUILDDIR} --git_dir=${COMPARE_BUILDDIR} --no-generate | tee ${publishing}/$(basename ${GIT_URL})-${GIT_BRANCH}_VS_$(basename ${COMPARE_REPO})-${COMPARE_BRANCH}-api-diff.txt ## vim: set sw=4 sts=4 et foldmethod=syntax : ## |