1
0
mirror of https://gitlab.com/openlp/packaging.git synced 2024-12-22 21:12:50 +00:00

Correct path to VLC libs on macOS, fix call to copytree

This commit is contained in:
Raoul Snyman 2019-07-03 23:33:08 -07:00
parent bd2abb355b
commit 9dee47520e
2 changed files with 3 additions and 3 deletions

View File

@ -295,11 +295,11 @@ class MacOSXBuilder(Builder):
os.makedirs(vlc_dest) os.makedirs(vlc_dest)
for fname in ['libvlc.dylib', 'libvlccore.dylib']: for fname in ['libvlc.dylib', 'libvlccore.dylib']:
self._print_verbose('... {}'.format(fname)) 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')): if os.path.exists(os.path.join(vlc_dest, 'plugins')):
rmtree(os.path.join(vlc_dest, 'plugins')) rmtree(os.path.join(vlc_dest, 'plugins'))
self._print_verbose('... copying VLC 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): def _copy_bundle_files(self):
""" """

View File

@ -419,7 +419,7 @@ class WindowsBuilder(Builder):
if os.path.exists(os.path.join(vlc_dest, 'plugins')): if os.path.exists(os.path.join(vlc_dest, 'plugins')):
rmtree(os.path.join(vlc_dest, 'plugins')) rmtree(os.path.join(vlc_dest, 'plugins'))
self._print_verbose('... copying VLC 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): def after_run_sphinx(self):
""" """