mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'rel-package-names'

Browse Source 
2186f8988f Utilities/Release: Rename Windows packages to 'windows-$arch'
dc9340dbc4 Utilities/Release: Rename Linux packages to 'linux-$arch'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5738
This commit is contained in:
Brad King
2021-01-27 14:07:03 +00:00
committed by Kitware Robot
parent 6153bd3a0c 2186f8988f
commit a0e44fc16b
10 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Utilities/Release/README.rst
View File

@@ -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:

2
Utilities/Release/linux/aarch64/Dockerfile
View File

@@ -31,5 +31,5 @@ RUN : \
&& bin/cpack -G STGZ \
&& set +x \
&& mkdir /out \
&& mv cmake-*-Linux-aarch64.* /out \
&& mv cmake-*-linux-aarch64.* /out \
&& :

2
Utilities/Release/linux/aarch64/cache.txt
View File

@@ -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

2
Utilities/Release/linux/x86_64/Dockerfile
View File

@@ -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 \
&& :

2
Utilities/Release/linux/x86_64/cache.txt
View File

@@ -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

2
Utilities/Release/win/x86/cache-i386.txt
View File

@@ -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

2
Utilities/Release/win/x86/cache-x86_64.txt
View File

@@ -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