- added installer for MacOSX VLC Plugin

- updated supported mime types in resource

diff --git a/Makefile.am b/Makefile.am
index a2ff636647f12d43dd23f419a12006f052880ae6..65a321e7ecc230a54378b95a8cd9030ebcd64734 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -840,9 +840,6 @@ package-macosx:
 
 # Copy relevant files 
        cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
-if BUILD_MOZILLA
-       cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/vlc-${VERSION}/VLC Plugin.plugin"
-endif
        cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/
 
 # Create disk image 
@@ -857,6 +854,19 @@ endif
 # Clean up
        rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
 
+package-macosx-plugin:
+if BUILD_MOZILLA
+       rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+       mkdir -p "$(top_builddir)/macosx-plugin-instdata"
+       cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
+       rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
+       /Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+       -f "$(top_builddir)/macosx-plugin-instdata" \
+       -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
+       -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
+       rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+endif
+
 package-translations:
        @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
          echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \

diff --git a/extras/MacOSX/plugin/InstallerDescription.plist b/extras/MacOSX/plugin/InstallerDescription.plist
new file mode 100644 (file)
index 0000000..8d68eff
--- /dev/null
+++ b/extras/MacOSX/plugin/InstallerDescription.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>IFPkgDescriptionDescription</key>
+       <string>Safari and Firefox Plug-In for the VideoLAN VLC Multimedia player.</string>
+       <key>IFPkgDescriptionTitle</key>
+       <string>VideoLAN VLC Internet Plug-In</string>
+</dict>
+</plist>

diff --git a/extras/MacOSX/plugin/InstallerInfo.plist b/extras/MacOSX/plugin/InstallerInfo.plist
new file mode 100644 (file)
index 0000000..154cb85
--- /dev/null
+++ b/extras/MacOSX/plugin/InstallerInfo.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleGetInfoString</key>
+       <string>0.8.5, The VideoLAN Team, All Rights Reserved.</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.videolan.vlc</string>
+       <key>CFBundleShortVersionString</key>
+       <string>0.8.5</string>
+       <key>IFMajorVersion</key>
+       <integer>0</integer>
+       <key>IFMinorVersion</key>
+       <integer>8</integer>
+       <key>IFPkgFlagAllowBackRev</key>
+       <false/>
+       <key>IFPkgFlagAuthorizationAction</key>
+       <string>AdminAuthorization</string>
+       <key>IFPkgFlagBackgroundAlignment</key>
+       <string>topleft</string>
+       <key>IFPkgFlagBackgroundScaling</key>
+       <string>none</string>
+       <key>IFPkgFlagDefaultLocation</key>
+       <string>/Library/Internet Plug-Ins</string>
+       <key>IFPkgFlagFollowLinks</key>
+       <true/>
+       <key>IFPkgFlagInstallFat</key>
+       <false/>
+       <key>IFPkgFlagInstalledSize</key>
+       <integer>30212</integer>
+       <key>IFPkgFlagIsRequired</key>
+       <false/>
+       <key>IFPkgFlagOverwritePermissions</key>
+       <false/>
+       <key>IFPkgFlagRelocatable</key>
+       <false/>
+       <key>IFPkgFlagRestartAction</key>
+       <string>NoRestart</string>
+       <key>IFPkgFlagRootVolumeOnly</key>
+       <true/>
+       <key>IFPkgFlagUpdateInstalledLanguages</key>
+       <false/>
+       <key>IFPkgFormatVersion</key>
+       <real>0.10000000149011612</real>
+</dict>
+</plist>

diff --git a/mozilla/vlc.r b/mozilla/vlc.r
index 83ad9275be8b3a28edef6abb3c17913bb0db804e..6d5fe9d01245302644d5406c4d12f040b14a41f3 100644 (file)
--- a/mozilla/vlc.r
+++ b/mozilla/vlc.r
@@ -13,8 +13,9 @@ data 'carb' (0)
 resource 'STR#' (126)
 {
     {
-        "VideoLAN WWW: http://videolan.org"
-        "VLC multimedia plugin"
+        "Version 0.8.5, Copyright 2006, The VideoLAN Team"
+        "<BR><A HREF='http://www.videolan.org'>http://www.videolan.org</A>",
+        "VLC Multimedia Plugin"
     };
 };
 
@@ -41,7 +42,9 @@ resource 'STR#' (127)
         "ASF stream",
         "",
         "",
-        "Google VLC Plugin"
+        "Google VLC Plugin",
+        "WAV audio",
+        "WAV audio"
     };
 };
 
@@ -69,6 +72,8 @@ resource 'STR#' (128,"MIME Type")
         "application/x-mplayer2", "",
         "video/x-ms-wmv", "",
         "video/x-google-vlc-plugin", "",
+        "audio/wav", "wav",
+        "audio/x-wav", "wav",
     };
 };