Skip to content

Commit e40a663

Browse files
author
Minggang Wang
committed
Revert "Use COLCON_PREFIX_PATH to replace AMENT_PREFIX_PATH"
This reverts commit 0c7b59a. The COLCON_PREFIX_PATH variable is only present when one or more of the workspaces in your chain is built with colcon. So we are going to use AMENT_PREFIX_PATH for general ROS 2 development. See detailed: 0c7b59a Fix #None
1 parent bbd5a5a commit e40a663

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt update && apt install -y \
1818
python3-colcon-common-extensions \
1919
python3-pip \
2020
python-rosdep \
21-
python3-vcstool \
2221
libpython3-dev \
23-
libtinyxml2.6.2v5 \
24-
libtinyxml2-dev \
2522
cppcheck
2623

2724
RUN rosdep init

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ build_script:
4242
- git submodule update
4343
- ps: Install-Product node $env:nodejs_version x64
4444
- call c:\ros2-windows\local_setup.bat
45-
- node -e "console.log(process.env.COLCON_PREFIX_PATH)"
4645
- "SET PATH=%PYTHON2%;%PYTHON2%\\bin;%PYTHON2%\\Scripts;%PATH%"
4746
- node --version
4847
- npm --version

binding.gyp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
'-std=c++14'
5353
],
5454
'include_dirs': [
55-
"<!@(node -e \"console.log(process.env.COLCON_PREFIX_PATH.replace(/:/, '/include/ ') + '/include/')\")",
55+
"<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/, '/include/ ') + '/include/')\")",
5656
],
5757
'library_dirs': [
58-
"<!@(node -e \"console.log(process.env.COLCON_PREFIX_PATH.replace(/:/, '/lib/ ') + '/lib/')\")",
58+
"<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/, '/lib/ ') + '/lib/')\")",
5959
],
6060
}
6161
],
@@ -70,7 +70,7 @@
7070
],
7171
'include_dirs': [
7272
'./src/third_party/dlfcn-win32/',
73-
"<!@(node -e \"console.log(process.env.COLCON_PREFIX_PATH.replace(/;/, '\\\include ').replace(/\\\/g, '/') + '/include')\")",
73+
"<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/;/, '\\\include ').replace(/\\\/g, '/') + '/include')\")",
7474
],
7575
'sources': [
7676
'./src/third_party/dlfcn-win32/dlfcn.c',
@@ -81,7 +81,7 @@
8181
},
8282
'VCLinkerTool': {
8383
'AdditionalDependencies': ['psapi.lib'],
84-
'AdditionalLibraryDirectories': ["<!@(node -e \"console.log(process.env.COLCON_PREFIX_PATH.replace(/;/, '\\\lib ').replace(/\\\/g, '/') + '/lib')\")",],
84+
'AdditionalLibraryDirectories': ["<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/;/, '\\\lib ').replace(/\\\/g, '/') + '/lib')\")",],
8585
}
8686
}
8787
}
@@ -93,10 +93,10 @@
9393
'OS_MACOS'
9494
],
9595
'include_dirs': [
96-
"<!@(node -e \"console.log(process.env.COLCON_PREFIX_PATH.replace(/:/, '/include/ ') + '/include/')\")",
96+
"<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/, '/include/ ') + '/include/')\")",
9797
],
9898
'library_dirs': [
99-
"<!@(node -e \"console.log(process.env.COLCON_PREFIX_PATH.replace(/:/, '/lib/ ') + '/lib/')\")",
99+
"<!@(node -e \"console.log(process.env.AMENT_PREFIX_PATH.replace(/:/, '/lib/ ') + '/lib/')\")",
100100
],
101101
'xcode_settings': {
102102
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',

0 commit comments

Comments
 (0)