Initial support for chrome/chromium

It relies on crxmake and doesn't preserve the private key.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/Makefile.am b/Makefile.am
index 62ddd14e42b08bd301782e5f617e82795e23ee65..6ba5296df51640315b1a40290320633b186a5ae2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -754,9 +754,8 @@ endif
        cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS"
        cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS"
 
-package-win32-xpi: package-win-common-strip
+prepare-win32-web-plugin: package-win-common-strip
        mkdir -p "$(win32_xpi_destdir)/plugins"
-       cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
        cp $(win32_destdir)/mozilla/npvlc$(LIBEXT) \
                "$(win32_xpi_destdir)/plugins"
        cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest \
@@ -772,7 +771,16 @@ package-win32-xpi: package-win-common-strip
                "$(win32_xpi_destdir)/plugins/plugins"
        rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
        rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
-       cd $(win32_xpi_destdir) && zip -r vlc-$(VERSION).xpi install.rdf plugins
+package-win32-xpi: prepare-win32-web-plugin
+       cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
+       cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" \
+                                       install.rdf plugins
+
+package-win32-crx: prepare-win32-web-plugin
+       cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)"
+       crxmake --pack-extension "$(win32_xpi_destdir)" \
+               --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" \
+               --ignore-file install.rdf
 
 package-win32-base-debug: package-win-common
 # Copy relevant files

diff --git a/configure.ac b/configure.ac
index 80ff9df50bcd68f8155bb183698170a9bdfda3f6..9358079ad6f6062d211555a0ef98f9b68adfb914 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4728,6 +4728,7 @@ AC_CONFIG_FILES([
   projects/mozilla/vlc.r
   projects/mozilla/install.js
   projects/mozilla/install.rdf
+  projects/mozilla/manifest.json
   share/Makefile
   compat/Makefile
   src/Makefile

diff --git a/projects/mozilla/manifest.json.in b/projects/mozilla/manifest.json.in
new file mode 100644 (file)
index 0000000..bed95d1
--- /dev/null
+++ b/projects/mozilla/manifest.json.in
@@ -0,0 +1,6 @@
+{
+  "name": "VideoLAN",
+  "version": "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@.@VERSION_EXTRA_RC@",
+  "description": "VLC Web Plugin Bundle",
+  "plugins": [{"path":"plugins/npvlc.dll", "public":true }]
+}