Blame SOURCES/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch

a85e8e
From 290dac0294fcf7a441e80f10a59ffdea61a1c422 Mon Sep 17 00:00:00 2001
a85e8e
From: Andrey Borzenkov <arvidjaar@gmail.com>
a85e8e
Date: Tue, 21 Jan 2014 20:54:09 +0400
a85e8e
Subject: [PATCH 040/260] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
a85e8e
 files
a85e8e
a85e8e
Not all toolkits provide static libraries. This patch enables creation of self
a85e8e
contained distribution that does not require pre-existing runtime libraries.
a85e8e
Intended usage is
a85e8e
a85e8e
export GRUB_WINDOWS_EXTRA_DIST="/path/to/liblzma.dll /path/to/libintl.dll"
a85e8e
make
a85e8e
make windowszip
a85e8e
a85e8e
As those libraries and locations are dependent on toolchain in use, trying
a85e8e
to autodetect them is likely impossible. So just provide a simple way to
a85e8e
package everything in one step.
a85e8e
a85e8e
Also remove $(windowsdir) after ZIP was created same as other "make dist"
a85e8e
targets.
a85e8e
---
a85e8e
 ChangeLog   | 5 +++++
a85e8e
 Makefile.am | 4 ++++
a85e8e
 2 files changed, 9 insertions(+)
a85e8e
a85e8e
diff --git a/ChangeLog b/ChangeLog
a85e8e
index 3ba57aed8..1ede37091 100644
a85e8e
--- a/ChangeLog
a85e8e
+++ b/ChangeLog
a85e8e
@@ -1,5 +1,10 @@
a85e8e
 2014-01-21  Andrey Borzenkov <arvidjaar@gmail.com>
a85e8e
 
a85e8e
+	* Makefile.am: Allow adding extra files to generated Windows ZIP
a85e8e
+	archive by setting GRUB_WINDOWS_EXTRA_DIST.
a85e8e
+
a85e8e
+2014-01-21  Andrey Borzenkov <arvidjaar@gmail.com>
a85e8e
+
a85e8e
 	* configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype.
a85e8e
 	Show detected font path in summary.
a85e8e
 
a85e8e
diff --git a/Makefile.am b/Makefile.am
a85e8e
index 97c062d7d..f02ae0a39 100644
a85e8e
--- a/Makefile.am
a85e8e
+++ b/Makefile.am
a85e8e
@@ -420,10 +420,14 @@ windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
a85e8e
 	for x in $(starfield_DATA); do \
a85e8e
 		cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \
a85e8e
 	done
a85e8e
+	for x in $(GRUB_WINDOWS_EXTRA_DIST); do \
a85e8e
+		cp -fp $$x $(windowsdir); \
a85e8e
+	done
a85e8e
 
a85e8e
 windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
a85e8e
 windowszip: windowsdir
a85e8e
 	test -f $(windowszip) && rm $(windowszip) || true
a85e8e
 	zip -r $(windowszip) $(windowsdir)
a85e8e
+	rm -rf $(windowsdir)
a85e8e
 
a85e8e
 EXTRA_DIST += linguas.sh
a85e8e
-- 
a85e8e
2.13.0
a85e8e