From 9dee47520e2c7bc7ca52587b62a2e8037d327a0b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 3 Jul 2019 23:33:08 -0700 Subject: [PATCH] Correct path to VLC libs on macOS, fix call to copytree --- builders/macosx-builder.py | 4 ++-- builders/windows-builder.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builders/macosx-builder.py b/builders/macosx-builder.py index 3a3a091..ed2dfe4 100644 --- a/builders/macosx-builder.py +++ b/builders/macosx-builder.py @@ -295,11 +295,11 @@ class MacOSXBuilder(Builder): os.makedirs(vlc_dest) for fname in ['libvlc.dylib', 'libvlccore.dylib']: self._print_verbose('... {}'.format(fname)) - copy(os.path.join(vlc_path, fname), os.path.join(vlc_dest, fname)) + copy(os.path.join(vlc_path, 'lib', fname), os.path.join(vlc_dest, fname)) if os.path.exists(os.path.join(vlc_dest, 'plugins')): rmtree(os.path.join(vlc_dest, 'plugins')) self._print_verbose('... copying VLC plugins') - copytree(os.path.join(vlc_path, 'plugins'), vlc_dest) + copytree(os.path.join(vlc_path, 'plugins'), os.path.join(vlc_dest, 'plugins')) def _copy_bundle_files(self): """ diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 2112771..5d2b482 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -419,7 +419,7 @@ class WindowsBuilder(Builder): if os.path.exists(os.path.join(vlc_dest, 'plugins')): rmtree(os.path.join(vlc_dest, 'plugins')) self._print_verbose('... copying VLC plugins') - copytree(os.path.join(vlc_path, 'plugins'), vlc_dest) + copytree(os.path.join(vlc_path, 'plugins'), os.path.join(vlc_dest, 'plugins')) def after_run_sphinx(self): """