From 063c4a2646dd5268ca1df2d11ff0e8e67c174a3e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 27 Mar 2024 11:41:21 +0100
Subject: [PATCH] rename script -> mk_wheel_multilinux.sh
---
.gitlab-ci.yml | 2 +-
cmake/multipython/MakePythonWheel.cmake | 6 +++---
.../{mk_pypack_linux.sh.in => mk_wheel_multilinux.sh.in} | 0
devtools/deploy/multipy/build_multipy.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename devtools/deploy/linux/{mk_pypack_linux.sh.in => mk_wheel_multilinux.sh.in} (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2d6b1f1436..2459c2acf33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ native_Debian_clang:
- time ninja
- time xvfb-run -a ctest -j16 --output-on-failure
- time ninja package_source
- - time bash var/mk_pypack_linux.sh
+ - time bash var/mk_wheel_multilinux.sh
- time cpack -B ./installer .
artifacts:
paths:
diff --git a/cmake/multipython/MakePythonWheel.cmake b/cmake/multipython/MakePythonWheel.cmake
index 85ade6ecced..8bf25faab76 100644
--- a/cmake/multipython/MakePythonWheel.cmake
+++ b/cmake/multipython/MakePythonWheel.cmake
@@ -75,11 +75,11 @@ elseif(LINUX)
# On Linux, building the Python packages needs further effort
# which is performed in a dedicated shell script which
# should be executed after build process is done (like CPack).
- configure_file("${CMAKE_SOURCE_DIR}/devtools/deploy/linux/mk_pypack_linux.sh.in"
- ${BUILD_VAR_DIR}/mk_pypack_linux.sh @ONLY)
+ configure_file("${CMAKE_SOURCE_DIR}/devtools/deploy/linux/mk_wheel_multilinux.sh.in"
+ ${BUILD_VAR_DIR}/mk_wheel_multilinux.sh @ONLY)
add_custom_target(BAPyWheel ALL
COMMENT "${header} Script to build the Python wheel: "
- "'${${BUILD_VAR_DIR}/mk_pypack_linux.sh}'"
+ "'${${BUILD_VAR_DIR}/mk_wheel_multilinux.sh}'"
)
else()
# MS-Windows
diff --git a/devtools/deploy/linux/mk_pypack_linux.sh.in b/devtools/deploy/linux/mk_wheel_multilinux.sh.in
similarity index 100%
rename from devtools/deploy/linux/mk_pypack_linux.sh.in
rename to devtools/deploy/linux/mk_wheel_multilinux.sh.in
diff --git a/devtools/deploy/multipy/build_multipy.py b/devtools/deploy/multipy/build_multipy.py
index 118db3ef6dd..1decdbfcd9f 100644
--- a/devtools/deploy/multipy/build_multipy.py
+++ b/devtools/deploy/multipy/build_multipy.py
@@ -137,7 +137,7 @@ class LinuxMake:
def pack(dirs:BuildDirs):
""" Build package """
- wheel_prc = subp.run(["bash", dirs.build + "/var/mk_pypack_linux.sh"])
+ wheel_prc = subp.run(["bash", dirs.build + "/var/mk_wheel_multilinux.sh"])
wheel_prc.check_returncode()
pack_prc = subp.run(["cpack", dirs.build, "-B " + dirs.package])
return pack_prc
--
GitLab