[vlc-commits] commit: Initial support for chrome/chromium (Luca Barbato )

[git at videolan.org]

vlc | branch: master | Luca Barbato <lu_zero at gentoo.org> | Tue Apr 27 00:49:46 2010 +0200| [fa6d48f4bee25c77b0ed1a46e45ba893b3f8201b] | committer: Jean-Baptiste Kempf 

Initial support for chrome/chromium

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

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa6d48f4bee25c77b0ed1a46e45ba893b3f8201b
---

 Makefile.am                       |   14 +++++++++++---
 configure.ac                      |    1 +
 projects/mozilla/manifest.json.in |    6 ++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 62ddd14..6ba5296 100644
--- 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 80ff9df..9358079 100644
--- 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
index 0000000..bed95d1
--- /dev/null
+++ b/projects/mozilla/manifest.json.in
@@ -0,0 +1,6 @@
+{
+  "name": "VideoLAN",
+  "version": "@VERSION_MAJOR at .@VERSION_MINOR at .@VERSION_REVISION at .@VERSION_EXTRA_RC@",
+  "description": "VLC Web Plugin Bundle",
+  "plugins": [{"path":"plugins/npvlc.dll", "public":true }]
+}