VLC.app: set CFBundleVersion to git-describe.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Thu, 14 Aug 2008 00:45:20 +0000 (02:45 +0200)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Thu, 14 Aug 2008 00:59:01 +0000 (02:59 +0200)
Makefile.am
extras/package/macosx/Info.plist.in

index 1caf4ee..d7c58bf 100644 (file)
@@ -410,9 +410,10 @@ VLC-release.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       for i in  Resources Info.plist; do \
-         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-       done
+       REVISION=`git-describe` && \
+       cat $(top_builddir)/extras/package/macosx/Info.plist | \
+       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 \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -571,9 +572,10 @@ VLC.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       for i in  Resources Info.plist; do \
-         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-       done
+       REVISION=`git-describe` && \
+       cat $(top_builddir)/extras/package/macosx/Info.plist | \
+       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 \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -634,17 +636,11 @@ VLC.app: vlc
            cd ../../../../ && \
            cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app
-       rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        touch $(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) -d $(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 -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
        ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
index fd0218e..f39248b 100644 (file)
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
        <string>@VERSION@</string>
+       <key>CFBundleVersion</key>
+       <string>#REVISION#</string>
        <key>CFBundleSignature</key>
        <string>VLC#</string>
        <key>CFBundleURLTypes</key>
                        </array>
                </dict>
        </array>
-       <key>CFBundleVersion</key>
-       <string>@VERSION@</string>
        <key>NSAppleScriptEnabled</key>
        <string>YES</string>
        <key>NSMainNibFile</key>