[vlc-commits] extras: package: win32: Remove npapi leftovers
Hugo Beauzée-Luyssen
git at videolan.org
Fri Jun 7 12:19:56 CEST 2019
vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jun 7 12:19:49 2019 +0200| [24efbdb2cc78c85a0dbf00ed73dcf926a31eaab9] | committer: Hugo Beauzée-Luyssen
extras: package: win32: Remove npapi leftovers
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24efbdb2cc78c85a0dbf00ed73dcf926a31eaab9
---
extras/package/win32/NSIS/vlc.win32.nsi.in | 17 -----------------
extras/package/win32/msi/product.wxs | 8 --------
extras/package/win32/package.mak | 30 +++++-------------------------
3 files changed, 5 insertions(+), 50 deletions(-)
diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index b5e0e1af01..35fef7aa00 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -388,23 +388,6 @@ ${MementoSection} "$(Name_Section02b)" SEC02b
${MementoSectionEnd}
SectionGroup /e "!$(Name_Section34)"
-!ifdef INSTALL_MOZILLA
-${MementoSection} "$(Name_Section03)" SEC03
- SectionIn 1 3
-
- SetOutPath "$INSTDIR"
- !insertmacro OpenUninstallLog
- !insertmacro InstallFile npvlc.dll
- !insertmacro CloseUninstallLog
-
- !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
- WriteRegStr HKLM ${Moz} "Description" "VLC Multimedia Plugin"
- WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\npvlc.dll"
- WriteRegStr HKLM ${Moz} "Product" "VLC media player"
- WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"
- WriteRegStr HKLM ${Moz} "Version" "${VERSION}"
-${MementoSectionEnd}
-!endif
!ifdef INSTALL_ACTIVEX
${MementoSection} "$(Name_Section04)" SEC04
diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index 7325fbef38..9dd50e42bc 100644
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -137,10 +137,6 @@
<File Id='libvlc.dll' Name='libvlc.dll' KeyPath='yes' Vital='yes' DiskId='1' />
</Component>
- <Component Id='CompNpvlc' Guid='e7d6b54c-c4ea-4280-90f5-c6ae80073d25' Win64="$(var.Win64)">
- <File Id='npvlc.dll' Name='npvlc.dll' KeyPath='yes' DiskId='1' />
- </Component>
-
<Component Id='CompAxvlc' Guid='cabe28b1-5586-4ac3-815b-4f3a834c0d54' Win64="$(var.Win64)">
<File Id='axvlc.dll' Name='axvlc.dll' KeyPath='yes' DiskId='1' />
</Component>
@@ -296,7 +292,6 @@
<ComponentRef Id='CompVLC' />
<ComponentRef Id='CompLibvlccore' />
<ComponentRef Id='CompLibvlc' />
- <ComponentRef Id='CompNpvlc' />
<ComponentRef Id='CompCacheGen' />
<ComponentRef Id='CompIcon' />
<ComponentRef Id='CompTXT' />
@@ -313,9 +308,6 @@
<ComponentRef Id='CompAxvlc' />
<ComponentGroupRef Id='CompAxvlcGroup' />
</Feature>
- <Feature Id='MOZILLA' Title='Mozilla plugin' Level='1' AllowAdvertise="no">
- <ComponentRef Id='CompNpvlc' />
- </Feature>
</Feature>
<Feature Id='FILEASSOCIATION' Title='File associations' Level='1' AllowAdvertise="no">
<Feature Id='VIDEOFILEASSOCIATION' Title='Video' Level='1' AllowAdvertise="no">
diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index c2c69d6bcd..1ce3d8c58f 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -5,7 +5,6 @@ endif
win32_destdir=$(top_builddir)/vlc-$(VERSION)
win32_debugdir=$(abs_top_builddir)/symbols-$(VERSION)
-win32_xpi_destdir=$(abs_top_builddir)/vlc-plugin-$(VERSION)
7ZIP_OPTS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on
@@ -88,13 +87,12 @@ endif
# Convert to DOS line endings
find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) -q {} \;
-package-win-npapi: build-npapi
+package-win-activex: build-npapi
cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
- cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
mkdir -p "$(win32_destdir)/sdk/activex/"
cp $(top_builddir)/npapi-vlc/activex/README.TXT $(top_builddir)/npapi-vlc/share/test/test.html $(win32_destdir)/sdk/activex/
-package-win-strip: package-win-common package-win-npapi
+package-win-strip: package-win-common package-win-activex
mkdir -p "$(win32_debugdir)"/
find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \
do if test -n "$$i" ; then \
@@ -104,24 +102,6 @@ package-win-strip: package-win-common package-win-npapi
fi ; \
done
-package-win32-webplugin-common: package-win-strip
- mkdir -p "$(win32_xpi_destdir)/plugins/"
- cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins/"
- cp "$(win32_destdir)/libvlc.dll" "$(win32_destdir)/libvlccore.dll" "$(win32_destdir)/npvlc.dll" "$(win32_xpi_destdir)/plugins/"
- rm -rf "$(win32_xpi_destdir)/plugins/plugins/gui/"
-
-
-package-win32-xpi: package-win32-webplugin-common
- cp $(top_builddir)/npapi-vlc/npapi/package/install.rdf "$(win32_xpi_destdir)/"
- zip -r -9 $(WINVERSION).xpi $(win32_xpi_destdir)/install.rdf $(win32_xpi_destdir)/plugins
-
-
-package-win32-crx: package-win32-webplugin-common
- cp $(top_builddir)/npapi-vlc/npapi/package/manifest.json "$(win32_xpi_destdir)/"
- crxmake --pack-extension "$(win32_xpi_destdir)" \
- --extension-output "$(win32_destdir)/$(WINVERSION).crx" --ignore-file install.rdf
-
-
$(win32_destdir)/NSIS/nsProcess.dll: extras/package/win32/NSIS/nsProcess/nsProcess.c extras/package/win32/NSIS/nsProcess/pluginapi.c
mkdir -p "$(win32_destdir)/NSIS/"
if HAVE_WIN64
@@ -165,9 +145,9 @@ package-win32-debug-7zip: package-win-common
$(SEVENZIP) a $(7ZIP_OPTS) $(WINVERSION)-debug.7z vlc-$(VERSION)
package-win32-cleanup:
- rm -Rf $(win32_destdir) $(win32_debugdir) $(win32_xpi_destdir)
+ rm -Rf $(win32_destdir) $(win32_debugdir)
-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-debug: package-win32-debug-zip package-win32-debug-7zip
@@ -196,7 +176,7 @@ package-wince: package-win-strip
rm -f -- vlc-$(VERSION)-wince.zip
zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
-.PHONY: package-win-install package-win-common package-win-strip package-win32-webplugin-common package-win32-xpi package-win32-crx package-win32-exe package-win32-zip package-win32-debug-zip package-win32-7zip package-win32-debug-7zip package-win32-cleanup package-win32 package-win32-debug package-wince
+.PHONY: package-win-install package-win-common package-win-strip package-win32-exe package-win32-zip package-win32-debug-zip package-win32-7zip package-win32-debug-7zip package-win32-cleanup package-win32 package-win32-debug package-wince
EXTRA_DIST += \
extras/package/win32/vlc.exe.manifest \
More information about the vlc-commits
mailing list