Skip to content

V
vlc-2-2
Commit a017df43 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

VLC.app: set CFBundleVersion to git-describe.

parent 72676243
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 15 deletions
Makefile.am
View file @ a017df43
...@@ -410,9 +410,10 @@ VLC-release.app: vlc ...@@ -410,9 +410,10 @@ VLC-release.app: vlc
for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done done
for i in Resources Info.plist; do \ REVISION=`git-describe` && \
cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ cat $(top_builddir)/extras/package/macosx/Info.plist | \
done sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
for i in AUTHORS COPYING THANKS; do \ for i in AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
...@@ -571,9 +572,10 @@ VLC.app: vlc ...@@ -571,9 +572,10 @@ VLC.app: vlc
for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done done
for i in Resources Info.plist; do \ REVISION=`git-describe` && \
cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ cat $(top_builddir)/extras/package/macosx/Info.plist | \
done sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
for i in AUTHORS COPYING THANKS; do \ for i in AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
...@@ -634,17 +636,11 @@ VLC.app: vlc ...@@ -634,17 +636,11 @@ VLC.app: vlc
cd ../../../../ && \ cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
$(top_builddir)/VLC.app $(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
touch $(top_builddir)/VLC.app/Contents/MacOS/VLC touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC $(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
if test -n "$$i" ; \
then ln -sfn "`pwd`/$$i" \
"$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done && \
ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \ cat $(top_srcdir)/po/LINGUAS | while read i; do \
......
extras/package/macosx/Info.plist.in
View file @ a017df43
...@@ -737,6 +737,8 @@ ...@@ -737,6 +737,8 @@
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>@VERSION@</string> <string>@VERSION@</string>
<key>CFBundleVersion</key>
<string>#REVISION#</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>VLC#</string> <string>VLC#</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
...@@ -792,8 +794,6 @@ ...@@ -792,8 +794,6 @@
</array> </array>
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key>
<string>@VERSION@</string>
<key>NSAppleScriptEnabled</key> <key>NSAppleScriptEnabled</key>
<string>YES</string> <string>YES</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment