use Visual Studio 2017

ros2 · Apr 11, 2018 · 5d8de25 · 5d8de25
1 parent f4e517f
commit 5d8de25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ros2_batch_job/packaging.py b/ros2_batch_job/packaging.py
@@ -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:

diff --git a/ros2_batch_job/windows_batch/__init__.py b/ros2_batch_job/windows_batch/__init__.py
@@ -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))
@@ -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: