[Spice-devel] [NSIS 12/13] build: Put unversioned .exe installer in the ISO

[Yedidyah Bar David]

From: Christophe Fergeau <cfergeau at redhat.com>

While it makes sense to have a versioned .exe file when it's standalone,
when it's on an ISO, it's more natural to have an unversioned .exe
installer. This is achieved through the use of the --graft-points option
to mkisofs.

Change-Id: I1970348c6a72dcd44865c78d3348fc57766deb26
Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2064774..94bf433 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@ INSTALLER=spice-guest-tools-$(VERSION).exe
 INSTALL_NAME=spice-guest-tools-iso
 # ISO image filename
 ISO_IMAGE=SPICE-tools-$(DISPLAYED_VERSION).iso
+# name of the installer on the ISO
+ISO_INSTALLER_NAME=spice-guest-tools.exe
 # link also to this name which has no version
 ISO_GENERIC=SPICE-tools.iso
 # ISO image preparer and publisher
@@ -26,6 +28,7 @@ ifeq ($(MODE),OVIRT)
 INSTALLER=ovirt-guest-tools-setup-$(VERSION).exe
 INSTALL_NAME=ovirt-guest-tools-iso
 ISO_IMAGE=oVirt-toolsSetup_$(DISPLAYED_VERSION).iso
+ISO_INSTALLER_NAME=ovirt-guest-tools-setup.exe
 ISO_GENERIC=ovirt-tools-setup.iso
 ISO_P_TEXT=oVirt - KVM Virtualization Manager Project (www.ovirt.org)
 ISO_LABEL=oVirt-WGT-$(DISPLAYED_VERSION)
@@ -135,7 +138,7 @@ endif
 iso: $(ISO_IMAGE)
 
 $(ISO_IMAGE): installer
-	mkisofs -J -rational-rock -full-iso9660-filenames -verbose -V "$(ISO_LABEL)" -preparer "$(ISO_P_TEXT)" -publisher "$(ISO_P_TEXT)" -o "$(ISO_IMAGE)" bin drivers $(INSTALLER)
+	mkisofs -J -rational-rock -full-iso9660-filenames -verbose -V "$(ISO_LABEL)" -preparer "$(ISO_P_TEXT)" -publisher "$(ISO_P_TEXT)" -o "$(ISO_IMAGE)" -graft-points bin drivers $(ISO_INSTALLER_NAME)=$(INSTALLER)
 
 install: iso
 	mkdir -p "$(DESTDIR)$(INSTALL_DATA_DIR)"
-- 
2.1.4