Skip to content

Commit 0a56274

Browse files
Merge branch 'master' into migrator
2 parents 69dc19a + b910e3b commit 0a56274

14 files changed

+19
-18
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ name: ros-eloquent-fat-ament-cmake
2525
# mapping of rosdep keys
2626
# it can be also used to shadow the unwanted packages.
2727
conda_index:
28-
- 'https://raw.githubusercontent.com/ros-forge/rosdep-conda-forge/master/rosdep/conda-forge.yaml'
28+
- 'https://github.com/RoboStack/ros-galactic/blob/master/vinca_linux_64.yaml'
2929

3030
# packages to skip
3131
packages_skip_by_deps:

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[metadata]
22
name = vinca
33
version = attr: vinca.__version__
4-
url = https://github.com/ros-forge/vinca
4+
url = https://github.com/RoboStack/vinca
55
project_urls =
6-
Changelog = https://github.com/ros-forge/vinca/milestones?direction=desc&sort=due_date&state=closed
7-
GitHub = https://github.com/ros-forge/vinca
6+
Changelog = https://github.com/RoboStack/vinca/milestones?direction=desc&sort=due_date&state=closed
7+
GitHub = https://github.com/RoboStack/vinca
88
author = Sean Yen
99
author_email = [email protected]
1010
maintainer = Sean Yen

vinca/generate_azure.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ def literal_unicode_representer(dumper, data):
120120
call conda config --add channels robostack
121121
call conda config --set channel_priority strict
122122
123+
:: Enable long path names on Windows
124+
reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f
125+
123126
:: conda remove --force m2-git
124127
125128
C:\\Miniconda\\python.exe -m pip install git+https://github.com/mamba-org/boa.git@master

vinca/main.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def parse_command_line(argv):
6868
"""
6969
Examples:
7070
{0} -d ./examples/
71-
See: https://github.com/robostack/vinca
71+
See: https://github.com/RoboStack/vinca
7272
"""
7373
).format(os.path.basename(argv[0]))
7474
formatter_class = argparse.RawDescriptionHelpFormatter
@@ -340,7 +340,7 @@ def generate_output(pkg_shortname, vinca_conf, distro, version):
340340
]
341341

342342
# fixup problems with udev (which is mapped to libusb):
343-
if "libusb" in output["requirements"]["host"]:
343+
if "libusb" in output["requirements"]["host"] or "ros-"+distro.name+"-lusb" in output["requirements"]["host"]:
344344
output["requirements"]["build"] += [
345345
{"sel(linux)": "{{ cdt('libudev') }}"},
346346
{"sel(linux)": "{{ cdt('libudev-devel') }}"},
@@ -707,9 +707,6 @@ def parse_package(pkg, distro, vinca_conf, path):
707707
resolve_pkgname(d.name, vinca_conf, distro)
708708
)
709709

710-
if name == "eigenpy":
711-
recipe["requirements"]["build"] += ["pkg-config"]
712-
713710
if pkg.get_build_type() in ["cmake", "catkin"]:
714711
recipe["build"]["script"] = {
715712
"sel(win)": "bld_catkin.bat",

vinca/templates/activate.bat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Generated by vinca http://github.com/ros-forge/vinca.
1+
:: Generated by vinca http://github.com/RoboStack/vinca.
22
:: DO NOT EDIT!
33
@@if not defined CONDA_PREFIX goto:eof
44

vinca/templates/bld_ament_cmake.bat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Generated by vinca http://github.com/ros-forge/vinca.
1+
:: Generated by vinca http://github.com/RoboStack/vinca.
22
:: DO NOT EDIT!
33
setlocal
44
set "PYTHONPATH=%LIBRARY_PREFIX%\lib\site-packages;%SP_DIR%"

vinca/templates/bld_ament_python.bat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Generated by vinca http://github.com/ros-forge/vinca.
1+
:: Generated by vinca http://github.com/RoboStack/vinca.
22
:: DO NOT EDIT!
33
setlocal
44

vinca/templates/bld_catkin.bat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Generated by vinca http://github.com/ros-forge/vinca.
1+
:: Generated by vinca http://github.com/RoboStack/vinca.
22
:: DO NOT EDIT!
33
setlocal
44
set "PYTHONPATH=%LIBRARY_PREFIX%\lib\site-packages;%SP_DIR%"

vinca/templates/bld_catkin_merge.bat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Generated by vinca http://github.com/ros-forge/vinca.
1+
:: Generated by vinca http://github.com/RoboStack/vinca.
22
:: DO NOT EDIT!
33
setlocal
44

vinca/templates/bld_colcon_merge.bat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Generated by vinca http://github.com/ros-forge/vinca.
1+
:: Generated by vinca http://github.com/RoboStack/vinca.
22
:: DO NOT EDIT!
33
setlocal
44

0 commit comments

Comments
 (0)