[vlc-commits] macosx: Do not generate InfoPlist.strings anymore
David Fuhrmann
git at videolan.org
Mon Oct 19 19:19:31 CEST 2020
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Oct 17 12:46:52 2020 +0200| [468e864fb929bc849d71d99e6cbd6a09e436bd3a] | committer: David Fuhrmann
macosx: Do not generate InfoPlist.strings anymore
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=468e864fb929bc849d71d99e6cbd6a09e436bd3a
---
configure.ac | 1 -
extras/package/macosx/package.mak | 1 +
modules/gui/macosx/Makefile.am | 3 +++
.../gui/macosx/Resources/{InfoPlist.strings.in => InfoPlist.strings} | 0
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a09a3ef5b7..28a09d2b2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4644,7 +4644,6 @@ AM_COND_IF([HAVE_WIN32], [
AM_COND_IF([HAVE_DARWIN], [
AC_CONFIG_FILES([
- modules/gui/macosx/UI/InfoPlist.strings:modules/gui/macosx/Resources/InfoPlist.strings.in
share/macosx/Info.plist:share/Info.plist.in
])
])
diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index 49ea3d7b96..af41f0fbae 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -27,6 +27,7 @@ VLC.app: macos-install
cp -R "$(macos_destdir)$(datadir)/macosx/" $@
## Copy .strings file and .nib files
cp -R "$(top_builddir)/modules/gui/macosx/UI" $@/Contents/Resources/Base.lproj
+ cp "$(srcdir)/modules/gui/macosx/Resources/InfoPlist.strings" $@/Contents/Resources/Base.lproj/
## Copy Info.plist and convert to binary
cp -R "$(top_builddir)/share/macosx/Info.plist" $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 900f09a1ec..9540ae5bd7 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -489,6 +489,9 @@ libmacosx_plugin_la_RES += \
gui/macosx/Resources/vlc.scriptSuite \
gui/macosx/Resources/vlc.scriptTerminology
+libmacosx_plugin_la_RES += \
+ gui/macosx/Resources/InfoPlist.strings
+
if ENABLE_MACOSX_UI
dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES)
endif
diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in b/modules/gui/macosx/Resources/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/InfoPlist.strings.in
rename to modules/gui/macosx/Resources/InfoPlist.strings
More information about the vlc-commits
mailing list