X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=5a807cbeea28dd7b536a8deb8d88a545ce4cb491;hp=c52ef22272b6e828d2b623efb8994c27ab048715;hb=5f44a3680b5d63cd07a5ec28ae32684b55f55002;hpb=63a302e7906b163f8cd3f95a159ab3ad75dcee21

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index c52ef22..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 <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2014 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
@@ -28,7 +28,7 @@ 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"
@@ -46,8 +46,8 @@ 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"
@@ -62,13 +62,13 @@ 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
+# 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
 
@@ -86,9 +86,15 @@ 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
@@ -125,6 +131,7 @@ cd ..
 git clone git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
+patch -p1 < ../../srd_decodersdir.patch
 PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
 make $PARALLEL V=1
 make install
@@ -149,10 +156,15 @@ 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 $PARALLEL V=1
@@ -163,8 +175,7 @@ cd ..
 # PulseView
 git clone git://sigrok.org/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 .
+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