From dc9340dbc49704c6d6800171270ff2602aac589b Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 25 Jan 2021 13:45:49 -0500 Subject: Utilities/Release: Rename Linux packages to 'linux-$arch' --- .gitlab/artifacts.yml | 4 ++-- .gitlab/os-linux.yml | 2 +- Help/release/dev/rel-package-names.rst | 6 ++++++ Utilities/Release/README.rst | 6 +++--- Utilities/Release/linux/aarch64/Dockerfile | 2 +- Utilities/Release/linux/aarch64/cache.txt | 2 +- Utilities/Release/linux/x86_64/Dockerfile | 2 +- Utilities/Release/linux/x86_64/cache.txt | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 Help/release/dev/rel-package-names.rst diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml index 87828e1..bd13646 100644 --- a/.gitlab/artifacts.yml +++ b/.gitlab/artifacts.yml @@ -73,8 +73,8 @@ expire_in: 5d paths: # Any packages made. - - build/cmake-*-Linux-x86_64.* - - build/cmake-*-Linux-aarch64.* + - build/cmake-*-linux-x86_64.* + - build/cmake-*-linux-aarch64.* - build/cmake-*-macos*-universal.* # Any source packages made. - build/cmake-*.tar.gz diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index a88ff6e..66a2666 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -305,7 +305,7 @@ - *before_script_linux # Make the CMake package available. - mkdir -p build/install - - tar -C build/install --strip-components=1 -xzf build/cmake-*-Linux-x86_64.tar.gz + - tar -C build/install --strip-components=1 -xzf build/cmake-*-linux-x86_64.tar.gz - .gitlab/ci/sccache.sh - sccache --start-server - sccache --show-stats diff --git a/Help/release/dev/rel-package-names.rst b/Help/release/dev/rel-package-names.rst new file mode 100644 index 0000000..0ad000b --- /dev/null +++ b/Help/release/dev/rel-package-names.rst @@ -0,0 +1,6 @@ +rel-package-names +----------------- + +* The precompiled Linux binaries provided on ``cmake.org`` have changed + their naming pattern to ``cmake-$ver-linux-$arch``, where ``$arch`` + is either ``x86_64`` or ``aarch64``. diff --git a/Utilities/Release/README.rst b/Utilities/Release/README.rst index 6e55dff..5d8e318 100644 --- a/Utilities/Release/README.rst +++ b/Utilities/Release/README.rst @@ -39,7 +39,7 @@ Each ``//`` directory contains the following: -f cmake-src/Utilities/Release/linux/x86_64/Dockerfile cmake-src $ docker container create --name cmake-build cmake:build $ docker cp cmake-build:/out . - $ ls out/cmake-*-Linux-x86_64.* + $ ls out/cmake-*-linux-x86_64.* On Windows, the ``win/x86`` specifications support both the ``x86_64`` and ``i386`` architectures selected via ``--build-arg ARCH=...``. @@ -58,8 +58,8 @@ Each ``//`` directory contains the following: FROM cmake:test-base COPY cmake-src /opt/cmake/src/cmake - ADD out/cmake--Linux-x86_64.tar.gz /opt/ - ENV PATH=/opt/cmake--Linux-x86_64/bin:$PATH + ADD out/cmake--linux-x86_64.tar.gz /opt/ + ENV PATH=/opt/cmake--linux-x86_64/bin:$PATH Build the test image and run it to drive testing: diff --git a/Utilities/Release/linux/aarch64/Dockerfile b/Utilities/Release/linux/aarch64/Dockerfile index 4077b79..fe9b02c 100644 --- a/Utilities/Release/linux/aarch64/Dockerfile +++ b/Utilities/Release/linux/aarch64/Dockerfile @@ -31,5 +31,5 @@ RUN : \ && bin/cpack -G STGZ \ && set +x \ && mkdir /out \ - && mv cmake-*-Linux-aarch64.* /out \ + && mv cmake-*-linux-aarch64.* /out \ && : diff --git a/Utilities/Release/linux/aarch64/cache.txt b/Utilities/Release/linux/aarch64/cache.txt index 89050d1..0c2d995 100644 --- a/Utilities/Release/linux/aarch64/cache.txt +++ b/Utilities/Release/linux/aarch64/cache.txt @@ -41,4 +41,4 @@ CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMake_TEST_Qt5:BOOL=FALSE # CPack package file name component for this platform. -CPACK_SYSTEM_NAME:STRING=Linux-aarch64 +CPACK_SYSTEM_NAME:STRING=linux-aarch64 diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index 972913e..b448108 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/Utilities/Release/linux/x86_64/Dockerfile @@ -32,5 +32,5 @@ RUN : \ && bin/cpack -G STGZ \ && set +x \ && mkdir /out \ - && mv cmake-*-Linux-x86_64.* /out \ + && mv cmake-*-linux-x86_64.* /out \ && : diff --git a/Utilities/Release/linux/x86_64/cache.txt b/Utilities/Release/linux/x86_64/cache.txt index a2864e9..e1f9fe3 100644 --- a/Utilities/Release/linux/x86_64/cache.txt +++ b/Utilities/Release/linux/x86_64/cache.txt @@ -41,4 +41,4 @@ CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMake_TEST_Qt5:BOOL=FALSE # CPack package file name component for this platform. -CPACK_SYSTEM_NAME:STRING=Linux-x86_64 +CPACK_SYSTEM_NAME:STRING=linux-x86_64 -- cgit v0.12