[vlc-devel] [vlc-commits] Win32: fix the copying of the plugins in the installer

[Rafaël Carré]

Hello,

makensis now fails with:

File: "sdk" -> no files found.
Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] |
   /oname=outfile one_file_only)
Error in macro InstallFolder on macroline 1
Error in script "/home/fun/vlc-2.2/build/vlc-2.2.2/vlc.win32.nsi" on
line 209 -- aborting creation process


vlc.win32.nsi.in still has !insertmacro InstallFolder sdk

Thus I can't build 2.2.2


On 20/01/2016 12:05, Thomas Nigro wrote:
> vlc/vlc-2.2 | branch: master | Thomas Nigro <tn at thomasnigro.fr> | Mon Jan 18 16:59:49 2016 +0100| [f88e58fbf5d5ce0dd67973c92091ac6ba16a96a6] | committer: Jean-Baptiste Kempf
> 
> Win32: fix the copying of the plugins in the installer
> 
> Also, don't copy the sdk folder
> 
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> (cherry picked from commit 93787b31ab3a5df283f14ef271baadd83a54712c)
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> 
>> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f88e58fbf5d5ce0dd67973c92091ac6ba16a96a6
> ---
> 
>  extras/package/win32/NSIS/helpers/install.nsh |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/extras/package/win32/NSIS/helpers/install.nsh b/extras/package/win32/NSIS/helpers/install.nsh
> index dac55d7..d604d2c 100644
> --- a/extras/package/win32/NSIS/helpers/install.nsh
> +++ b/extras/package/win32/NSIS/helpers/install.nsh
> @@ -29,7 +29,7 @@
>  !macroend
>  
>  !macro InstallFolder FOLDER
> -  File /r "${FOLDER}"
> +  File /r /x sdk "${FOLDER}"
>    Push "${FOLDER}"
>    Call InstallFolderInternal
>  !macroend