Skip to content

Commit 4c3b828

Browse files
baszalmstrabaszalmstra
committed
rename packages
1 parent 8e6ae7e commit 4c3b828

File tree

12 files changed

+149
-48
lines changed

12 files changed

+149
-48
lines changed

‎vinca/distro.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,14 @@ def get_release_package_xml(self, pkg_name):
171171
def check_ros1(self):
172172
return self._distribution_type == "ros1"
173173

174+
def get_ros_version(self):
175+
"""Get ROS version number (1 or 2)"""
176+
return "1" if self.check_ros1() else "2"
177+
178+
def get_package_prefix(self):
179+
"""Get the package name prefix (ros for ROS1, ros2 for ROS2)"""
180+
return "ros" if self.check_ros1() else "ros2"
181+
174182
def get_python_version(self):
175183
return self._python_version
176184

‎vinca/generate_gha.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,8 @@ def main():
480480
]
481481
if platform == "emscripten-wasm32":
482482
# Hot fix to add the only ros package inside a if else statement
483-
if "ros-humble-rmw-wasm-cpp" in str(reqs):
484-
requirements[pkg_name].append("ros-humble-rmw-wasm-cpp")
483+
if "ros2-rmw-wasm-cpp" in str(reqs):
484+
requirements[pkg_name].append("ros2-rmw-wasm-cpp")
485485

486486
G = nx.DiGraph()
487487
for pkg, reqs in requirements.items():

‎vinca/main.py‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,14 @@ def generate_output(pkg_shortname, vinca_conf, distro, version, all_pkgs=None):
425425
"ros_environment",
426426
]:
427427
output["requirements"]["host"].append(
428-
f"ros-{config.ros_distro}-ros-environment"
428+
f"{distro.get_package_prefix()}-ros-environment"
429+
)
430+
output["requirements"]["host"].append(
431+
f"{distro.get_package_prefix()}-ros-workspace"
432+
)
433+
output["requirements"]["run"].append(
434+
f"{distro.get_package_prefix()}-ros-workspace"
429435
)
430-
output["requirements"]["host"].append(f"ros-{config.ros_distro}-ros-workspace")
431-
output["requirements"]["run"].append(f"ros-{config.ros_distro}-ros-workspace")
432436

433437
rm_deps, add_deps = get_depmods(vinca_conf, pkg.name)
434438
gdeps = []
@@ -469,7 +473,7 @@ def generate_output(pkg_shortname, vinca_conf, distro, version, all_pkgs=None):
469473
output["requirements"]["build"].append(
470474
{
471475
"if": "build_platform != target_platform",
472-
"then": [f"ros-{config.ros_distro}-cyclonedds"],
476+
"then": [f"{distro.get_package_prefix()}-cyclonedds"],
473477
}
474478
)
475479

@@ -519,32 +523,31 @@ def sortkey(k):
519523
if "cmake" not in output["requirements"]["build"]:
520524
output["requirements"]["build"].append("cmake")
521525

522-
if f"ros-{config.ros_distro}-mimick-vendor" in output["requirements"]["build"]:
523-
output["requirements"]["build"].remove(f"ros-{config.ros_distro}-mimick-vendor")
526+
mimick_vendor_name = f"{distro.get_package_prefix()}-mimick-vendor"
527+
if mimick_vendor_name in output["requirements"]["build"]:
528+
output["requirements"]["build"].remove(mimick_vendor_name)
524529
output["requirements"]["build"].append(
525530
{
526531
"if": "target_platform != 'emscripten-wasm32'",
527-
"then": [f"ros-{config.ros_distro}-mimick-vendor"],
532+
"then": [mimick_vendor_name],
528533
}
529534
)
530535

531-
if f"ros-{config.ros_distro}-mimick-vendor" in output["requirements"]["host"]:
532-
output["requirements"]["host"].remove(f"ros-{config.ros_distro}-mimick-vendor")
536+
if mimick_vendor_name in output["requirements"]["host"]:
537+
output["requirements"]["host"].remove(mimick_vendor_name)
533538
output["requirements"]["build"].append(
534539
{
535540
"if": "target_platform != 'emscripten-wasm32'",
536-
"then": [f"ros-{config.ros_distro}-mimick-vendor"],
541+
"then": [mimick_vendor_name],
537542
}
538543
)
539544

540-
if (
541-
f"ros-{config.ros_distro}-rosidl-default-generators"
542-
in output["requirements"]["host"]
543-
):
545+
rosidl_generators_name = f"{distro.get_package_prefix()}-rosidl-default-generators"
546+
if rosidl_generators_name in output["requirements"]["host"]:
544547
output["requirements"]["build"].append(
545548
{
546549
"if": "target_platform == 'emscripten-wasm32'",
547-
"then": [f"ros-{config.ros_distro}-rosidl-default-generators"],
550+
"then": [rosidl_generators_name],
548551
}
549552
)
550553

@@ -558,7 +561,8 @@ def sortkey(k):
558561
}
559562
]
560563

561-
if f"ros-{config.ros_distro}-pybind11-vendor" in output["requirements"]["host"]:
564+
pybind11_vendor_name = f"{distro.get_package_prefix()}-pybind11-vendor"
565+
if pybind11_vendor_name in output["requirements"]["host"]:
562566
output["requirements"]["host"] += ["pybind11"]
563567
if "pybind11" in output["requirements"]["host"]:
564568
output["requirements"]["build"] += [
@@ -983,7 +987,7 @@ def generate_mutex_package_recipe(vinca_conf, distro):
983987

984988
def parse_package(pkg, distro, vinca_conf, path):
985989
name = pkg["name"].replace("_", "-")
986-
final_name = f"ros-{distro.name}-{name}"
990+
final_name = f"{distro.get_package_prefix()}-{name}"
987991

988992
recipe = {
989993
"package": {"name": final_name, "version": pkg["version"]},
@@ -1148,7 +1152,7 @@ def main():
11481152
for o in outputs:
11491153
sources[o["package"]["name"]] = o["source"]
11501154
del o["source"]
1151-
write_recipe(sources, outputs, vinca_conf)
1155+
write_recipe(sources, outputs, vinca_conf, distro)
11521156

11531157
else:
11541158
if arguments.skip_already_built_repodata or vinca_conf.get("skip_existing"):
@@ -1168,10 +1172,10 @@ def main():
11681172
additional_recipe_names.add(add_rec_y["package"]["name"])
11691173
else:
11701174
if add_rec_y["package"]["name"] not in [
1171-
"ros-humble-rmw-wasm-cpp",
1172-
"ros-humble-wasm-cpp",
1173-
"ros-humble-dynmsg",
1174-
"ros-humble-test-wasm",
1175+
"ros2-rmw-wasm-cpp",
1176+
"ros2-wasm-cpp",
1177+
"ros2-dynmsg",
1178+
"ros2-test-wasm",
11751179
]:
11761180
additional_recipe_names.add(add_rec_y["package"]["name"])
11771181

@@ -1235,9 +1239,9 @@ def main():
12351239
outputs = generate_outputs(distro, vinca_conf)
12361240

12371241
if arguments.multiple_file:
1238-
write_recipe(source, outputs, vinca_conf, False)
1242+
write_recipe(source, outputs, vinca_conf, distro, False)
12391243
else:
1240-
write_recipe(source, outputs, vinca_conf)
1244+
write_recipe(source, outputs, vinca_conf, distro)
12411245

12421246
if unsatisfied_deps:
12431247
print("Unsatisfied dependencies:", unsatisfied_deps)

‎vinca/resolve.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ def resolve_pkgname(pkg_shortname, vinca_conf, distro, is_rundep=False):
6969
return []
7070
else:
7171
return [
72-
"ros-%s-%s"
73-
% (vinca_conf["ros_distro"], pkg_shortname.replace("_", "-"))
72+
"%s-%s" % (distro.get_package_prefix(), pkg_shortname.replace("_", "-"))
7473
]
7574
else:
7675
if is_rundep: # for run dependencies, remove the version

‎vinca/template.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def copyfile_with_exec_permissions(source_file, destination_file):
7777
)
7878

7979

80-
def write_recipe(source, outputs, vinca_conf, single_file=True):
80+
def write_recipe(source, outputs, vinca_conf, distro, single_file=True):
8181
# single_file = False
8282
if single_file:
8383
file = yaml.YAML()
@@ -200,6 +200,7 @@ def write_recipe(source, outputs, vinca_conf, single_file=True):
200200
generate_build_script_for_recipe(
201201
script_filename,
202202
recipe_dir / script_filename,
203+
distro.get_package_prefix(),
203204
additional_cmake_args,
204205
additional_folder,
205206
)
@@ -238,7 +239,11 @@ def generate_template(template_in, template_out, extra_globals=None):
238239

239240

240241
def generate_build_script_for_recipe(
241-
script_name, output_path, additional_cmake_args="", additional_folder=""
242+
script_name,
243+
output_path,
244+
ros_package_prefix,
245+
additional_cmake_args="",
246+
additional_folder="",
242247
):
243248
"""Generate a specific build script directly in the recipe directory."""
244249
import pkg_resources
@@ -261,6 +266,7 @@ def generate_build_script_for_recipe(
261266
)
262267
with open(output_path, "w") as output_file:
263268
extra_globals = {}
269+
extra_globals["ros_package_prefix"] = ros_package_prefix
264270
if additional_cmake_args:
265271
extra_globals["additional_cmake_args"] = additional_cmake_args
266272
else:

‎vinca/templates/bld_ament_python.bat.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ setlocal
55
set "PYTHONPATH=%LIBRARY_PREFIX%\lib\site-packages;%SP_DIR%"
66

77
pushd %SRC_DIR%\%PKG_NAME%\src\work\@(additional_folder)
8-
set "PKG_NAME_SHORT=%PKG_NAME:*ros-@(ros_distro)-=%"
8+
set "PKG_NAME_SHORT=%PKG_NAME:*@(ros_package_prefix)-=%"
99
set "PKG_NAME_SHORT=%PKG_NAME_SHORT:-=_%"
1010

1111
:: If there is a setup.cfg that contains install-scripts then use pip to install

‎vinca/templates/bld_catkin.bat.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set CXX=cl.exe
1515
set CL=/DROS_BUILD_SHARED_LIBS=1 /DNOGDI=1
1616

1717
set "CATKIN_BUILD_BINARY_PACKAGE_ARGS=-DCATKIN_BUILD_BINARY_PACKAGE=1"
18-
if "%PKG_NAME%" == "ros-@(ros_distro)-catkin" (
18+
if "%PKG_NAME%" == "@(ros_package_prefix)-catkin" (
1919
:: create catkin cookie to make it is a catkin workspace
2020
type NUL > %LIBRARY_PREFIX%\.catkin
2121
:: keep the workspace activation scripts (e.g., local_setup.bat)
@@ -46,7 +46,7 @@ cmake ^
4646
%SRC_DIR%\%PKG_NAME%\src\work\@(additional_folder)
4747
if errorlevel 1 exit 1
4848

49-
if "%PKG_NAME%" == "ros-@(ros_distro)-eigenpy" (
49+
if "%PKG_NAME%" == "@(ros_package_prefix)-eigenpy" (
5050
cmake --build . --config Release --target all --parallel 1
5151
if errorlevel 1 exit 1
5252
) else (
@@ -62,7 +62,7 @@ if "%SKIP_TESTING%" == "OFF" (
6262
cmake --build . --config Release --target install
6363
if errorlevel 1 exit 1
6464

65-
if "%PKG_NAME%" == "ros-@(ros_distro)-catkin" (
65+
if "%PKG_NAME%" == "@(ros_package_prefix)-catkin" (
6666
:: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
6767
:: This will allow them to be run on environment activation.
6868
for %%F in (activate deactivate) DO (
@@ -71,7 +71,7 @@ if "%PKG_NAME%" == "ros-@(ros_distro)-catkin" (
7171
)
7272
)
7373

74-
if "%PKG_NAME%" == "ros-@(ros_distro)-ros-workspace" (
74+
if "%PKG_NAME%" == "@(ros_package_prefix)-ros-workspace" (
7575
:: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
7676
:: This will allow them to be run on environment activation.
7777
for %%F in (activate deactivate) DO (

‎vinca/templates/bld_catkin_merge.bat.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set CXX=cl.exe
1313
:: https://learn.microsoft.com/en-us/cpp/build/reference/cl-environment-variables?view=msvc-170
1414
set CL=/DROS_BUILD_SHARED_LIBS=1 /DNOGDI=1
1515

16-
set CATKIN_MAKE_ISOLATED=src\ros-@(ros_distro)-catkin\bin\catkin_make_isolated
16+
set CATKIN_MAKE_ISOLATED=src\@(ros_package_prefix)-catkin\bin\catkin_make_isolated
1717
set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH:\=/%
1818

1919
%PYTHON% %CATKIN_MAKE_ISOLATED% ^

‎vinca/templates/build_ament_python.sh.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pushd $SRC_DIR/$PKG_NAME/src/work/@(additional_folder)
77

88
# If there is a setup.cfg that contains install-scripts then we should not set it here
99
if [ -f setup.cfg ] && grep -q "install[-_]scripts" setup.cfg; then
10-
# Remove e.g. ros-humble- from PKG_NAME
11-
PKG_NAME_SHORT=${PKG_NAME#*ros-@(ros_distro)-}
10+
# Remove e.g. ros2- or ros- from PKG_NAME
11+
PKG_NAME_SHORT=${PKG_NAME#*@(ros_package_prefix)-}
1212
# Substitute "-" with "_"
1313
PKG_NAME_SHORT=${PKG_NAME_SHORT//-/_}
1414
INSTALL_SCRIPTS_ARG="--install-scripts=$PREFIX/lib/$PKG_NAME_SHORT"

‎vinca/templates/build_catkin.sh.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eo pipefail
55

66
CATKIN_BUILD_BINARY_PACKAGE="ON"
77

8-
if [ "${PKG_NAME}" == "ros-@(ros_distro)-catkin" ]; then
8+
if [ "${PKG_NAME}" == "@(ros_package_prefix)-catkin" ]; then
99
# create catkin cookie to make it is a catkin workspace
1010
touch $PREFIX/.catkin
1111
# keep the workspace activation scripts (e.g., local_setup.bat)
@@ -85,7 +85,7 @@ fi
8585

8686
export SKIP_TESTING=@(skip_testing)
8787

88-
if [ "${PKG_NAME}" == "ros-noetic-euslisp" ] || [ "${PKG_NAME}" = "ros-noetic-jskeus" ] || [ "${PKG_NAME}" = "ros-noetic-roseus" ]; then
88+
if [ "${PKG_NAME}" == "ros-euslisp" ] || [ "${PKG_NAME}" = "ros-jskeus" ] || [ "${PKG_NAME}" = "ros-roseus" ]; then
8989
GENERATOR="Unix Makefiles"
9090
else
9191
GENERATOR="Ninja"
@@ -123,7 +123,7 @@ fi
123123

124124
cmake --build . --config Release --target install
125125

126-
if [ "${PKG_NAME}" == "ros-@(ros_distro)-catkin" ]; then
126+
if [ "${PKG_NAME}" == "@(ros_package_prefix)-catkin" ]; then
127127
# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
128128
# This will allow them to be run on environment activation.
129129
for CHANGE in "activate" "deactivate"
@@ -133,15 +133,15 @@ if [ "${PKG_NAME}" == "ros-@(ros_distro)-catkin" ]; then
133133
done
134134
fi
135135

136-
if [ "${PKG_NAME}" == "ros-@(ros_distro)-environment" ]; then
136+
if [ "${PKG_NAME}" == "@(ros_package_prefix)-environment" ]; then
137137
for SCRIPT in "1.ros_distro.sh" "1.ros_etc_dir.sh" "1.ros_package_path.sh" "1.ros_python_version.sh" "1.ros_version.sh"
138138
do
139139
mkdir -p "${PREFIX}/etc/conda/activate.d"
140140
cp "${PREFIX}/etc/catkin/profile.d/${SCRIPT}" "${PREFIX}/etc/conda/activate.d/${SCRIPT}"
141141
done
142142
fi
143143

144-
if [ "${PKG_NAME}" == "ros-@(ros_distro)-ros-workspace" ]; then
144+
if [ "${PKG_NAME}" == "@(ros_package_prefix)-ros-workspace" ]; then
145145
# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
146146
# This will allow them to be run on environment activation.
147147
for CHANGE in "activate" "deactivate"

0 commit comments

Comments
 (0)