Changeset 976:69bc5891e14d

Timestamp:

05/24/19 18:31:43 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Reworked Windows Docker image and MSYS building (re #347)

Files:

• .hgignore (modified) (1 diff)
• docker/build-msys.sh (added)
• docker/msys/Dockerfile (modified) (1 diff)
• docker/msys/build.bat (added)
• docker/msys/build.sh (copied) (copied from docker/msys/setup.sh ) (2 diffs)
• docker/msys/setup.sh (modified) (1 diff)
• docker/msys64.sh (added)

.hgignore

@@ -12 +12 @@
 debug.log
 moodlesetup.txt
+docker/msys/id_rsa

docker/msys/Dockerfile

@@ -14 +14 @@
     Remove-Item 7z.msi
 
-RUN $env:MSYSTEM='MINGW32' ; `
-    Start-Process C:\msys64\usr\bin\pacman.exe -ArgumentList '-Syu --noconfirm' -Wait -PassThru -Verbose -WorkingDirectory 'C:\msys64' ; `
-    Start-Process C:\msys64\usr\bin\pacman.exe -ArgumentList '-Su --noconfirm' -Wait -PassThru -Verbose -WorkingDirectory 'C:\msys64' ; `
-    Start-Process C:\msys64\usr\bin\bash.exe -ArgumentList '--login -c /usr/bin/true.exe' -Wait -PassThru -Verbose -WorkingDirectory 'C:\msys64'; `
-    mkdir C:\msys64\build
+RUN $env:MSYSTEM='MINGW32'  ; `
+    C:\msys64\usr\bin\bash.exe --login -c /usr/bin/true.exe ; `
+    C:\msys64\usr\bin\pacman.exe -Syu --noconfirm ; `
+    C:\msys64\usr\bin\pacman.exe -Su --noconfirm ; `
+    C:\msys64\usr\bin\pacman.exe -Scc --noconfirm
 
-COPY setup.sh pywin32.patch pywin32git.patch cef_binary_3.3359.1774.gd49d25f_windows32.patch cefpython-66.0.patch py2exe.patch C:\msys64\build\
+COPY setup.sh  C:\msys64\build\
 
 RUN $env:MSYSTEM='MINGW32'; `
-    C:\msys64\usr\bin\bash.exe --login  C:\msys64\build\setup.sh ;
+    C:\msys64\usr\bin\bash.exe --login -c /build/setup.sh
+
+COPY build.bat build.sh pywin32.patch pywin32git.patch cef_binary_3.3359.1774.gd49d25f_windows32.patch cefpython-66.0.patch py2exe.patch id_rsa C:\msys64\build\
+
+CMD ["powershell.exe"]

docker/msys/build.sh

@@ -2 +2 @@
 
 set -e -u
-
-pacman -S --noconfirm mc patch unzip mingw-w64-i686-python3 mingw-w64-i686-python3-setuptools mingw-w64-i686-gcc  mingw-w64-i686-gtk3 mingw-w64-i686-python3-lxml mingw-w64-i686-cmake mingw-w64-i686-make mingw-w64-i686-python3-pip mingw-w64-i686-python3-pillow mingw-w64-i686-python3-gobject mingw-w64-i686-python3-cffi
-pacman -Scc --noconfirm
-
-pip3 install jsonrpclib-pelix
 
 echo "Building PyWin32"
@@ -66 +61 @@
 python3 setup.py install
 
-cd /
-rm -rf /build
+echo "Archiving msys64 directory"
+cd /c
+tar czf - msys64 | ssh -i /c/msys64/build/id_rsa -o StrictHostKeyChecking=no ivaradi@mises.varadiistvan.hu mlx/www/update/msys64.sh

docker/msys/setup.sh

@@ -3 +3 @@
 set -e -u
 
-pacman -S --noconfirm mc patch unzip mingw-w64-i686-python3 mingw-w64-i686-python3-setuptools mingw-w64-i686-gcc  mingw-w64-i686-gtk3 mingw-w64-i686-python3-lxml mingw-w64-i686-cmake mingw-w64-i686-make mingw-w64-i686-python3-pip mingw-w64-i686-python3-pillow mingw-w64-i686-python3-gobject mingw-w64-i686-python3-cffi
+echo "Installing extra packages..."
+
+pacman -S --noconfirm mc patch unzip openssh ca-certificates mingw-w64-i686-python3 mingw-w64-i686-python3-setuptools mingw-w64-i686-gcc  mingw-w64-i686-gtk3 mingw-w64-i686-python3-lxml mingw-w64-i686-cmake mingw-w64-i686-make mingw-w64-i686-python3-pip mingw-w64-i686-python3-pillow mingw-w64-i686-python3-gobject mingw-w64-i686-python3-cffi
 pacman -Scc --noconfirm
 
 pip3 install jsonrpclib-pelix
-
-echo "Building PyWin32"
-
-cd /build
-
-wget -O - https://github.com/mhammond/pywin32/archive/b224.tar.gz | gzip -dc | tar xf -
-cd pywin32-b224
-patch -p1 < ../pywin32git.patch
-patch -p1 < ../pywin32.patch
-python3 setup.py build
-python3 setup.py install
-
-echo "Building CEFPython"
-
-cd /build
-
-wget -O - http://opensource.spotify.com/cefbuilds/cef_binary_3.3359.1774.gd49d25f_windows32.tar.bz2 | bzip2 -dc | tar xf -
-cd cef_binary_3.3359.1774.gd49d25f_windows32
-
-patch -p1 < ../cef_binary_3.3359.1774.gd49d25f_windows32.patch
-mv tests tests.orig
-
-mkdir build
-cd build
-/usr/bin/env PATH=/mingw32/bin:/usr/local/bin::/c/Windows/System32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0 cmake  -G "MinGW Makefiles" ..
-cd libcef_dll_wrapper
-mingw32-make
-
-cd /build
-
-wget -O - https://github.com/cztomczak/cefpython/archive/v66.0.tar.gz | gzip -dc | tar xf -
-cd cefpython-66.0
-
-patch -p1 < ../cefpython-66.0.patch
-
-mkdir -p build
-cd build
-
-wget https://github.com/cztomczak/cefpython/releases/download/v66-upstream/cef66_3.3359.1774.gd49d25f_win32.zip
-unzip cef66_3.3359.1774.gd49d25f_win32.zip
-rm cef66_3.3359.1774.gd49d25f_win32.zip
-
-cp /build/cef_binary_3.3359.1774.gd49d25f_windows32/build/libcef_dll_wrapper/libcef_dll_wrapper.a cef66_3.3359.1774.gd49d25f_win32/lib
-
-pip3 install -r ../tools/requirements.txt
-
-python3 ../tools/build.py --no-run-tests --no-run-examples 66.0  || true
-python3 ../tools/build.py --no-run-tests --no-run-examples 66.0
-
-echo "Building Py2EXE"
-
-cd /build
-
-wget -O - https://github.com/albertosottile/py2exe/archive/v0.9.3.0.tar.gz | gzip -dc | tar xf -
-cd py2exe-0.9.3.0
-patch -p1 < ../py2exe.patch
-python3 setup.py build
-python3 setup.py install
-
-cd /
-rm -rf /build