Changeset 939:de728888b85e

Timestamp:

04/28/19 17:32:28 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

The Docker/Wine-based build infrastructure works for Python 3 (re #347)

Files:

• MANIFEST.in (modified) (1 diff)
• docker/build-mlxwinebuild.sh (modified) (1 diff)
• docker/context/Dockerfile (modified) (1 diff)
• docker/context/build.sh (modified) (1 diff)
• docker/context/setup.sh (modified) (2 diffs)
• docker/initialize-mlxwinebuild.sh (modified) (2 diffs)
• makeinst.bat (deleted)
• winemakeinst.bat (deleted)

MANIFEST.in

@@ -1 +1 @@
 include mlx.nsi
-include makeinst.bat
-include winemakeinst.bat
+include makeinst.sh
 include license.txt
 include runmlx.py

docker/build-mlxwinebuild.sh

@@ -6 +6 @@
 sdistdir=$(cd $(dirname "${sdistfile}") && pwd)
 
-docker run --rm -v "${sdistdir}:/root/dist" mlxwinebuild build $(basename "${sdistfile}") $(id -u) $(id -g)
-#docker run -it --rm -v "${sdistdir}:/root/dist" mlxwinebuild bash
+docker run --rm -v "${sdistdir}:/root/dist" mlxwinebuild-py3 build $(basename "${sdistfile}") $(id -u) $(id -g)
+#docker run -it --rm -v "${sdistdir}:/root/dist" mlxwinebuild-py3 bash

docker/context/Dockerfile

@@ -8 +8 @@
         wine \
         wine32 && \
+    apt-get clean && \
     echo "Europe/Budapest" > /etc/timezone && \
     rm -f /etc/localtime && \

docker/context/build.sh

@@ -18 +18 @@
 cd "${mlxdirname}"
 
-echo "winemakeinst.bat" | wine cmd
+export WINE=yes
+./makeinst.sh
 
 echo

docker/context/setup.sh

@@ -4 +4 @@
 
 cdrive="${HOME}/.wine/drive_c"
-ctmpdir="${cdrive}/tmp"
-cpythondir="${cdrive}/Python27"
-cwinsysdir="${cdrive}/windows/system32"
+cpythondir="${cdrive}/msys64/mingw32"
 
-if test -f "${cpythondir}/python.exe"; then
+if test -f "${cpythondir}/bin/python3.exe"; then
     echo "Image already configured, not doing anything!"
     exit 1
@@ -16 +14 @@
 echo
 
+export WINEARCH=win32
+
+echo "exit" | wine cmd
+
 echo "Downloading and extracting the extra packages..."
 
-wget -O - mlx.varadiistvan.hu/update/winepkgs.tar | tar xf -
+wget -O - mlx.varadiistvan.hu/update/msys64.tar.gz | tar xzf - -C "${cdrive}"
+wget -O - mlx.varadiistvan.hu/update/winepkgs.tar | tar xf - nsis-2.46-setup.exe pyuipc-cpython-37m.dll xplra.py
+
+mv  pyuipc-cpython-37m.dll xplra.py /root/.wine/drive_c/msys64/mingw32/lib/python3.7/site-packages
 
 echo
 echo "Installing extra packages..."
 
-export WINEARCH=win32
-
-echo "exit" | wine cmd
-wine msiexec /i python-2.7.2.msi
-wine msiexec /i cefpython3-31.2.py2.7-win32.msi
-wine msiexec /i pygtk-all-in-one-2.24.1.win32-py2.7.msi
-wine msiexec /i pyuipc-0.4.win32-py2.7.msi
-wine msiexec /i xplra-0.2.win32.msi
-
-wine pywin32-217.win32-py2.7.exe
-wine py2exe-0.6.9.win32-py2.7.exe
 wine nsis-2.46-setup.exe
-
-mkdir "${ctmpdir}"
-cp chromedriver.exe "${ctmpdir}"
-
-tar xzf Python27.extra.tar.gz -C "${cpythondir}"
-
-touch -d "2015-02-22 14:50:07" "${cpythondir}/Lib/site-packages/win32/lib/win32con.py"
-touch -d "2015-02-22 14:50:07" "${cpythondir}/Lib/site-packages/win32/lib/winerror.py"
-
-cp python27.dll WINHTTP.dll "${cwinsysdir}"
 
 echo
 echo "Removing extra packages..."
-rm -f *.msi *.exe Python27.extra.tar.gz python27.dll WINHTTP.dll
+rm -f *.exe
 echo
 echo "Done."

docker/initialize-mlxwinebuild.sh

@@ -6 +6 @@
 scriptdir=`cd "${scriptdir}" && pwd`
 
-docker build -t mlxwinebuild-base "${scriptdir}/context"
+docker build -t mlxwinebuild-py3-base "${scriptdir}/context"
 
 if test -z "${XAUTHORITY:-}"; then
@@ -12 +12 @@
 fi
 
-docker run -it --name mlxwinebuildinit -v /tmp/.X11-unix:/tmp/.X11-unix -v "${XAUTHORITY}":/root/.Xauthority -v /usr/lib/x86_64-linux-gnu/vdpau:/usr/lib/x86_64-linux-gnu/vdpau --device /dev/nvidiactl --device /dev/nvidia0 --security-opt=apparmor:unconfined  --env DISPLAY mlxwinebuild-base initialize
+docker run -it --name mlxwinebuildinit -v /tmp/.X11-unix:/tmp/.X11-unix -v "${XAUTHORITY}":/root/.Xauthority -v /usr/lib/x86_64-linux-gnu/vdpau:/usr/lib/x86_64-linux-gnu/vdpau --device /dev/nvidiactl --device /dev/nvidia0 --security-opt=apparmor:unconfined  --env DISPLAY mlxwinebuild-py3-base initialize
 
 echo "Committing new image..."
 
-docker commit --change='CMD ["bash"]' mlxwinebuildinit mlxwinebuild
+docker commit --change='CMD ["bash"]' mlxwinebuildinit mlxwinebuild-py3
 
 echo "Removing container..."