X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=5a807cbeea28dd7b536a8deb8d88a545ce4cb491;hp=00f929aa037edf6f89a7301712289b5fd9e3f0e7;hb=5f44a3680b5d63cd07a5ec28ae32684b55f55002;hpb=50d4aefd5eb66ae330642675ac60283801ce24a3 diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 00f929a..5a807cb 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -2,7 +2,7 @@ ## ## This file is part of the sigrok-util project. ## -## Copyright (C) 2013 Uwe Hermann +## Copyright (C) 2013-2014 Uwe Hermann ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -28,20 +28,26 @@ MXE=$HOME/mxe-git PREFIX=$HOME/sr_mingw # The path where to download files to and where to build packages. -BUILDDIR=./sr_mingw_build +BUILDDIR=./build + +# Edit this to enable/disable/modify parallel compiles. +PARALLEL="-j 2" # You usually don't need to change anything below this line. # ----------------------------------------------------------------------------- VER_LIBUSB_WIN32=1.2.6.0 +VER_ZADIG=v2.0.1.160 SF_MIRROR=switch.dl.sourceforge.net +WGET="wget --quiet" + # ----------------------------------------------------------------------------- -# We need to find tools in the toolchain and in the install directory. -export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH +# We need to find tools in the toolchain. +export PATH=$MXE/usr/bin:$PATH P="$PREFIX/lib/pkgconfig" P2="$MXE/usr/i686-pc-mingw32/lib/pkgconfig" @@ -56,14 +62,14 @@ cd $BUILDDIR # ----------------------------------------------------------------------------- -# Python3 +mkdir -p $PREFIX + # Cross-compiling Python is highly non-trivial, so we avoid it for now. # The download below is a repackaged tarball of the official Python 3.2.3 MSI -# installer for Windows: http://python.org/ftp/python/3.2.3/python-3.2.3.msi -# The MSI file has been installed on a Windows box and then the c:\Python32 -# files have been stored in the Python32.tar.gz tarball. -mkdir -p $PREFIX -wget http://www.sigrok.org/tmp/Python32.tar.gz -O $PREFIX/Python32.tar.gz +# installer for Windows: http://python.org/ftp/python/3.2.3/python-3.2.3.msi. +# The MSI file has been installed on a Windows box and then c:\Python32\libs +# and c:\Python32\include have been stored in the Python32.tar.gz tarball. +$WGET http://www.sigrok.org/tmp/Python32.tar.gz -O $PREFIX/Python32.tar.gz tar xzf $PREFIX/Python32.tar.gz -C $PREFIX # Create a dummy python3.pc file so that pkg-config finds Python 3. @@ -80,20 +86,35 @@ Libs: -L$PREFIX/Python32/libs -lpython32 Cflags: -I$PREFIX/Python32/include EOF -# Download the Python 3.2.3 MSI installer (needed for NSIS runs). -wget -c http://python.org/ftp/python/3.2.3/python-3.2.3.msi \ - -O $PREFIX/python-3.2.3.msi +# The python32.dll and python32.zip files will be shipped in the NSIS +# Windows installers (required for protocol decoding to work). +# The file python32.dll (NOT the same as python3.dll) is copied from an +# installed Python 3.2.3 (see above) from c:\Windows\system32\python32.dll. +# The file python32.zip contains all files from the 'DLLs', 'Lib', and 'libs' +# subdirectories from an installed Python on Windows (c:\python32), i.e. some +# libraries and all Python stdlib modules. +$WGET http://www.sigrok.org/tmp/python32.dll -O $PREFIX/python32.dll +$WGET http://www.sigrok.org/tmp/python32.zip -O $PREFIX/python32.zip # libusb0.dll (needs to be shipped with frontends) -wget -c http://$SF_MIRROR/project/libusb-win32/libusb-win32-releases/$VER_LIBUSB_WIN32/libusb-win32-bin-$VER_LIBUSB_WIN32.zip -unzip libusb-win32-bin-$VER_LIBUSB_WIN32.zip +$WGET -c http://$SF_MIRROR/project/libusb-win32/libusb-win32-releases/$VER_LIBUSB_WIN32/libusb-win32-bin-$VER_LIBUSB_WIN32.zip +unzip -q libusb-win32-bin-$VER_LIBUSB_WIN32.zip cp -f libusb-win32-bin-$VER_LIBUSB_WIN32/bin/x86/libusb0_x86.dll $PREFIX/libusb0.dll +# Zadig (we ship this with frontends for easy driver switching). +$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_$VER_ZADIG.7z +$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_xp_$VER_ZADIG.7z +7zr e zadig_$VER_ZADIG.7z +7zr e zadig_xp_$VER_ZADIG.7z +cp -f zadig.exe zadig_xp.exe $PREFIX + # libserialport git clone git://sigrok.org/libserialport cd libserialport ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install +PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L +make $PARALLEL V=1 +make install cd .. # libsigrok @@ -101,14 +122,19 @@ git clone git://sigrok.org/libsigrok cd libsigrok patch -p1 < ../../libsigrok_firmwaredir.patch ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install +PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L +make $PARALLEL V=1 +make install cd .. # libsigrokdecode git clone git://sigrok.org/libsigrokdecode cd libsigrokdecode ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install +patch -p1 < ../../srd_decodersdir.patch +PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L +make $PARALLEL V=1 +make install cd .. # sigrok-firmware @@ -126,25 +152,32 @@ cd sigrok-firmware-fx2lafw ./autogen.sh # We're building the fx2lafw firmware on the host, no need to cross-compile. ./configure --prefix=$PREFIX -make +make $PARALLEL V=1 make install cd .. +# sigrok-dumps +git clone git://sigrok.org/sigrok-dumps +cd sigrok-dumps +make install DESTDIR=$PREFIX/share/sigrok-dumps +cd .. + # sigrok-cli git clone git://sigrok.org/sigrok-cli cd sigrok-cli -patch -p1 < ../../sigrok_cli_decodersdir.patch ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install +PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C +make $PARALLEL V=1 +make install makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi cd .. # PulseView git clone git://sigrok.org/pulseview cd pulseview -patch -p1 < ../../pulseview_linkfix.patch -patch -p1 < ../../pulseview_decodersdir.patch -PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y . && make install VERBOSE=1 +PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . +make $PARALLEL VERBOSE=1 +make install makensis -DHOME=$HOME contrib/pulseview_cross.nsi cd ..