vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime files

Browse source 
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.
This commit is contained in:
Andrey Borzenkov 2014-01-21 20:54:09 +04:00
parent 443b322262
commit eec4237a32
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com>
* Makefile.am: Allow adding extra files to generated Windows ZIP
archive by setting GRUB_WINDOWS_EXTRA_DIST.
2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com> 2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com>
* configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype. * configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype.

4
Makefile.am
View file

@ -420,10 +420,14 @@ windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
for x in $(starfield_DATA); do \ for x in $(starfield_DATA); do \
cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \ cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \
done done
for x in $(GRUB_WINDOWS_EXTRA_DIST); do \
cp -fp $$x $(windowsdir); \
done
windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
windowszip: windowsdir windowszip: windowsdir
test -f $(windowszip) && rm $(windowszip) || true test -f $(windowszip) && rm $(windowszip) || true
zip -r $(windowszip) $(windowsdir) zip -r $(windowszip) $(windowsdir)
rm -rf $(windowsdir)
EXTRA_DIST += linguas.sh EXTRA_DIST += linguas.sh