Reviewed-by: Konstantin Kostiuk <kkost...@redhat.com> On Thu, May 5, 2022 at 11:16 AM <marcandre.lur...@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com> > > Sadly, wixl doesn't have 'elif'. > > Signed-off-by: Marc-André Lureau <marcandre.lur...@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 > >
