[vlc-devel] [PATCH] nsis: do not look for plugins/ folder elsewhere than /plugins/

[Rafaël Carré]

On 01/21/2016 07:42 PM, Rafaël Carré wrote:
> On 01/21/2016 06:14 PM, Jean-Baptiste Kempf wrote:
>> On 20 Jan, Jean-Baptiste Kempf wrote :
>>> On 20 Jan, Rafaël Carré wrote :
>>>> This patch should do the right thing.
>>>
>>> Does this work with plugins subfolders? like plugins/a/b/file.dll ?
>>>
>>> If so, yes, that could be the right fix. Please fix on vlc.git first,
>>> though.
>>
>> File: Returning to: "plugins/*.*"
>> File: "plugins/*.*\*.*" -> 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 "vlc.win32.nsi" on line 202 -- aborting creation process
>> zsh: exit 1     makensis vlc.win32.nsi
>>
>>
>> Did you test this change and it works for you?
> 
> Yes.

Hmm it seems you changed the commit that was cherry-picked in 2.2,
because 2.2 didn't have
1806cbc0576a98dc25d54d9f54b4f9cc054dee54

vlc.git:

commit 93787b31ab3a5df283f14ef271baadd83a54712c
Author: Thomas Nigro <tn at thomasnigro.fr>
Date:   Mon Jan 18 16:59:49 2016 +0100

    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>

diff --git a/extras/package/win32/NSIS/helpers/install.nsh
b/extras/package/win32/NSIS/helpers/install.nsh
index 9f22315..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


vlc-2.2.git:


commit f88e58fbf5d5ce0dd67973c92091ac6ba16a96a6
Author: Thomas Nigro <tn at thomasnigro.fr>
Date:   Mon Jan 18 16:59:49 2016 +0100

    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>

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


And since I tested the 2.2 version I did not see a problem.

With vlc.git, it meant that the path ultimately became plugins/*.*/*.* -
I tested vlc.git again and it packages fine
without a sdk/ folder


Now even if both commits "Win32: fix the copying of the plugins in the
installer Also, don't copy the sdk folder" resulted
in the same code shouldn't the cherry-pick have a "conflicting" message?


Also did I miss what 93787b31ab3a5df283f14ef271baadd83a54712c was fixing
beyond skipping sdk?
AFAIU this was meant for 2.2 but is not necessary with both
1806cbc0576a98dc25d54d9f54b4f9cc054dee54
and 16b6f69f50f5f7d0733203790e01e9f75d5a4446

Thanks,

> I guess you're not testing on buildbot since it doesn't build anymore :(
> Need contribs update?

I'll see if upgrading g++ on altair fixes this