mirror of
https://gitlab.com/openlp/packaging.git
synced 2024-12-22 04:52:50 +00:00
Merge branch 'add-vlc-to-macos' into 'master'
Copy VLC files into macOS See merge request openlp/packaging!19
This commit is contained in:
commit
140d073f64
@ -285,7 +285,8 @@ 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, 'lib', fname), os.path.join(vlc_dest, fname))
|
||||
dest_file = os.readlink(os.path.join(vlc_path, 'lib', fname))
|
||||
copy(os.path.join(vlc_path, 'lib', dest_file), os.path.join(vlc_dest, fname))
|
||||
self._relink_binary(os.path.join('vlc', fname))
|
||||
if os.path.exists(os.path.join(vlc_dest, 'plugins')):
|
||||
rmtree(os.path.join(vlc_dest, 'plugins'))
|
||||
@ -390,7 +391,7 @@ class MacOSXBuilder(Builder):
|
||||
"""
|
||||
self._print('Copying extra files for macOS...')
|
||||
# Exclude VLC for now, at least
|
||||
# self._copy_vlc_files()
|
||||
self._copy_vlc_files()
|
||||
self._copy_bundle_files()
|
||||
self._copy_macosx_files()
|
||||
self._install_pyro4()
|
||||
|
Loading…
Reference in New Issue
Block a user