Commit a0e44fc1 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'rel-package-names'

2186f898 Utilities/Release: Rename Windows packages to 'windows-$arch'
dc9340db

 Utilities/Release: Rename Linux packages to 'linux-$arch'
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5738
parents 6153bd3a 2186f898
......@@ -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
......
......@@ -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
......
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``.
* The precompiled Windows binaries provided on ``cmake.org`` have changed
their naming pattern to ``cmake-$ver-windows-$arch``, where ``$arch``
is either ``x86_64`` or ``i386``.
......@@ -39,7 +39,7 @@ Each ``<os>/<arch>/`` 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 ``<os>/<arch>/`` directory contains the following:
FROM cmake:test-base
COPY cmake-src /opt/cmake/src/cmake
ADD out/cmake-<ver>-Linux-x86_64.tar.gz /opt/
ENV PATH=/opt/cmake-<ver>-Linux-x86_64/bin:$PATH
ADD out/cmake-<ver>-linux-x86_64.tar.gz /opt/
ENV PATH=/opt/cmake-<ver>-linux-x86_64/bin:$PATH
Build the test image and run it to drive testing:
......
......@@ -31,5 +31,5 @@ RUN : \
&& bin/cpack -G STGZ \
&& set +x \
&& mkdir /out \
&& mv cmake-*-Linux-aarch64.* /out \
&& mv cmake-*-linux-aarch64.* /out \
&& :
......@@ -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
......@@ -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 \
&& :
......@@ -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
......@@ -42,4 +42,4 @@ CMAKE_Swift_COMPILER:FILEPATH=FALSE
CMake_TEST_Qt5:BOOL=FALSE
# CPack package file name component for this platform.
CPACK_SYSTEM_NAME:STRING=win32-x86
CPACK_SYSTEM_NAME:STRING=windows-i386
......@@ -42,4 +42,4 @@ CMAKE_Swift_COMPILER:FILEPATH=FALSE
CMake_TEST_Qt5:BOOL=FALSE
# CPack package file name component for this platform.
CPACK_SYSTEM_NAME:STRING=win64-x64
CPACK_SYSTEM_NAME:STRING=windows-x86_64
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment