[PATCH 2/2] Windows packaging script: check mingw bin directory

[Alberto Corona]

Actually Dirk, IIRC the directory /usr/i686-w64-mingw32/bin also
exists on Fedora
where that isn't the proper mingw bin directory, this patch gets the correct
directory on Fedora.

On Tue, Mar 25, 2014 at 1:42 PM, Alberto Corona <albcoron at gmail.com> wrote:
> On Tue, Mar 25, 2014 at 11:24:09AM -0700, Dirk Hohndel wrote:
>> On Tue, 2014-03-25 at 12:54 -0500, Alberto Corona wrote:
>> > Windows packaging script now checks whether the mingw bin directory is
>> > in either /usr/i686-w64-mingw32/bin or
>> > /usr/i686-w64-mingw32/sys-root/mingw/bin
>> >
>> > Signed-off-by: Alberto Corona <albcoron at gmail.com>
>> > ---
>> >  packaging/windows/mingw-make.sh | 12 +++++++++---
>> >  1 file changed, 9 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh
>> > index 7ca88ea..c8f97e1 100755
>> > --- a/packaging/windows/mingw-make.sh
>> > +++ b/packaging/windows/mingw-make.sh
>> > @@ -10,6 +10,12 @@
>> >  # number
>> >  rm packaging/windows/subsurface.nsi > /dev/null 2>&1
>> >
>> > -export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
>> > -mingw32-qmake-qt4 CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api
>> > -mingw32-make $@
>> > +if [ -d "/usr/i686-w64-mingw32/bin" ] ; then
>> > +   export path=/usr/i686-w64-mingw32/bin:$PATH
>
>> lower case "path" ???
>
> Totally missed that, fixed.
>
>> > +   i686-w64-mingw32-qmake CROSS_PATH=/usr/i686-w64-mingw32/ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api
>> > +   make $@
>
>> which distro uses that prefix for qmake and a "straight" make?
>> Would be nice to document that in a code comment (the existing
>> script works on Fedora 20)
>
> This is on Arch
>
>> > +else
>> > +   export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
>> > +   mingw32-qmake-qt4 CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api
>> > +   mingw32-make $@
>> > +fi
>>
>> Thanks
>>
>> /D
>>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Windows-packaging-script-check-mingw-bin-directory.patch
Type: text/x-patch
Size: 1425 bytes
Desc: not available
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20140325/5c40825a/attachment.bin>