X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=f41b67aba824641c590d1f59225dd9ef6d6dc5df;hp=e8b37464e6adace9f71e2c0c6030c3565088e404;hb=42e38f72e31d7a5b4bfc9fe80b100596b9c005c5;hpb=682d505b8b7d354c7b0dc1bd719a4f43e0f566c7

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index e8b3746..f41b67a 100755
--- a/cross-compile/msys2/sigrok-native-msys2
+++ b/cross-compile/msys2/sigrok-native-msys2
@@ -2,7 +2,7 @@
 ##
 ## This file is part of the sigrok-util project.
 ##
-## Copyright (C) 2016 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2016-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
@@ -20,17 +20,14 @@
 
 set -e
 
-# Build target: "i686" (32bit) or "x86_64" (64bit).
-TARGET="i686"
+# The base path prefix where the compiled packages will be installed.
+PREFIXBASE=$HOME/sr_msys2
 
-# The path where the compiled packages will be installed.
-PREFIX=$HOME/sr_msys2
+# 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
-
-# The path where the libsigrok Python bindings will be installed.
-PYPATH=$PREFIX/lib/python2.7/site-packages
+# The $PREFIX subdir where the libsigrok Python bindings will be installed.
+PYBASE=lib/python2.7/site-packages
 
 # Edit this to control verbose build output.
 # V="V=1 VERBOSE=1"
@@ -38,21 +35,56 @@ PYPATH=$PREFIX/lib/python2.7/site-packages
 # 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_SIGROK_FIRMWARE_FX2LAFW=0.1.3
+# Abort if the user runs the script in an "MSYS2 MSYS" shell.
+if [ $MSYSTEM = "MSYS" ]; then
+	echo "Building in an 'MSYS2 MSYS' shell will not work, aborting."
+	echo "Please use the 'MSYS2 MinGW 64-bit' (or 32-bit) shell."
+	exit
+fi
+
+# The build target type: "i686" (32bit) or "x86_64" (64bit).
+# This is selected based on which MSYS2 shell is being used to do the build.
+TARGET=$MSYSTEM_CARCH
 
-# -----------------------------------------------------------------------------
+VER_SIGROK_FIRMWARE_FX2LAFW=0.1.6
 
+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
 
-P="$PREFIX/lib/pkgconfig"
+PYPATH=$PREFIX/$PYBASE
+
+# Eliminate the host Python path environment variable, if any is set.
+export PYTHONPATH=
+
+# -----------------------------------------------------------------------------
+
+P="$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
 C="$C --prefix=$PREFIX"
 L="--disable-shared --enable-static"
 
@@ -61,10 +93,7 @@ PATH="/mingw32/qt5-static/bin:$PATH"
 
 W="mingw-w64-$TARGET"
 
-WGET="wget -c --quiet"
-GIT_CLONE="git clone --depth=1"
-
-REPO_BASE="git://sigrok.org"
+mkdir -p $PYPATH
 
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
@@ -78,7 +107,7 @@ if [ "x$1" = "xprepare" ]; then
   pacman -Sy
   pacman -S \
 	autoconf automake autoconf-archive libtool make pkg-config wget patch \
-	$W-toolchain $W-glib2 $W-glibmm $W-libusb $W-libfdi $W-check $W-boost \
+	$W-toolchain $W-glib2 $W-glibmm $W-libusb $W-libftdi $W-check $W-boost \
 	$W-libzip $W-doxygen $W-python3 $W-python3-numpy $W-python3-gobject \
 	$W-python3-setuptools $W-swig $W-qt5-static $W-cmake $W-nsis
   exit
@@ -107,7 +136,6 @@ make install $V
 cd ../..
 
 # libsigrok
-mkdir -p $PYPATH
 $GIT_CLONE $REPO_BASE/libsigrok
 cd libsigrok
 ./autogen.sh
@@ -173,7 +201,7 @@ PKG_CONFIG_PATH=$P $SB cmake \
 	-DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
 	-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
 	-DDISABLE_WERROR=y \
-	-DENABLE_TESTS=n
+	-DENABLE_TESTS=n \
 	..
 $SB make $PARALLEL $V
 make install $V