From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W4Yj6-0005Ez-0z for mharc-grub-devel@gnu.org; Sat, 18 Jan 2014 11:26:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4Yiz-0005El-A6 for grub-devel@gnu.org; Sat, 18 Jan 2014 11:26:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4Yir-00047F-3e for grub-devel@gnu.org; Sat, 18 Jan 2014 11:26:21 -0500 Received: from mail-lb0-x22f.google.com ([2a00:1450:4010:c04::22f]:49033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4Yiq-000477-Ri for grub-devel@gnu.org; Sat, 18 Jan 2014 11:26:13 -0500 Received: by mail-lb0-f175.google.com with SMTP id p9so1512225lbv.6 for ; Sat, 18 Jan 2014 08:26:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=PqgmWf3YbwrZS4qhAy1sjKO60ZRAQhqER/qkZKJ95yo=; b=Uam3tUYOj/665++yLmAGSwwOVJtt8qVIFpmFkSL4gy4BAlqSLiyobcn3IfjTWnZ+Xh h4xL3CVeNNEzxdgd9l6XOkYhhxWth+SwgotZDHStv4rcqX0TIDNijoivFwgLw0CwY2n2 y0jCLmcRVJ9HfED4bVfms17n/kyjh0WyeUawd4rTI+PvtxlvzyHMNg5QDw7uHOiAILMi zs2rpK+PX9Hy9GrtQMY73MipTqbkAwJxax00r58sr+gJKuBGw1Upds88HtOKtnvn1KD/ 2SoVVec5XXHj7Jd202yHShp5mWcptA097s6pEXg68WEgrJOaIld6aSpJJg0Fx4Xmyhg9 9x0A== X-Received: by 10.152.4.134 with SMTP id k6mr136837lak.68.1390062371778; Sat, 18 Jan 2014 08:26:11 -0800 (PST) Received: from localhost.localdomain (ppp91-76-163-241.pppoe.mtu-net.ru. [91.76.163.241]) by mx.google.com with ESMTPSA id p3sm4844249lae.2.2014.01.18.08.26.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jan 2014 08:26:11 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] add GRUB_WINDOWS_DLLS to make windowsdir to allow shipping runtime files Date: Sat, 18 Jan 2014 20:26:08 +0400 Message-Id: <1390062368-17349-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22f X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 16:26:27 -0000 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)