nsis: gitlab-ci: Improve QEMU Windows installer packaging

[PATCH 1/7] scripts/nsis.py: Drop the unnecessary path separator

Posted by Bin Meng 3 years, 5 months ago

From: Bin Meng <bin.meng@windriver.com>

There is no need to append a path separator to the destination
directory that is passed to "make install".

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 scripts/nsis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/nsis.py b/scripts/nsis.py
index 462d6cac3b..bbb41d9386 100644
--- a/scripts/nsis.py
+++ b/scripts/nsis.py
@@ -30,7 +30,7 @@ def main():
 
     destdir = tempfile.mkdtemp()
     try:
-        subprocess.run(["make", "install", "DESTDIR=" + destdir + os.path.sep])
+        subprocess.run(["make", "install", "DESTDIR=" + destdir])
         with open(
             os.path.join(destdir + args.prefix, "system-emulations.nsh"), "w"
         ) as nsh, open(
-- 
2.34.1

Re: [PATCH 1/7] scripts/nsis.py: Drop the unnecessary path separator

Posted by Stefan Weil via 3 years, 3 months ago

Am 08.09.22 um 15:28 schrieb Bin Meng:
> From: Bin Meng <bin.meng@windriver.com>
> 
> There is no need to append a path separator to the destination
> directory that is passed to "make install".
> 
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
> 
>   scripts/nsis.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/nsis.py b/scripts/nsis.py
> index 462d6cac3b..bbb41d9386 100644
> --- a/scripts/nsis.py
> +++ b/scripts/nsis.py
> @@ -30,7 +30,7 @@ def main():
>   
>       destdir = tempfile.mkdtemp()
>       try:
> -        subprocess.run(["make", "install", "DESTDIR=" + destdir + os.path.sep])
> +        subprocess.run(["make", "install", "DESTDIR=" + destdir])
>           with open(
>               os.path.join(destdir + args.prefix, "system-emulations.nsh"), "w"
>           ) as nsh, open(

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Re: [PATCH 1/7] scripts/nsis.py: Drop the unnecessary path separator

Posted by Philippe Mathieu-Daudé via 3 years, 4 months ago

On 8/9/22 15:28, Bin Meng wrote:
> From: Bin Meng <bin.meng@windriver.com>
> 
> There is no need to append a path separator to the destination
> directory that is passed to "make install".
> 
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
> 
>   scripts/nsis.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>