Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use Visual Studio 2017 #122

Closed
wants to merge 1 commit into from
Closed

use Visual Studio 2017 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ros2_batch_job/packaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ def exclude(filename):
h.add(args.installspace, arcname=folder_name, exclude=exclude)
elif args.os == 'windows':
archive_path = 'ros2-package-windows-%s.zip' % platform.machine()
# NOTE(esteve): hack to copy our custom built VS2015-compatible OpenCV DLLs
opencv_libdir = os.path.join(os.environ['OpenCV_DIR'], 'x64', 'vc14', 'bin')
# NOTE(esteve): hack to copy our custom built VS2017-compatible OpenCV DLLs
opencv_libdir = os.path.join(os.environ['OpenCV_DIR'], 'x64', 'vc15', 'bin')
for libpath in glob.glob('%s/*.dll' % opencv_libdir):
shutil.copy(libpath, os.path.join(args.installspace, 'bin', os.path.basename(libpath)))
with zipfile.ZipFile(archive_path, 'w') as zf:
Expand Down
6 changes: 3 additions & 3 deletions ros2_batch_job/windows_batch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def setup_env(self):
if self.args.connext:
pf = os.environ.get('ProgramFiles', "C:\\Program Files\\")
connext_env_file = os.path.join(
pf, 'rti_connext_dds-5.3.0', 'resource', 'scripts', 'rtisetenv_X64Win64VS2015.bat')
pf, 'rti_connext_dds-5.3.0', 'resource', 'scripts', 'rtisetenv_X64Win64VS2017.bat')
if not os.path.exists(connext_env_file):
warn("Asked to use Connext but the RTI env was not found at '{0}'".format(
connext_env_file))
Expand All @@ -67,8 +67,8 @@ def setup_env(self):
f.write("@echo off" + os.linesep)
f.write(
'call '
'"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" '
'x86_amd64 8.1' + os.linesep)
'"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" '
'x86_amd64' + os.linesep)
if connext_env_file is not None:
f.write('call "%s"%s' % (connext_env_file, os.linesep))
if opensplice_env_file is not None:
Expand Down