Codebase list ros-bloom / 034b840
New upstream version 0.10.0 Jochen Sprickerhof 3 years ago
6 changed file(s) with 19 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all
+6
-0
CHANGELOG.rst less more
0 0.10.0 (2020-09-28 16:30:00 -0700)
1 ----------------------------------
2 - Add CMAKE_PREFIX_PATH to ament_cmake and cmake templates `#606 <https://github.com/ros-infrastructure/bloom/pull/606>`_
3 - Add RHEL to the default action list `#604 <https://github.com/ros-infrastructure/bloom/pull/604>`_
4 - Handle skipping keys multiple times `#603 <https://github.com/ros-infrastructure/bloom/pull/603>`_
5
06 0.9.8 (2020-08-21 15:36:00 -0700)
17 ---------------------------------
28 - Run tests in RPM builds for ament and cmake packages. `#585 <https://github.com/ros-infrastructure/bloom/pull/585>`_
+3
-1
bloom/config.py less more
203203 'git-bloom-generate -y rosdebian --prefix release/:{ros_distro}'
204204 ' :{ros_distro} -i :{release_inc} --os-name debian --os-not-required',
205205 'git-bloom-generate -y rosrpm --prefix release/:{ros_distro}'
206 ' :{ros_distro} -i :{release_inc}'
206 ' :{ros_distro} -i :{release_inc} --os-name fedora',
207 'git-bloom-generate -y rosrpm --prefix release/:{ros_distro}'
208 ' :{ros_distro} -i :{release_inc} --os-name rhel',
207209 ]
208210 }
209211
+2
-1
bloom/generators/debian/templates/ament_cmake/rules.em less more
2727 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
2828 dh_auto_configure -- \
2929 -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
30 -DAMENT_PREFIX_PATH="@(InstallationPrefix)"
30 -DAMENT_PREFIX_PATH="@(InstallationPrefix)" \
31 -DCMAKE_PREFIX_PATH="@(InstallationPrefix)"
3132
3233 override_dh_auto_build:
3334 # In case we're installing to a non-standard location, look for a setup.sh
+3
-1
bloom/generators/debian/templates/cmake/rules.em less more
2525 # in the install tree and source it. It will set things like
2626 # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
2727 if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
28 dh_auto_configure -- -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)"
28 dh_auto_configure -- \
29 -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
30 -DCMAKE_PREFIX_PATH="@(InstallationPrefix)"
2931
3032 override_dh_auto_build:
3133 # In case we're installing to a non-standard location, look for a setup.sh
+4
-4
bloom/generators/rpm/generator.py less more
532532 self.has_run_rosdep = True
533533
534534 def _check_all_keys_are_valid(self, peer_packages, rosdistro):
535 keys_to_resolve = []
535 keys_to_resolve = set()
536536 key_to_packages_which_depends_on = collections.defaultdict(list)
537537 keys_to_ignore = set()
538538 for package in self.packages.values():
550550 dep for dep in keys_to_ignore.union(package.replaces + package.conflicts)
551551 if dep.evaluated_condition is not False}
552552 keys = [d.name for d in unresolved_keys]
553 keys_to_resolve.extend(keys)
553 keys_to_resolve.update(keys)
554554 for key in keys:
555555 key_to_packages_which_depends_on[key].append(package.name)
556556
557557 for skip_key in self.skip_keys:
558558 try:
559559 keys_to_resolve.remove(skip_key)
560 except ValueError:
560 except KeyError:
561561 warning("Key '{0}' specified by --skip-keys was not found".format(skip_key))
562562 else:
563563 warning("Skipping dependency key '{0}' per --skip-keys".format(skip_key))
565565 os_name = self.os_name
566566 rosdistro = self.rosdistro
567567 all_keys_valid = True
568 for key in sorted(set(keys_to_resolve)):
568 for key in sorted(keys_to_resolve):
569569 for os_version in self.distros:
570570 try:
571571 extended_peer_packages = peer_packages + [d.name for d in keys_to_ignore]
+1
-1
setup.py less more
2121
2222 setup(
2323 name='bloom',
24 version='0.9.8',
24 version='0.10.0',
2525 packages=find_packages(exclude=['test', 'test.*']),
2626 package_data={
2727 'bloom.generators.debian': [