]> granicus.if.org Git - graphviz/commitdiff
Refactor ci/build.sh by moving definitions
authorMagnus Jacobsson <magnus.jacobsson@berotec.se>
Wed, 30 Sep 2020 14:51:33 +0000 (16:51 +0200)
committerMagnus Jacobsson <magnus.jacobsson@berotec.se>
Sun, 4 Oct 2020 07:58:14 +0000 (09:58 +0200)
ci/build.sh

index abe2df4f79258aefd4474d18677804146b06b2e6..1c520134a0179346cbce058f21e3541ca0466e44 100755 (executable)
@@ -16,6 +16,11 @@ GV_VERSION=$( cat VERSION )
 COLLECTION=$( cat COLLECTION )
 META_DATA_DIR=Metadata/${COLLECTION}/${ID}/${VERSION_ID}
 mkdir -p ${META_DATA_DIR}
+DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
+ARCH=$( uname -m )
+mkdir -p ${DIR}/os/${ARCH}
+mkdir -p ${DIR}/debug/${ARCH}
+mkdir -p ${DIR}/source
 if [ "${build_system}" = "cmake" ]; then
     mkdir build
     cd build
@@ -32,11 +37,6 @@ else
         rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
     fi
 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 [ "${build_system}" = "cmake" ]; then
     if [ "${ID_LIKE}" = "debian" ]; then
         mv build/*.deb ${DIR}/os/${ARCH}/