Move the build tree out of the source tree (fixed ../build)
The build directory is now a fixed 'build' next to the tree (qt6-after/build), not in-tree build4 / build4_<timestamp>_<pid> dirs. - CMakeLists: the $ORIGIN RTI RUNPATH entry is now 4 levels up from a bin/ or lib/ artifact (the build tree is one level shallower) - new_docker_build_release2.sh: BUILD_DIR is the fixed ../build; the DEB tar drops the ./build4* exclude (the build dir is outside the tree) - new_docker_build.sh: Docker mounts the tree's parent so ../build lands next to the tree on the host; in-container paths (cmake source, SRCROOT, deb_stage, rpms, staging tar) updated accordingly - rpmbuild/make_rpm_ubuntu26*.py: stale build4/ references now say build/ - README: build4 -> ../build in every snippet and doc line Verified: fresh full-scope configure + ninja all in qt6-after/build is green; ctest 20/22 (same 2 pre-existing out-of-scope failures as the previous baseline); RUNPATH carries the 4-level $ORIGIN entry and ddscore_unit_test runs with no LD_LIBRARY_PATH / RTI_LICENSE.
This commit is contained in:
1 parent
874efd4733
commit
dc2c3e358b
6 files changed
+56
-46
No files matched your search
@@ -128,9 +128,9 @@ def find_test_module_source(pkg_dir, test_name, release_dirs):
|
||||
|
||||
|
||||
def find_test_executables(pkg_dir, release_dirs):
|
||||
"""(executable, module) pairs for the test executables in build4/bin/."""
|
||||
"""(executable, module) pairs for the test executables in build/bin/."""
|
||||
test_executables = []
|
||||
build_bin_dir = os.path.join(pkg_dir, "build4", "bin")
|
||||
build_bin_dir = os.path.join(pkg_dir, "build", "bin")
|
||||
if not os.path.exists(build_bin_dir):
|
||||
warning(f"Build bin directory not found: {build_bin_dir}")
|
||||
return test_executables
|
||||
@@ -373,7 +373,7 @@ def ctest_runtime_install_lines(pkg_dir, release_dirs):
|
||||
for exe_path, module_path in find_test_executables(pkg_dir, release_dirs):
|
||||
lines.append(f"{os.path.relpath(exe_path, pkg_dir)} usr/lib/ctest/")
|
||||
info(f" Including test executable: {os.path.basename(exe_path)} from {module_path}")
|
||||
for ctest_file in ("build4/CTestTestfile.cmake", "build4/DartConfiguration.tcl", "build4/Testing/TAG"):
|
||||
for ctest_file in ("build/CTestTestfile.cmake", "build/DartConfiguration.tcl", "build/Testing/TAG"):
|
||||
if os.path.exists(os.path.join(pkg_dir, ctest_file)):
|
||||
lines.append(f"{ctest_file} usr/lib/ctest/")
|
||||
return lines
|
||||
|
||||
Reference in new issue
Block a user