X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=8330406ecd28969d8d29c8ad23df8968a4b9ec68;hp=7fba4f9a17865aefce253b2bd65a923eaea5abc1;hb=616a4523599b4c2925b5811fdb3dfdd6fa12602e;hpb=07947dda98729499f1c8b85a8ce8b27d9f5a6753 diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 7fba4f9..8330406 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -1,8 +1,8 @@ -#!/bin/bash +#!/bin/sh ## ## This file is part of the sigrok-util project. ## -## Copyright (C) 2013 Uwe Hermann +## Copyright (C) 2013-2018 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 @@ -15,46 +15,78 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## along with this program; if not, see . ## set -e +# Build target: "i686" (32bit) or "x86_64" (64bit). +TARGET="i686" + # The path where your MXE directory is located. MXE=$HOME/mxe-git -# The path where the cross-compiled packages will be installed. -PREFIX=$HOME/sr_mingw +# The base path prefix where the cross-compiled packages will be installed. +PREFIXBASE=$HOME/sr_mingw + +# The base path prefix where to download files to and where to build packages. +BUILDBASE=./build -# The path where to download files to and where to build packages. -BUILDDIR=./build +# Edit this to control verbose build output. +# V="V=1 VERBOSE=1" # Edit this to enable/disable/modify parallel compiles. PARALLEL="-j 2" +# Edit this to enable/disable debug builds. +DEBUG=0 + # You usually don't need to change anything below this line. # ----------------------------------------------------------------------------- -VER_LIBUSB_WIN32=1.2.6.0 -VER_ZADIG=v2.0.1.160 +WGET="wget -c --quiet" +GIT_CLONE="git clone --depth=1" + +REPO_BASE="git://sigrok.org" + +# Construct the build and install directory pathnames. +if [ $TARGET = "i686" ]; then + SUFFIX="32" +else + SUFFIX="64" +fi +if [ $DEBUG = 1 ]; then + # CFLAGS/CXXFLAGS contains "-g" per default for autotools projects. + BUILD_TYPE="Debug" + PREFIX=$PREFIXBASE"_debug_"$SUFFIX + BUILDDIR=$BUILDBASE"_debug_"$SUFFIX +else + BUILD_TYPE="Release" + PREFIX=$PREFIXBASE"_release_"$SUFFIX + BUILDDIR=$BUILDBASE"_release_"$SUFFIX +fi -SF_MIRROR=switch.dl.sourceforge.net +# ----------------------------------------------------------------------------- -WGET="wget --quiet" +# We need to find tools in the toolchain. +export PATH=$MXE/usr/bin:$PATH -# ----------------------------------------------------------------------------- +TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static.posix" -# We need to find tools in the toolchain and in the install directory. -export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH +CMAKE="$TOOLCHAIN_TRIPLET-cmake" P="$PREFIX/lib/pkgconfig" -P2="$MXE/usr/i686-pc-mingw32/lib/pkgconfig" -C="--host=i686-pc-mingw32 --prefix=$PREFIX" -CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/i686-pc-mingw32/share/cmake/mxe-conf.cmake" +P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig" +C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX CPPFLAGS=-D__printf__=__gnu_printf__" L="--disable-shared --enable-static" +if [ $TARGET = "i686" ]; then + export PKG_CONFIG_PATH_i686_w64_mingw32_static_posix="$P:$P2" +else + export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2" +fi + # Remove build directory contents (if any) and create a new build dir. rm -rf $BUILDDIR mkdir $BUILDDIR @@ -62,15 +94,17 @@ cd $BUILDDIR # ----------------------------------------------------------------------------- -# Python3 -# 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 -tar xzf $PREFIX/Python32.tar.gz -C $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.4.4 MSI +# installer for Windows: +# - https://www.python.org/ftp/python/3.4.4/python-3.4.4.msi +# - https://www.python.org/ftp/python/3.4.4/python-3.4.4.amd64.msi +# The MSI file has been installed on a Windows box and then c:\Python34\libs +# and c:\Python34\include have been stored in the Python34_*.tar.gz tarball. +$WGET http://www.sigrok.org/tmp/Python34_$TARGET.tar.gz -O $PREFIX/Python34.tar.gz +tar xzf $PREFIX/Python34.tar.gz -C $PREFIX # Create a dummy python3.pc file so that pkg-config finds Python 3. mkdir -p $PREFIX/lib/pkgconfig @@ -81,98 +115,126 @@ libdir=\${exec_prefix}/lib includedir=\${prefix}/include Name: Python Description: Python library -Version: 3.2 -Libs: -L$PREFIX/Python32/libs -lpython32 -Cflags: -I$PREFIX/Python32/include +Version: 3.4 +Libs: $PREFIX/Python34/libs/libpython34.a +Cflags: -I$PREFIX/Python34/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 - -# 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 -q libusb-win32-bin-$VER_LIBUSB_WIN32.zip -cp -f libusb-win32-bin-$VER_LIBUSB_WIN32/bin/x86/libusb0_x86.dll $PREFIX/libusb0.dll +# The python34.dll and python34.zip files will be shipped in the NSIS +# Windows installers (required for protocol decoding to work). +# The file python34.dll (NOT the same as python3.dll) is copied from an +# installed Python 3.4.4 (see above) from c:\Windows\system32\python34.dll. +# The file python34.zip contains all files from the 'DLLs', 'Lib', and 'libs' +# subdirectories from an installed Python on Windows (c:\python34), i.e. some +# libraries and all Python stdlib modules. +$WGET http://www.sigrok.org/tmp/python34_$TARGET.dll -O $PREFIX/python34.dll +$WGET http://www.sigrok.org/tmp/python34_$TARGET.zip -O $PREFIX/python34.zip + +# In order to link against Python we need libpython34.a. +# The upstream Python 32bit installer ships this, the x86_64 installer +# doesn't. Thus, we generate the file manually here. +if [ $TARGET = "x86_64" ]; then + cp $PREFIX/python34.dll . + $MXE/usr/$TARGET-w64-mingw32.static.posix/bin/gendef python34.dll + $MXE/usr/bin/$TARGET-w64-mingw32.static.posix-dlltool \ + --dllname python34.dll --def python34.def \ + --output-lib libpython34.a + mv -f libpython34.a $PREFIX/Python34/libs + rm -f python34.dll +fi # 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 +$WGET http://zadig.akeo.ie/downloads/zadig.exe -O $PREFIX/zadig.exe +$WGET http://zadig.akeo.ie/downloads/zadig_xp.exe -O $PREFIX/zadig_xp.exe + +# libusb +$GIT_CLONE git://github.com/dickens/libusb -b event-abstraction-v4 +cd libusb +patch -p1 < ../../libusb_raw_io.patch +./bootstrap.sh +./configure $C $L +make -j1 $V +make install $V +cd .. # libserialport -git clone git://sigrok.org/libserialport +$GIT_CLONE $REPO_BASE/libserialport cd libserialport ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L -make $PARALLEL V=1 -make install +./configure $C $L +make $PARALLEL $V +make install $V cd .. # libsigrok -git clone git://sigrok.org/libsigrok +$GIT_CLONE $REPO_BASE/libsigrok cd libsigrok -patch -p1 < ../../libsigrok_firmwaredir.patch ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L -make $PARALLEL V=1 -make install +./configure $C $L +make $PARALLEL $V +make install $V cd .. # libsigrokdecode -git clone git://sigrok.org/libsigrokdecode +$GIT_CLONE $REPO_BASE/libsigrokdecode cd libsigrokdecode ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L -make $PARALLEL V=1 -make install +./configure $C $L +make $PARALLEL $V +make install $V cd .. # sigrok-firmware -git clone git://sigrok.org/sigrok-firmware +$GIT_CLONE $REPO_BASE/sigrok-firmware cd sigrok-firmware ./autogen.sh # Nothing gets cross-compiled here, we just need 'make install' basically. ./configure --prefix=$PREFIX -make install +make install $V cd .. # sigrok-firmware-fx2lafw -git clone git://sigrok.org/sigrok-firmware-fx2lafw +$GIT_CLONE $REPO_BASE/sigrok-firmware-fx2lafw cd sigrok-firmware-fx2lafw ./autogen.sh # We're building the fx2lafw firmware on the host, no need to cross-compile. ./configure --prefix=$PREFIX -make $PARALLEL V=1 -make install +make $PARALLEL $V +make install $V cd .. # sigrok-dumps -git clone git://sigrok.org/sigrok-dumps +$GIT_CLONE $REPO_BASE/sigrok-dumps cd sigrok-dumps -make install DESTDIR=$PREFIX/share/sigrok-dumps +make install DESTDIR=$PREFIX/share/sigrok-dumps $V cd .. # sigrok-cli -git clone git://sigrok.org/sigrok-cli +$GIT_CLONE $REPO_BASE/sigrok-cli cd sigrok-cli -patch -p1 < ../../sigrok_cli_decodersdir.patch ./autogen.sh -PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C -make $PARALLEL V=1 -make install -makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi +./configure $C +make $PARALLEL $V +make install $V +makensis contrib/sigrok-cli_cross.nsi cd .. # PulseView -git clone git://sigrok.org/pulseview +$GIT_CLONE $REPO_BASE/pulseview cd pulseview -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 -DENABLE_TESTS=y . -make $PARALLEL VERBOSE=1 -make install -makensis -DHOME=$HOME contrib/pulseview_cross.nsi +cp ../../FileAssociation.nsh contrib +$CMAKE \ + -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \ + -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ + -DDISABLE_WERROR=y \ + -DENABLE_TESTS=y \ + . +make $PARALLEL $V +if [ $DEBUG = 1 ]; then + make install $V +else + make install/strip $V +fi +makensis contrib/pulseview_cross.nsi cd ..