[vlc-commits] win32: installers: Don't install manifests since they aren' t packaged anymore

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Mar  9 08:46:31 2017 +0100| [425f8b818efbda77ac638da0ac954325cbc38627] | committer: Jean-Baptiste Kempf

win32: installers: Don't install manifests since they aren't packaged anymore

(cherry picked from commit 61135774c164864a5a8b748c40fc9a8e6bac6c6a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/package/win32/NSIS/vlc.win32.nsi.in | 5 -----
 extras/package/win32/msi/product.wxs       | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 97d892b..db34252 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -195,7 +195,6 @@ ${MementoSection} $Name_Section01 SEC01
 
   ; VLC.exe, libvlc.dll
   !insertmacro InstallFile vlc.exe
-  !insertmacro InstallFile vlc.exe.manifest
   !insertmacro InstallFile vlc-cache-gen.exe
 
   ; All dlls
@@ -280,7 +279,6 @@ ${MementoSection} $Name_Section03 SEC03
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
   !insertmacro InstallFile npvlc.dll
-  !insertmacro InstallFile npvlc.dll.manifest
   !insertmacro CloseUninstallLog
 
   !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
@@ -299,7 +297,6 @@ ${MementoSection} $Name_Section04 SEC04
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
   !insertmacro InstallFile axvlc.dll
-  !insertmacro InstallFile axvlc.dll.manifest
   !insertmacro CloseUninstallLog
 @HAVE_WIN64_FALSE@ RegDLL "$INSTDIR\axvlc.dll"
 @HAVE_WIN64_TRUE@  ExecWait 'regsvr32.exe /s "$INSTDIR\axvlc.dll"'
@@ -921,7 +918,6 @@ Section "un.$Name_Section91" SEC91
 @HAVE_WIN64_FALSE@ UnRegDLL "$INSTDIR\axvlc.dll"
 @HAVE_WIN64_TRUE@  ExecWait 'regsvr32.exe /s /u "$INSTDIR\axvlc.dll"'
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"
-  Delete /REBOOTOK "$INSTDIR\axvlc.dll.manifest"
 
   ;remove mozilla plugin
   Push $R0
@@ -949,7 +945,6 @@ Section "un.$Name_Section91" SEC91
   "${Index}-End:"
   !undef Index
   Delete /REBOOTOK "$INSTDIR\npvlc.dll"
-  Delete /REBOOTOK "$INSTDIR\npvlc.dll.manifest"
 
   RMDir "$SMPROGRAMS\VideoLAN"
   RMDir /r $SMPROGRAMS\VideoLAN
diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index 6cb97f4..a3e2ed6 100644
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -84,7 +84,6 @@
 
                         <Component Id='CompVLC' Guid='$(var.CompVLCexe)' Win64="$(var.Win64)">
                             <File Id='vlc.exe' Name='vlc.exe' KeyPath='yes' Vital='yes' DiskId='1' />
-                            <File Id='vlc.exe.manifest' Name='vlc.exe.manifest' DiskId='1' />
 
                             <Shortcut Id="DesktopShortcut"
                                 Directory="DesktopFolder"
@@ -124,17 +123,14 @@
 
                         <Component Id='CompLibvlc' Guid='50d7e1e1-4512-4020-9f7b-5dc8484574f3' Win64="$(var.Win64)">
                             <File Id='libvlc.dll' Name='libvlc.dll' KeyPath='yes' Vital='yes' DiskId='1' />
-                            <File Id='libvlc.dll.manifest' Name='libvlc.dll.manifest' 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' />
-                            <File Id='npvlc.dll.manifest' Name='npvlc.dll.manifest' 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' />
-                            <File Id='axvlc.dll.manifest' Name='axvlc.dll.manifest' DiskId='1' />
                         </Component>
 
                         <Component Id='CompCacheGen' Guid='e1b4a499-e223-4c18-9de0-258f12b8dcfa' Win64="$(var.Win64)">