[vlc-commits] Win32: improve webplugins packaging

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec 29 02:51:27 2011 +0100| [76cf69a12d20c59a2183050d1bf8944decdeb50d] | committer: Jean-Baptiste Kempf

Win32: improve webplugins packaging

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

 extras/package/win32/package.mak |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index d379381..fbafe21 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -123,13 +123,12 @@ package-win32-webplugin-common: package-win-strip
 	find $(prefix) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
 	cp $(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins/"
 	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins/"
-	rm -rf "$(win32_xpi_destdir)/plugins/*qt*"
-	rm -rf "$(win32_xpi_destdir)/plugins/*skins*"
+	rm -rf "$(win32_xpi_destdir)/plugins/gui/"
 
 
 package-win32-xpi: package-win32-webplugin-common
 	cp $(top_builddir)/npapi-vlc/npapi/install.rdf "$(win32_xpi_destdir)/"
-	cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
+	cd $(win32_xpi_destdir) && zip -r -9 "../vlc-$(VERSION).xpi" install.rdf plugins
 
 
 package-win32-crx: package-win32-webplugin-common
@@ -177,7 +176,7 @@ package-win32-debug-7zip: package-win-common
 package-win32-cleanup:
 	rm -Rf $(win32_destdir) $(win32_debugdir) $(win32_xpi_destdir)
 
-package-win32: package-win32-zip package-win32-7zip package-win32-exe package-win32-xpi
+package-win32: package-win32-zip package-win32-7zip package-win32-exe package-win32-xpi package-win32-crx
 
 package-win32-debug: package-win32-debug-zip package-win32-debug-7zip