remove 'os' directory from packaging hierarchy

Now that nothing is written to the sibling `debug` and `source` directories,
there does not seem to be an advantage to retaining this level in the hierarchy.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c667eed6c573238cd396b6e0e75f9b9f1088c68..819145e28de1f047297e5cd5dd1d7613135579ae 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,8 +99,8 @@ portable-source:
         expire_in: 1 week
         paths:
             - GRAPHVIZ_VERSION
-            - Packages/*/*/*/*.zip
-            - Packages/*/*/*/*.tar.gz
+            - Packages/*/*/*.zip
+            - Packages/*/*/*.tar.gz
         reports:
             metrics: metrics.txt
     except:
@@ -477,7 +477,7 @@ windows-cygwin-build:
         expire_in: 1 week
         paths:
             - GRAPHVIZ_VERSION
-            - Packages/*/*/*/*.xz
+            - Packages/*/*/*.xz
     cache:
         key: windows-cygwin-build
         paths:
@@ -507,7 +507,7 @@ windows-cygwin-build-using-autogen:
         when: always
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*.xz
+            - Packages/*/*/*.xz
     cache:
         key: windows-cygwin-build-using-autogen
         paths:
@@ -806,8 +806,8 @@ windows-mingw32-cmake-build:
         when: always
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*.exe
-            - Packages/*/*/*/*.zip
+            - Packages/*/*/*.exe
+            - Packages/*/*/*.zip
     cache:
         key: windows-mingw32-cmake-build
         paths:
@@ -829,8 +829,8 @@ windows-mingw64-cmake-build:
         when: always
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*.exe
-            - Packages/*/*/*/*.zip
+            - Packages/*/*/*.exe
+            - Packages/*/*/*.zip
     cache:
         key: windows-mingw64-cmake-build
         paths:
@@ -856,8 +856,8 @@ windows-mingw64-cmake-build:
 #         when: always
 #         expire_in: 1 week
 #         paths:
-#             - Packages/*/*/*/*.zip
-#             - Packages/*/*/*/*.bz2
+#             - Packages/*/*/*.zip
+#             - Packages/*/*/*.bz2
 #     cache:
 #         key: windows-cygwin-cmake-build
 #         paths:

diff --git a/ci/build.sh b/ci/build.sh
index 8f9835a10dc0e2a7569056f2f922bb08922073f7..f7b1ef47fa322988a5ea4160cdff2cb50027b75e 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -20,10 +20,8 @@ fi
 META_DATA_DIR=Metadata/${ID}/${VERSION_ID}
 mkdir -p ${META_DATA_DIR}
 DIR=$(pwd)/Packages/${ID}/${VERSION_ID}
+mkdir -p ${DIR}
 ARCH=$( uname -m )
-mkdir -p ${DIR}/os
-mkdir -p ${DIR}/debug
-mkdir -p ${DIR}/source
 build_system=${build_system:-autotools}
 if [ "${build_system}" = "cmake" ]; then
     mkdir build
@@ -40,13 +38,13 @@ if [ "${build_system}" = "cmake" ]; then
             mv build/Graphviz-${GV_VERSION}-Linux.rpm ${DIR}/graphviz-${GV_VERSION}-cmake.rpm
         fi
     elif [[ "${OSTYPE}" =~ "darwin" ]]; then
-        mv build/*.zip ${DIR}/os/
+        mv build/*.zip ${DIR}/
     elif [ "${OSTYPE}" = "msys" ]; then
-        mv build/*.zip ${DIR}/os/
-        mv build/*.exe ${DIR}/os/
+        mv build/*.zip ${DIR}/
+        mv build/*.exe ${DIR}/
     elif [[ "${OSTYPE}" =~ "cygwin" ]]; then
-        mv build/*.zip ${DIR}/os/
-        mv build/*.tar.bz2 ${DIR}/os/
+        mv build/*.zip ${DIR}/
+        mv build/*.tar.bz2 ${DIR}/
     else
         echo "Error: OSTYPE=${OSTYPE} is unknown" >&2
         exit 1
@@ -80,7 +78,7 @@ else
         make
         make install
         tar cfz graphviz-${GV_VERSION}-${ARCH}.tar.gz --options gzip:compression-level=9 build
-        mv graphviz-${GV_VERSION}-${ARCH}.tar.gz ${DIR}/os/
+        mv graphviz-${GV_VERSION}-${ARCH}.tar.gz ${DIR}/
     elif [ "${OSTYPE}" = "cygwin" ]; then
         if [ "${use_autogen:-no}" = "yes" ]; then
             ./autogen.sh
@@ -88,7 +86,7 @@ else
             make
             make install
             tar cf - -C build . | xz -9 -c - > graphviz-${GV_VERSION}-${ARCH}.tar.xz
-            mv graphviz-${GV_VERSION}-${ARCH}.tar.xz ${DIR}/os/
+            mv graphviz-${GV_VERSION}-${ARCH}.tar.xz ${DIR}/
         else
             tar xfz graphviz-${GV_VERSION}.tar.gz
             pushd graphviz-${GV_VERSION}
@@ -97,7 +95,7 @@ else
             make install
             popd
             tar cf - -C graphviz-${GV_VERSION}/build . | xz -9 -c - > graphviz-${GV_VERSION}-${ARCH}.tar.xz
-            mv graphviz-${GV_VERSION}-${ARCH}.tar.xz ${DIR}/os/
+            mv graphviz-${GV_VERSION}-${ARCH}.tar.xz ${DIR}/
         fi
     else
         echo "Error: OSTYPE=${OSTYPE} is unknown" >&2

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index b28b77e4c83db39e8be532a98996c9ad4a928f6f..bededcef71e9374ba8f3edd8b7bb480762da5634 100755 (executable)
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -34,7 +34,7 @@ if [ "${build_system}" = "cmake" ]; then
     if [ "${ID_LIKE}" = "debian" ]; then
         apt install ./${DIR}/graphviz-${GV_VERSION}-cmake.deb
     elif [ "${ID}" = "Darwin" ]; then
-        unzip ${DIR}/os/Graphviz-${GV_VERSION}-Darwin.zip
+        unzip ${DIR}/Graphviz-${GV_VERSION}-Darwin.zip
         cp -rp Graphviz-${GV_VERSION}-Darwin/* /usr/local
     else
         rpm --install --force ${DIR}/graphviz-${GV_VERSION}-cmake.rpm
@@ -46,7 +46,7 @@ else
         apt install ./libgraphviz-dev_${GV_VERSION}-1_amd64.deb
         apt install ./graphviz_${GV_VERSION}-1_amd64.deb
     elif [ "${ID}" = "Darwin" ]; then
-        tar xf ${DIR}/os/graphviz-${GV_VERSION}-${ARCH}.tar.gz
+        tar xf ${DIR}/graphviz-${GV_VERSION}-${ARCH}.tar.gz
         cp -rp build/* /usr/local
     else
         tar xvf ${DIR}/graphviz-${GV_VERSION}-rpms.tar.xz