grub-devel.gnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files
@ 2014-01-18 16:26 Andrey Borzenkov
  2014-01-19  1:23 ` Vladimir 'φ-coder/phcoder' Serbinenko
  0 siblings, 1 reply; 6+ messages in thread
From: Andrey Borzenkov @ 2014-01-18 16:26 UTC (permalink / raw)
  To: grub-devel

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_EXTRA_DLLS="/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 1bbec0e..649a10b 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_DLLS); 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: (5ef569d..) u/mingw/extra_windows_dist (depends on: master)


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files
  2014-01-18 16:26 [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files Andrey Borzenkov
@ 2014-01-19  1:23 ` Vladimir 'φ-coder/phcoder' Serbinenko
  2014-01-19  4:15   ` Andrey Borzenkov
  0 siblings, 1 reply; 6+ messages in thread
From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2014-01-19  1:23 UTC (permalink / raw)
  To: The development of GNU GRUB

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

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 ?


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 274 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files
  2014-01-19  1:23 ` Vladimir 'φ-coder/phcoder' Serbinenko
@ 2014-01-19  4:15   ` Andrey Borzenkov
  2014-01-21  7:26     ` Vladimir 'φ-coder/phcoder' Serbinenko
  0 siblings, 1 reply; 6+ messages in thread
From: Andrey Borzenkov @ 2014-01-19  4:15 UTC (permalink / raw)
  To: grub-devel

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

В Sun, 19 Jan 2014 02:23:41 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:

> 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. But I
do not have strong preference.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files
  2014-01-19  4:15   ` Andrey Borzenkov
@ 2014-01-21  7:26     ` Vladimir 'φ-coder/phcoder' Serbinenko
  2014-01-21 16:33       ` Andrey Borzenkov
  0 siblings, 1 reply; 6+ messages in thread
From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2014-01-21  7:26 UTC (permalink / raw)
  To: The development of GNU GRUB

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]

On 19.01.2014 05:15, Andrey Borzenkov wrote:
> В Sun, 19 Jan 2014 02:23:41 +0100
> Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:
> 
>> 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.
> But I
> do not have strong preference.
> 
> 
> 
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 274 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files
  2014-01-21  7:26     ` Vladimir 'φ-coder/phcoder' Serbinenko
@ 2014-01-21 16:33       ` Andrey Borzenkov
  2014-01-21 16:36         ` Vladimir 'φ-coder/phcoder' Serbinenko
  0 siblings, 1 reply; 6+ messages in thread
From: Andrey Borzenkov @ 2014-01-21 16:33 UTC (permalink / raw)
  To: grub-devel

[-- Attachment #1: Type: text/plain, Size: 2248 bytes --]

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

> On 19.01.2014 05:15, Andrey Borzenkov wrote:
> > В Sun, 19 Jan 2014 02:23:41 +0100
> > Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:
> > 
> >> 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 <arvidjaar@gmail.com>
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)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files
  2014-01-21 16:33       ` Andrey Borzenkov
@ 2014-01-21 16:36         ` Vladimir 'φ-coder/phcoder' Serbinenko
  0 siblings, 0 replies; 6+ messages in thread
From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2014-01-21 16:36 UTC (permalink / raw)
  To: The development of GNU GRUB

[-- Attachment #1: Type: text/plain, Size: 2504 bytes --]

Go ahead.
On 21.01.2014 17:33, Andrey Borzenkov wrote:
> В Tue, 21 Jan 2014 08:26:04 +0100
> Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:
> 
>> On 19.01.2014 05:15, Andrey Borzenkov wrote:
>>> В Sun, 19 Jan 2014 02:23:41 +0100
>>> Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:
>>>
>>>> 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 <arvidjaar@gmail.com>
> 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
> 
> 
> 
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 274 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-01-21 16:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-18 16:26 [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files Andrey Borzenkov
2014-01-19  1:23 ` Vladimir 'φ-coder/phcoder' Serbinenko
2014-01-19  4:15   ` Andrey Borzenkov
2014-01-21  7:26     ` Vladimir 'φ-coder/phcoder' Serbinenko
2014-01-21 16:33       ` Andrey Borzenkov
2014-01-21 16:36         ` Vladimir 'φ-coder/phcoder' Serbinenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).