From 7859dd6d1f9b79f47863a49af4362e307ec2f63d Mon Sep 17 00:00:00 2001 From: allan johns Date: Wed, 2 Mar 2022 11:45:10 +1100 Subject: [PATCH 1/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..51fc1a720 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,28 @@ +--- +name: Bug report +about: Create a bug report +title: '' +labels: bug +assignees: '' + +--- + +Describe the bug here. + +**Environment** +* OS (eg "linux ubuntu 18.04") +* Rez version (eg "2.100.0") +* Rez python version (output of "rez-python --version") + +**To Reproduce** +1. Do a thing +2. Do another thing + +**Expected behavior** +Describe what you expected to happen. + +**Actual behavior** +Describe the faulty behaviour you're currently seeing. + +**Regression** +If applicable, state the last known rez version where the bug did not occur (delete this section if N/A). From 8caafcdece90c4d7a3d46ed8138e92334a789028 Mon Sep 17 00:00:00 2001 From: allan johns Date: Wed, 2 Mar 2022 11:50:55 +1100 Subject: [PATCH 2/8] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..7cec1ffd5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,13 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: '' + +--- + +Describe your feature request here. + +**Motivation** +Explain why the project should have this feature. From 75ca01864ba3befa5ec51969063c61c4f66ab354 Mon Sep 17 00:00:00 2001 From: allan johns Date: Wed, 2 Mar 2022 11:55:03 +1100 Subject: [PATCH 3/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 51fc1a720..ab1ae570a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,5 +24,8 @@ Describe what you expected to happen. **Actual behavior** Describe the faulty behaviour you're currently seeing. +**Related Issues/PRs** +* #1241 (delete this section if N/A) + **Regression** If applicable, state the last known rez version where the bug did not occur (delete this section if N/A). From 950ea293fe1e51bd51b2f14e8b00ef4d856b6ee3 Mon Sep 17 00:00:00 2001 From: allan johns Date: Wed, 2 Mar 2022 11:56:02 +1100 Subject: [PATCH 4/8] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 7cec1ffd5..28cb1ea74 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -11,3 +11,6 @@ Describe your feature request here. **Motivation** Explain why the project should have this feature. + +**Related Issues/PRs** +* #1241 (delete this section if N/A) From cab39e7eacabf31d43d2fa5642f271c8576bb306 Mon Sep 17 00:00:00 2001 From: Stephen Mackenzie Date: Fri, 4 Mar 2022 00:15:47 -0500 Subject: [PATCH 5/8] fix: make cmake install directives whitespace friendly --- .../build_system/cmake_files/InstallFiles.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rezplugins/build_system/cmake_files/InstallFiles.cmake b/src/rezplugins/build_system/cmake_files/InstallFiles.cmake index fd47842b9..ac013201c 100644 --- a/src/rezplugins/build_system/cmake_files/InstallFiles.cmake +++ b/src/rezplugins/build_system/cmake_files/InstallFiles.cmake @@ -134,14 +134,14 @@ macro (install_files_) # install files # foreach(f ${INSTF_DEFAULT_ARGS}) - get_target_filepath(${f} ${rel_dir} ${dest_dir} target_fpath) - get_filename_component(target_path ${target_fpath} PATH) + get_target_filepath("${f}" "${rel_dir}" "${dest_dir}" target_fpath) + get_filename_component(target_path "${target_fpath}" PATH) if(REZ_BUILD_TYPE STREQUAL "central" OR NOT INSTF_LOCAL_SYMLINK) - install(FILES ${f} DESTINATION ${target_path} PERMISSIONS ${perms}) + install(FILES "${f}" DESTINATION "${target_path}" PERMISSIONS ${perms}) else() install( CODE "message (STATUS \"Symlink : ${CMAKE_INSTALL_PREFIX}/${target_fpath} -> ${f}\" )" ) - install( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_PREFIX}/${target_path})" ) - install( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${f} ${CMAKE_INSTALL_PREFIX}/${target_fpath})" ) + install( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory \"${CMAKE_INSTALL_PREFIX}/${target_path}\")" ) + install( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${f}\" \"${CMAKE_INSTALL_PREFIX}/${target_fpath}\")" ) endif(REZ_BUILD_TYPE STREQUAL "central" OR NOT INSTF_LOCAL_SYMLINK) endforeach(f ${INSTF_DEFAULT_ARGS}) From 36b27d316f916732f49001e2050d26b026866d1f Mon Sep 17 00:00:00 2001 From: Stephen Mackenzie Date: Tue, 15 Mar 2022 19:16:37 -0400 Subject: [PATCH 6/8] add test case to cover cmake LOCAL_SYMLINK behavior when spaces in filenames --- .../builds/packages/translate_lib/2.2.0/CMakeLists.txt | 9 +++++++++ .../packages/translate_lib/2.2.0/docs/a spaced document | 3 +++ .../translate_lib/2.2.0/docs/an_unspaced_document | 3 +++ src/rez/tests/test_build.py | 8 +++++++- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/a spaced document create mode 100644 src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/an_unspaced_document diff --git a/src/rez/data/tests/builds/packages/translate_lib/2.2.0/CMakeLists.txt b/src/rez/data/tests/builds/packages/translate_lib/2.2.0/CMakeLists.txt index 8dbe11d5f..affcfd0ec 100644 --- a/src/rez/data/tests/builds/packages/translate_lib/2.2.0/CMakeLists.txt +++ b/src/rez/data/tests/builds/packages/translate_lib/2.2.0/CMakeLists.txt @@ -18,6 +18,15 @@ rez_install_files( DESTINATION include/translate ) +# install docs +FILE(GLOB_RECURSE doc_files "docs/*") +rez_install_files( + ${doc_files} + RELATIVE src + DESTINATION docs + LOCAL_SYMLINK # Testing for github issue #553 +) + # install cmake file rez_install_cmake( DESTINATION cmake diff --git a/src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/a spaced document b/src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/a spaced document new file mode 100644 index 000000000..44d1261d7 --- /dev/null +++ b/src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/a spaced document @@ -0,0 +1,3 @@ +This file has spaces in its name +which is here so that cmake macros +get tested for handling spaces in filenames diff --git a/src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/an_unspaced_document b/src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/an_unspaced_document new file mode 100644 index 000000000..42580c74f --- /dev/null +++ b/src/rez/data/tests/builds/packages/translate_lib/2.2.0/docs/an_unspaced_document @@ -0,0 +1,3 @@ +This file very much does not +have a space in its name, as +a counterpart to the other diff --git a/src/rez/tests/test_build.py b/src/rez/tests/test_build.py index cb615f17b..4f74de8cd 100644 --- a/src/rez/tests/test_build.py +++ b/src/rez/tests/test_build.py @@ -118,7 +118,12 @@ def _test_build_translate_lib(self): self._test_build("translate_lib", "2.2.0") context = self._create_context("translate_lib==2.2.0") environ = context.get_environ() - find_file_in_path('translate_lib.cmake', environ['CMAKE_MODULE_PATH']) + root = environ['REZ_TRANSLATE_LIB_ROOT'] + self.assertTrue(find_file_in_path('translate_lib.cmake', environ['CMAKE_MODULE_PATH'])) + # is testing symlinks + self.assertTrue(find_file_in_path('an_unspaced_document', os.path.join(root, 'docs'))) + # is testing spaces in symlinks per issue #553 + self.assertTrue(find_file_in_path('a spaced document', os.path.join(root, 'docs'))) def _test_build_sup_world(self): """Build, install, test the sup_world package.""" @@ -156,6 +161,7 @@ def test_builds_anti(self): self._test_build_anti() @program_dependent("cmake") + @install_dependent() def test_build_cmake(self): """Test a cmake-based package.""" if platform_.name == "windows": From 60bfb3d613c1eca5c9da1de88f5c65a570634626 Mon Sep 17 00:00:00 2001 From: Stephen Mackenzie Date: Tue, 15 Mar 2022 20:02:25 -0400 Subject: [PATCH 7/8] add apt-get update step to ubuntu workflow --- .github/workflows/ubuntu.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ubuntu.yaml b/.github/workflows/ubuntu.yaml index 3ffd1a40f..71216da3c 100644 --- a/.github/workflows/ubuntu.yaml +++ b/.github/workflows/ubuntu.yaml @@ -37,6 +37,10 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: apt-get update + run: | + sudo apt-get update + - name: Verify cmake run: | cmake --version From 97ced4bcedbde71ae14396564908b3f47acc8de9 Mon Sep 17 00:00:00 2001 From: nerdvegas Date: Sat, 19 Mar 2022 12:27:59 +1100 Subject: [PATCH 8/8] version, changelog update --- CHANGELOG.md | 11 +++++++++++ src/rez/utils/_version.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27f4fb227..258f91a06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## 2.104.10 (2022-03-19) +[Source](https://github.com/nerdvegas/rez/tree/2.104.10) | [Diff](https://github.com/nerdvegas/rez/compare/2.104.9...2.104.10) + +**Merged pull requests:** + +- fix: make cmake install directives whitespace friendly [\#1244](https://github.com/nerdvegas/rez/pull/1244) ([maxnbk](https://github.com/maxnbk)) + +**Closed issues:** + +- rez_install_files with LOCAL_SYMLINK fails when an input file has whitespaces in its name [\#553](https://github.com/nerdvegas/rez/issues/553) + ## 2.104.9 (2022-03-01) [Source](https://github.com/nerdvegas/rez/tree/2.104.9) | [Diff](https://github.com/nerdvegas/rez/compare/2.104.8...2.104.9) diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py index 330445f1b..3cf96f82d 100644 --- a/src/rez/utils/_version.py +++ b/src/rez/utils/_version.py @@ -3,4 +3,4 @@ # Update this value to version up Rez. Do not place anything else in this file. -_rez_version = "2.104.9" +_rez_version = "2.104.10"