##
## This file is part of the sigrok-util project.
##
-## Copyright (C) 2013-2017 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2018 Uwe Hermann <uwe@hermann-uwe.de>
##
## 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
# 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 path where to download files to and where to build packages.
-BUILDDIR=./build
+# The base path prefix where to download files to and where to build packages.
+BUILDBASE=./build
# Edit this to control verbose build output.
# V="V=1 VERBOSE=1"
# -----------------------------------------------------------------------------
-SF_MIRROR=switch.dl.sourceforge.net
-
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
+
# -----------------------------------------------------------------------------
# We need to find tools in the toolchain.
export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2"
fi
-if [ $DEBUG = 1 ]; then
- # CFLAGS/CXXFLAGS contains "-g" per default for autotools projects.
- CM="$CM -DCMAKE_BUILD_TYPE=Debug"
-fi
-
# Remove build directory contents (if any) and create a new build dir.
rm -rf $BUILDDIR
mkdir $BUILDDIR
$WGET http://www.sigrok.org/tmp/Python34_$TARGET.tar.gz -O $PREFIX/Python34.tar.gz
tar xzf $PREFIX/Python34.tar.gz -C $PREFIX
+# Fix for bug #1195.
+if [ $TARGET = "x86_64" ]; then
+ patch -p1 $PREFIX/Python34/include/pyconfig.h < ../pyconfig.patch
+fi
+
# Create a dummy python3.pc file so that pkg-config finds Python 3.
mkdir -p $PREFIX/lib/pkgconfig
cat >$PREFIX/lib/pkgconfig/python3.pc <<EOF
$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 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
+$WGET https://github.com/pbatard/libwdi/releases/download/b721/zadig-2.4.exe -O $PREFIX/zadig.exe
+$WGET https://github.com/pbatard/libwdi/releases/download/v1.2.5/zadig_xp-2.2.exe -O $PREFIX/zadig_xp.exe
# libusb
$GIT_CLONE git://github.com/dickens/libusb -b event-abstraction-v4
./configure $C
make $PARALLEL $V
make install $V
-makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
+makensis contrib/sigrok-cli_cross.nsi
cd ..
# PulseView
$GIT_CLONE $REPO_BASE/pulseview
cd pulseview
-if [ $DEBUG = 1 ]; then
- # Allow a "DOS box" to open on Windows, it'll contain logging output.
- patch -p1 < ../../pv_mwindows.patch
-fi
-$CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y .
+cp ../../FileAssociation.nsh contrib
+$CMAKE \
+ -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
+ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+ -DDISABLE_WERROR=y \
+ -DENABLE_TESTS=y \
+ .
make $PARALLEL $V
+make manual
if [ $DEBUG = 1 ]; then
make install $V
else
make install/strip $V
fi
-makensis -DHOME=$HOME contrib/pulseview_cross.nsi
+makensis contrib/pulseview_cross.nsi
cd ..