[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/16] qga/wixl: simplify some pre-processing
|
From: |
marcandre . lureau |
|
Subject: |
[PATCH 15/16] qga/wixl: simplify some pre-processing |
|
Date: |
Wed, 4 May 2022 21:30:24 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Sadly, wixl doesn't have 'elif'.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qga/installer/qemu-ga.wxs | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index 651db6e51cda..e5b0958e1898 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -1,21 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
- <?ifndef var.Arch?>
- <?error Define Arch to 32 or 64?>
- <?endif?>
-
<?if $(var.Arch) = "64"?>
<?define ArchLib=libgcc_s_seh-1.dll?>
<?define GaProgramFilesFolder="ProgramFiles64Folder" ?>
- <?endif?>
-
- <?if $(var.Arch) = "32"?>
- <?define ArchLib=libgcc_s_dw2-1.dll?>
- <?define GaProgramFilesFolder="ProgramFilesFolder" ?>
- <?endif?>
-
- <?ifndef var.ArchLib ?>
- <?error Unexpected Arch value $(var.Arch)?>
+ <?else?>
+ <?if $(var.Arch) = "32"?>
+ <?define ArchLib=libgcc_s_dw2-1.dll?>
+ <?define GaProgramFilesFolder="ProgramFilesFolder" ?>
+ <?else?>
+ <?error Unexpected Arch value $(var.Arch)?>
+ <?endif?>
<?endif?>
<Product
--
2.36.0.44.g0f828332d5ac
- Re: [PATCH 06/16] include: adjust header guards after renaming, (continued)
- [PATCH 08/16] osdep: export qemu_open_cloexec(), marcandre . lureau, 2022/05/04
- [PATCH 07/16] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/04
- [PATCH 09/16] qga: use qemu_open_cloexec() for safe_open_or_create(), marcandre . lureau, 2022/05/04
- [PATCH 10/16] qapi/error: add g_autoptr(Error) support, marcandre . lureau, 2022/05/04
- [PATCH 11/16] qga: replace qemu_open_old() with qemu_open_cloexec(), marcandre . lureau, 2022/05/04
- [PATCH 12/16] test/qga: use G_TEST_DIR to locate os-release test file, marcandre . lureau, 2022/05/04
- [PATCH 13/16] qga/wixl: prefer variables over environment, marcandre . lureau, 2022/05/04
- [PATCH 14/16] qga/wixl: require Mingw_bin, marcandre . lureau, 2022/05/04
- [PATCH 15/16] qga/wixl: simplify some pre-processing,
marcandre . lureau <=
- [PATCH 16/16] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir, marcandre . lureau, 2022/05/04
- Re: [PATCH 00/16] Misc cleanups, Paolo Bonzini, 2022/05/05