update builder.py to add Windows support #982
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Skip the drive letter if run on Windows * Remove unnecessary check for win32
* Update catkin_package.cmake * Update catkin_package.cmake * Update builder.py * Normalize the path from subs['cmake_prefix_path'] * Revert the unrelated changes from my bad merge in the previous commit. Revert the unrelated changes from my bad merge in the previous commit to keep this PR clean.
* Create env.bat and setup.bat in build_cmake_package for Windows (#9) * define string templates in a separate step * change script writer function names * fix indentation for script template
kejxu
changed the title
|
Thanks for the patch. |
at-wat
added a commit
to at-wat/catkin
that referenced
this pull request
Mar 18, 2019
Filenames setup.sh and env.sh go .sh after ros#982. This seems caused test failures of pure cmake packages on the build farm.
at-wat
added a commit
to at-wat/catkin
that referenced
this pull request
Mar 18, 2019
Filenames setup.sh and env.sh get .sh after ros#982. This seems to cause test failures of pure cmake packages on the build farm.
at-wat
added a commit
to at-wat/catkin
that referenced
this pull request
Mar 18, 2019
Filenames setup.sh and env.sh get .sh after ros#982. This seems to cause test failures of pure cmake packages on the build farm. Following builds on the build farm looks affected by this bug. http://build.ros.org/view/Mdev/job/Mdev__yp-spur__ubuntu_bionic_amd64/18/console ``` 02:29:23 Invoking '. /opt/ros/melodic/setup.sh && . /tmp/ws/devel_isolated/setup.sh && PYTHONIOENCODING=utf_8 PYTHONUNBUFFERED=1 catkin_make_isolated --force-cmake --cmake-args -DBUILD_TESTING=1 -DCATKIN_ENABLE_TESTING=1 -DCATKIN_SKIP_TESTING=0 -DCATKIN_TEST_RESULTS_DIR=/tmp/ws/test_results --catkin-make-args run_tests' in '/tmp/ws' 02:29:23 /bin/sh: 9: .: Can't open /tmp/ws/devel_isolated/ypspur/setup.sh ``` http://build.ros.org/view/Mdev/job/Mdev__rc_genicam_api__ubuntu_bionic_amd64/17/console ``` 09:42:52 Invoking '. /opt/ros/melodic/setup.sh && . /tmp/ws/devel_isolated/setup.sh && PYTHONIOENCODING=utf_8 PYTHONUNBUFFERED=1 catkin_make_isolated --force-cmake --cmake-args -DBUILD_TESTING=1 -DCATKIN_ENABLE_TESTING=1 -DCATKIN_SKIP_TESTING=0 -DCATKIN_TEST_RESULTS_DIR=/tmp/ws/test_results --catkin-make-args run_tests' in '/tmp/ws' 09:42:52 /bin/sh: 4: .: Can't open /tmp/ws/devel_isolated/rc_genicam_api/setup.sh ``` --- Expression evaluation order of python: ```python >>> 'a' + 'b' if True else 'c' 'ab' >>> 'a' + 'b' if False else 'c' 'c' ```
at-wat
added a commit
to at-wat/catkin
that referenced
this pull request
Mar 18, 2019
Filenames setup.sh and env.sh get .sh after ros#982. This seems to cause test failures of pure cmake packages on the buildfarm. Following builds on the buildfarm looks affected by this bug. http://build.ros.org/view/Mdev/job/Mdev__yp-spur__ubuntu_bionic_amd64/18/console ``` 02:29:23 Invoking '. /opt/ros/melodic/setup.sh && . /tmp/ws/devel_isolated/setup.sh && PYTHONIOENCODING=utf_8 PYTHONUNBUFFERED=1 catkin_make_isolated --force-cmake --cmake-args -DBUILD_TESTING=1 -DCATKIN_ENABLE_TESTING=1 -DCATKIN_SKIP_TESTING=0 -DCATKIN_TEST_RESULTS_DIR=/tmp/ws/test_results --catkin-make-args run_tests' in '/tmp/ws' 02:29:23 /bin/sh: 9: .: Can't open /tmp/ws/devel_isolated/ypspur/setup.sh ``` http://build.ros.org/view/Mdev/job/Mdev__rc_genicam_api__ubuntu_bionic_amd64/17/console ``` 09:42:52 Invoking '. /opt/ros/melodic/setup.sh && . /tmp/ws/devel_isolated/setup.sh && PYTHONIOENCODING=utf_8 PYTHONUNBUFFERED=1 catkin_make_isolated --force-cmake --cmake-args -DBUILD_TESTING=1 -DCATKIN_ENABLE_TESTING=1 -DCATKIN_SKIP_TESTING=0 -DCATKIN_TEST_RESULTS_DIR=/tmp/ws/test_results --catkin-make-args run_tests' in '/tmp/ws' 09:42:52 /bin/sh: 4: .: Can't open /tmp/ws/devel_isolated/rc_genicam_api/setup.sh ``` --- Expression evaluation order of python: ```python >>> 'a' + 'b' if True else 'c' 'ab' >>> 'a' + 'b' if False else 'c' 'c' ```
dirk-thomas
reviewed
Mar 18, 2019
| @@ -554,13 +655,14 @@ def build_cmake_package( | |||
| make_install_cmd = [last_env] + make_install_cmd | |||
| run_command(make_install_cmd, build_dir, quiet) | |||
|
|
|||
| # If we are installing, and a env.sh exists, don't overwrite it | |||
| if install and os.path.exists(prefix_destdir(os.path.join(install_target, 'env.sh'), destdir)): | |||
| env_script = 'env' + '.bat' if sys.platform == 'win32' else '.sh' | |||
There was a problem hiding this comment.
This change broke non-Windows platforms: see #1000.
There was a problem hiding this comment.
my apologies for the regression!
dirk-thomas
pushed a commit
that referenced
this pull request
Mar 18, 2019
Filenames setup.sh and env.sh get .sh after #982. This seems to cause test failures of pure cmake packages on the buildfarm. Following builds on the buildfarm looks affected by this bug. http://build.ros.org/view/Mdev/job/Mdev__yp-spur__ubuntu_bionic_amd64/18/console ``` 02:29:23 Invoking '. /opt/ros/melodic/setup.sh && . /tmp/ws/devel_isolated/setup.sh && PYTHONIOENCODING=utf_8 PYTHONUNBUFFERED=1 catkin_make_isolated --force-cmake --cmake-args -DBUILD_TESTING=1 -DCATKIN_ENABLE_TESTING=1 -DCATKIN_SKIP_TESTING=0 -DCATKIN_TEST_RESULTS_DIR=/tmp/ws/test_results --catkin-make-args run_tests' in '/tmp/ws' 02:29:23 /bin/sh: 9: .: Can't open /tmp/ws/devel_isolated/ypspur/setup.sh ``` http://build.ros.org/view/Mdev/job/Mdev__rc_genicam_api__ubuntu_bionic_amd64/17/console ``` 09:42:52 Invoking '. /opt/ros/melodic/setup.sh && . /tmp/ws/devel_isolated/setup.sh && PYTHONIOENCODING=utf_8 PYTHONUNBUFFERED=1 catkin_make_isolated --force-cmake --cmake-args -DBUILD_TESTING=1 -DCATKIN_ENABLE_TESTING=1 -DCATKIN_SKIP_TESTING=0 -DCATKIN_TEST_RESULTS_DIR=/tmp/ws/test_results --catkin-make-args run_tests' in '/tmp/ws' 09:42:52 /bin/sh: 4: .: Can't open /tmp/ws/devel_isolated/rc_genicam_api/setup.sh ``` --- Expression evaluation order of python: ```python >>> 'a' + 'b' if True else 'c' 'ab' >>> 'a' + 'b' if False else 'c' 'c' ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update
builder.pyto support building on Windows:path[1:]gives the correct result on Windowsthis code change does not alter the existing logic on Linux