[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 13/15] qga/wixl: simplify some pre-processing
From: |
marcandre . lureau |
Subject: |
[PULL v2 13/15] qga/wixl: simplify some pre-processing |
Date: |
Mon, 30 May 2022 00:51:35 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Sadly, wixl doesn't have 'elif'.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-14-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 651db6e51c..e5b0958e18 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.1
- [PULL v2 02/15] util/win32: simplify qemu_get_local_state_dir(), (continued)
- [PULL v2 02/15] util/win32: simplify qemu_get_local_state_dir(), marcandre . lureau, 2022/05/29
- [PULL v2 05/15] qga: add qga_open_cloexec() helper, marcandre . lureau, 2022/05/29
- [PULL v2 06/15] qga: use qga_open_cloexec() for safe_open_or_create(), marcandre . lureau, 2022/05/29
- [PULL v2 07/15] qga: throw an Error in ga_channel_open(), marcandre . lureau, 2022/05/29
- [PULL v2 08/15] qga: replace qemu_open_old() with qga_open_cloexec(), marcandre . lureau, 2022/05/29
- [PULL v2 11/15] qga/wixl: prefer variables over environment, marcandre . lureau, 2022/05/29
- [PULL v2 04/15] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/29
- [PULL v2 09/15] qga: make build_fs_mount_list() return a bool, marcandre . lureau, 2022/05/29
- [PULL v2 12/15] qga/wixl: require Mingw_bin, marcandre . lureau, 2022/05/29
- [PULL v2 10/15] test/qga: use G_TEST_DIR to locate os-release test file, marcandre . lureau, 2022/05/29
- [PULL v2 13/15] qga/wixl: simplify some pre-processing,
marcandre . lureau <=
- [PULL v2 14/15] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir, marcandre . lureau, 2022/05/29
- [PULL v2 15/15] test/qga: use g_auto wherever sensible, marcandre . lureau, 2022/05/29
- Re: [PULL v2 00/15] Misc patches, Richard Henderson, 2022/05/29