Re: [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files

[Andrey Borzenkov]

В Tue, 21 Jan 2014 08:26:04 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <address@hidden> пишет:

> On 19.01.2014 05:15, Andrey Borzenkov wrote:
> > В Sun, 19 Jan 2014 02:23:41 +0100
> > Vladimir 'φ-coder/phcoder' Serbinenko <address@hidden> пишет:
> > 
> >> On 18.01.2014 17:26, Andrey Borzenkov wrote:
> >>> export GRUB_EXTRA_DLLS="/path/to/liblzma.dll /path/to/libintl.dll"
> >>> make
> >>> make windowszip
> >> Perhaps a better name to indicate that you could use it to add any extra
> >> files to zip. Perhaps GRUB_WINDOWS_EXTRA_DIST ?
> >>
> > 
> > I thought about it, but was not sure - *DIST would imply arbitrary
> > file location inside archive and that becomes far too complicated.
> I don't think that just fixing target would be of any issue.


Is it OK?

From: Andrey Borzenkov <address@hidden>
Subject: [PATCH] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime files

Not all toolkits provide static libraries. This patch enables creation of self
contained distribution that does not require pre-existing runtime libraries.
Intended usage is

export GRUB_WINDOWS_EXTRA_DIST="/path/to/liblzma.dll /path/to/libintl.dll"
make
make windowszip

As those libraries and locations are dependent on toolchain in use, trying
to autodetect them is likely impossible. So just provide a simple way to
package everything in one step.

Also remove $(windowsdir) after ZIP was created same as other "make dist"
targets.

---
 Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 97c062d..f02ae0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -420,10 +420,14 @@ windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
        for x in $(starfield_DATA); do \
                cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \
        done
+       for x in $(GRUB_WINDOWS_EXTRA_DIST); do \
+               cp -fp $$x $(windowsdir); \
+       done
 
 windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
 windowszip: windowsdir
        test -f $(windowszip) && rm $(windowszip) || true
        zip -r $(windowszip) $(windowsdir)
+       rm -rf $(windowsdir)
 
 EXTRA_DIST += linguas.sh
-- 
tg: (443b322..) u/mingw/extra_windows_dist (depends on: master)

signature.asc
Description: PGP signature