xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/nsis.py: Fix destination directory name when invoked on Windows

Browse Source 
"make installer" on Windows fails with the following message:

  Traceback (most recent call last):
    File "G:\msys64\home\foo\git\qemu\scripts\nsis.py", line 89, in <module>
      main()
    File "G:\msys64\home\foo\git\qemu\scripts\nsis.py", line 34, in main
      with open(
  OSError: [Errno 22] Invalid argument:
  'R:/Temp/tmpw83xhjquG:/msys64/qemu/system-emulations.nsh'
  ninja: build stopped: subcommand failed.

Use os.path.splitdrive() to form a canonical path without the drive
letter on Windows. This works with cross-build on Linux too.

Fixes: 8adfeba953 ("meson: add NSIS building")
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Message-Id: <20220908132817.1831008-3-bmeng.cn@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Bin Meng 2022-09-08 21:28:12 +08:00 committed by Stefan Weil
parent 7f8c044018
commit 93dbca2ce9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/nsis.py
View File

@ -28,16 +28,18 @@ def main():
parser.add_argument("nsisargs", nargs="*") parser.add_argument("nsisargs", nargs="*")
args = parser.parse_args() args = parser.parse_args()
# canonicalize the Windows native prefix path
prefix = os.path.splitdrive(args.prefix)[1]
destdir = tempfile.mkdtemp() destdir = tempfile.mkdtemp()
try: try:
subprocess.run(["make", "install", "DESTDIR=" + destdir]) subprocess.run(["make", "install", "DESTDIR=" + destdir])
with open( with open(
os.path.join(destdir + args.prefix, "system-emulations.nsh"), "w" os.path.join(destdir + prefix, "system-emulations.nsh"), "w"
) as nsh, open( ) as nsh, open(
os.path.join(destdir + args.prefix, "system-mui-text.nsh"), "w" os.path.join(destdir + prefix, "system-mui-text.nsh"), "w"
) as muinsh: ) as muinsh:
for exe in sorted(glob.glob( for exe in sorted(glob.glob(
os.path.join(destdir + args.prefix, "qemu-system-*.exe") os.path.join(destdir + prefix, "qemu-system-*.exe")
)): )):
exe = os.path.basename(exe) exe = os.path.basename(exe)
arch = exe[12:-4] arch = exe[12:-4]
@ -61,7 +63,7 @@ def main():
!insertmacro MUI_DESCRIPTION_TEXT ${{Section_{0}}} "{1}" !insertmacro MUI_DESCRIPTION_TEXT ${{Section_{0}}} "{1}"
""".format(arch, desc)) """.format(arch, desc))
for exe in glob.glob(os.path.join(destdir + args.prefix, "*.exe")): for exe in glob.glob(os.path.join(destdir + prefix, "*.exe")):
signcode(exe) signcode(exe)
makensis = [ makensis = [
@ -69,7 +71,7 @@ def main():
"-V2", "-V2",
"-NOCD", "-NOCD",
"-DSRCDIR=" + args.srcdir, "-DSRCDIR=" + args.srcdir,
"-DBINDIR=" + destdir + args.prefix, "-DBINDIR=" + destdir + prefix,
] ]
dlldir = "w32" dlldir = "w32"
if args.cpu == "x86_64": if args.cpu == "x86_64":