sigrok-cross-mingw: Ship Python stdlib *.pyd files.

This fixes bug #1409.

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index 0075fdf509f0a236b2ab646b419811b3d6530b54..79efbbf9bfd2533ec56e859b7b848f01d2c5235a 100644 (file)
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -22,6 +22,7 @@ Requirements
  - git
  - wget
  - p7zip
  - git
  - wget
  - p7zip

+ - unzip

  - pkg-config (>= 0.22)
  - sdcc (needed for building the fx2lafw firmware)
  - nsis
  - pkg-config (>= 0.22)
  - sdcc (needed for building the fx2lafw firmware)
  - nsis

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 784cd89f2cd0d3e4d22955ee97afeaf71adb8106..bda4d921240d6f6cacf130dc6bd9e47c9e493e01 100755 (executable)
--- 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.
 ##
 ##
 ## This file is part of the sigrok-util project.
 ##

-## Copyright (C) 2013-2018 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2020 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
 ##
 ## 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


@@ -148,6 +148,10 @@ if [ $TARGET = "x86_64" ]; then
        rm -f python34.dll
 fi
 
        rm -f python34.dll
 fi
 

+# We need to include the *.pyd files from python34.zip into the installers,
+# otherwise importing certain modules (e.g. ctypes) won't work (bug #1409).
+unzip -q $PREFIX/python34.zip *.pyd -d $PREFIX
+

 # Zadig (we ship this with frontends for easy driver switching).
 $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
 # Zadig (we ship this with frontends for easy driver switching).
 $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