[Spice-commits] 5 commits - .gitmodules Makefile.am mingw-spice-vdagent.spec.in spice-vdagent.wxs.in
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Mar 19 16:49:23 UTC 2020
.gitmodules | 1 +
Makefile.am | 4 ++--
mingw-spice-vdagent.spec.in | 13 +++++++++++++
spice-vdagent.wxs.in | 7 ++++---
4 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit f00eb1f7b3ff633f8f0ef57bb6a6ec213bec000c
Author: Frediano Ziglio <fziglio at redhat.com>
Date: Wed Mar 18 20:13:10 2020 +0000
build: Add missing file to distribution
test-shell script is needed for "make check".
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Uri Lublin <uril at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 138f479..79dea8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,6 +102,7 @@ test_log_win_SOURCES = \
check_PROGRAMS += test-shell-win
TESTS += test-shell
+EXTRA_DIST += test-shell
test_shell_win_LDFLAGS = $(AM_LDFLAGS) -Wl,--subsystem,console
test_shell_win_LDADD = -luuid -lole32 -loleaut32
test_shell_win_SOURCES = \
commit 383e88cadb3048d1b0794e1bcbdc4ff15a1ee267
Author: Uri Lublin <uril at redhat.com>
Date: Wed Mar 4 15:39:25 2020 +0200
spec file: add msi installers
Signed-off-by: Uri Lublin <uril at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/mingw-spice-vdagent.spec.in b/mingw-spice-vdagent.spec.in
index 5fa9b7a..e9eb8e9 100644
--- a/mingw-spice-vdagent.spec.in
+++ b/mingw-spice-vdagent.spec.in
@@ -35,6 +35,7 @@ BuildRequires: mingw64-zlib-static
BuildRequires: mingw32-winpthreads-static
BuildRequires: mingw64-winpthreads-static
BuildRequires: pkgconfig
+BuildRequires: msitools
%if 0%{can_do_check_x64}
BuildRequires: ImageMagick wine-core(x86-64)
%endif
@@ -92,6 +93,8 @@ Features:
%mingw_configure --enable-debug
%mingw_make %{?_smp_mflags} V=1
+%mingw_make %{?_smp_mflags} V=1 msi
+
%if 0%{can_do_check_x86} || 0%{can_do_check_x64}
%check
%define mingw_build_win32 %{can_do_check_x86}
@@ -104,12 +107,22 @@ Features:
%install
%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%if 0%{mingw_build_win32}
+cp build_win32/spice-vdagent*.msi $RPM_BUILD_ROOT/%{mingw32_bindir}/
+%endif
+
+%if 0%{mingw_build_win64}
+cp build_win64/spice-vdagent*.msi $RPM_BUILD_ROOT/%{mingw64_bindir}/
+%endif
+
%files -n mingw32-spice-vdagent
%defattr(-,root,root)
%{mingw32_bindir}/vdagent.exe
%{mingw32_bindir}/vdservice.exe
+%{mingw32_bindir}/spice-vdagent*.msi
%files -n mingw64-spice-vdagent
%defattr(-,root,root)
%{mingw64_bindir}/vdagent.exe
%{mingw64_bindir}/vdservice.exe
+%{mingw64_bindir}/spice-vdagent*.msi
commit 07f4992d596e87cbaa9d9fc8438254be159be3f0
Author: Uri Lublin <uril at redhat.com>
Date: Mon Dec 23 14:05:47 2019 +0200
Ignore spice-protocol untracked files
This will help with making a release.
spice-protocol's .gitignore is generated and not committed,
so after running ./autogen.sh (autoreconf) git thinks
spice-protocol is dirty (just because of generated files).
Signed-off-by: Uri Lublin <uril at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/.gitmodules b/.gitmodules
index f946a4d..46920ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
[submodule "spice-protocol"]
path = spice-protocol
url = git://git.freedesktop.org/git/spice/spice-protocol.git
+ ignore=untracked
commit 3dfcc044359351f54d5f4c5f6797ccfd6a4890d2
Author: Uri Lublin <uril at redhat.com>
Date: Mon Dec 16 15:08:09 2019 +0200
MSI: Make SourceDir the path to executables
Make it possible to not put the executables under bin/
Signed-off-by: Uri Lublin <uril at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index f661445..138f479 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,8 +119,7 @@ spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-vdagent.wxs all
make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
MANUFACTURER="$(MANUFACTURER)" PRODUCT="$(PRODUCT)" \
INSTALLDIRECTORY="$(PRODUCT)" BINDIRECTORY=bin \
- wixl -D SourceDir=$(prefix) \
- -D DESTDIR=$$DESTDIR$(prefix) \
+ wixl -D SourceDir=$$DESTDIR$(prefix)/bin \
--arch $(WIXL_ARCH) -o $@ $<
msi: spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
index 7650d67..d4314db 100644
--- a/spice-vdagent.wxs.in
+++ b/spice-vdagent.wxs.in
@@ -46,10 +46,10 @@
<Directory Id="INSTALLDIR" Name="$(env.INSTALLDIRECTORY)">
<Directory Id="Dbindir" Name="$(env.BINDIRECTORY)">
<Component Id="CSpiceAgent" Guid="*" Win64="$(var.Win64)">
- <File Id='spiceagent' Name='vdagent.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdagent.exe' KeyPath='yes'/>
+ <File Id='spiceagent' Name='vdagent.exe' DiskId='1' Source='vdagent.exe' KeyPath='yes'/>
</Component>
<Component Id="CSpiceService" Guid="*" Win64="$(var.Win64)">
- <File Id='spiceservice' Name='vdservice.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdservice.exe' KeyPath='yes'/>
+ <File Id='spiceservice' Name='vdservice.exe' DiskId='1' Source='vdservice.exe' KeyPath='yes'/>
<ServiceInstall Id="ServiceInstall"
Name="spice-agent"
DisplayName="$(env.PRODUCT)"
commit 638a49aafea37f817d3321ac644600cf3bcfccc2
Author: Uri Lublin <uril at redhat.com>
Date: Mon Dec 16 15:02:17 2019 +0200
MSI: Package: only allow perMachine installation
When building on Windows with Wix, also add Platform to Package
as follows (wixl warns about it):
Platform="$(var.Arch)"
Signed-off-by: Uri Lublin <uril at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
index c451f13..7650d67 100644
--- a/spice-vdagent.wxs.in
+++ b/spice-vdagent.wxs.in
@@ -20,7 +20,8 @@
Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)"
Language="1033">
- <Package InstallerVersion="200" Compressed="yes" Comments="comments"/>
+ <Package InstallerVersion="200" Compressed="yes" Comments="comments"
+ InstallScope="perMachine"/>
<Media Id="1" Cabinet="cabinet.cab" EmbedCab="yes"/>
<Property Id="ARPHELPLINK" Value="https://www.spice-space.org"/>
More information about the Spice-commits
mailing list