From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Wed, 30 Sep 2020 14:50:52 +0000 (+0200)
Subject: Refactor ci/build.sh to check for build system before OS
X-Git-Tag: 2.46.0~20^2^2~53^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f6428dbd7576815db870c362a605d9068763b6c;p=graphviz

Refactor ci/build.sh to check for build system before OS
---

diff --git a/ci/build.sh b/ci/build.sh
index 045ca804a..abe2df4f7 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -16,36 +16,38 @@ GV_VERSION=$( cat VERSION )
 COLLECTION=$( cat COLLECTION )
 META_DATA_DIR=Metadata/${COLLECTION}/${ID}/${VERSION_ID}
 mkdir -p ${META_DATA_DIR}
-if [ "${ID_LIKE}" = "debian" ]; then
-    if [ "${build_system}" = "cmake" ]; then
-        mkdir build
-        cd build
-        cmake ..
-        cmake --build .
-        cpack
-        cd ..
-    else
+if [ "${build_system}" = "cmake" ]; then
+    mkdir build
+    cd build
+    cmake ..
+    cmake --build .
+    cpack
+    cd ..
+else
+    if [ "${ID_LIKE}" = "debian" ]; then
         tar xfz graphviz-${GV_VERSION}.tar.gz
         (cd graphviz-${GV_VERSION}; fakeroot make -f debian/rules binary) | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
+    else
+        rm -rf ${HOME}/rpmbuild
+        rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
     fi
-else
-    rm -rf ${HOME}/rpmbuild
-    rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
 fi
 DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
 ARCH=$( uname -m )
 mkdir -p ${DIR}/os/${ARCH}
 mkdir -p ${DIR}/debug/${ARCH}
 mkdir -p ${DIR}/source
-if [ "${ID_LIKE}" = "debian" ]; then
-    if [ "${build_system}" = "cmake" ]; then
+if [ "${build_system}" = "cmake" ]; then
+    if [ "${ID_LIKE}" = "debian" ]; then
         mv build/*.deb ${DIR}/os/${ARCH}/
-    else
+    fi
+else
+    if [ "${ID_LIKE}" = "debian" ]; then
         mv *.deb ${DIR}/os/${ARCH}/
         mv *.ddeb ${DIR}/debug/${ARCH}/
+    else
+        mv ${HOME}/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
+        mv ${HOME}/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/${ARCH}/
+        mv ${HOME}/rpmbuild/RPMS/*/*.rpm ${DIR}/os/${ARCH}/
     fi
-else
-    mv ${HOME}/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
-    mv ${HOME}/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/${ARCH}/
-    mv ${HOME}/rpmbuild/RPMS/*/*.rpm ${DIR}/os/${ARCH}/
 fi