maint: rename build files for consistency

Author: oscarbenjamin

.github/workflows/buildwheel.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           msystem: mingw64
           # path-type inherit is used so that when cibuildwheel calls msys2 to
-          # run bin/cibw_prepare_python_windows.sh the virtual environment
+          # run bin/cibw_before_build_windows.sh the virtual environment
           # created by cibuildwheel will be available within msys2. The
           # msys2/setup-msys2 README warns that using inherit here can be
           # problematic in some situations. Maybe there is a better way to do
@@ -39,17 +39,18 @@ jobs:
           #CIBW_SKIP: "*-win32 *-musllinux_*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-          CIBW_BEFORE_ALL_LINUX: bin/cibw_before_build_linux.sh
-          CIBW_BEFORE_ALL_MACOS: bin/cibw_before_build_macosx.sh
-          CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_build_windows.sh
-          CIBW_BEFORE_BUILD_WINDOWS: msys2 -c bin/cibw_prepare_python_windows.sh
+          CIBW_BEFORE_ALL_LINUX: bin/cibw_before_all_linux.sh
+          CIBW_BEFORE_ALL_MACOS: bin/cibw_before_all_macosx.sh
+          CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
+          CIBW_BEFORE_BUILD_WINDOWS: msys2 -c bin/cibw_before_build_windows.sh
           CIBW_BEFORE_BUILD: pip install numpy cython delvewheel
           CIBW_ENVIRONMENT: >
             C_INCLUDE_PATH=$(pwd)/.local/include/
             LIBRARY_PATH=$(pwd)/.local/lib/
             LD_LIBRARY_PATH=$(pwd)/.local/lib:$LD_LIBRARY_PATH
             PYTHON_FLINT_MINGW64=true
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: bin\repair_mingw_wheel.bat {dest_dir} {wheel}
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
+            bin\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}
           CIBW_TEST_COMMAND: python -c "import flint; print(str(flint.fmpz(2)))"
 
       - uses: actions/upload-artifact@v3

bin/cibw.bat

@@ -23,10 +23,10 @@ del /q wheelhouse\*
 
 set CIBW_BUILD=cp39-* cp310-* cp311-*
 set CIBW_SKIP=*-win32 *-manylinux_i686 *-musllinux_*
-set CIBW_BEFORE_ALL_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_before_build_windows.sh
-set CIBW_BEFORE_BUILD_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_prepare_python_windows.sh
+set CIBW_BEFORE_ALL_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_before_all_windows.sh
+set CIBW_BEFORE_BUILD_WINDOWS=C:\msys64\usr\bin\bash bin/cibw_before_build_windows.sh
 set CIBW_ENVIRONMENT=PYTHON_FLINT_MINGW64=true
-set CIBW_REPAIR_WHEEL_COMMAND_WINDOWS=bin\repair_mingw_wheel.bat {dest_dir} {wheel}
+set CIBW_REPAIR_WHEEL_COMMAND_WINDOWS=bin\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}
 set CIBW_TEST_COMMAND=python -c "import flint; print(str(flint.fmpz(2)))"
 
 cibuildwheel --platform windows

bin/cibw_before_build_linux.sh renamed to bin/cibw_before_all_linux.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -o errexit
+
+# Uncomment this to run cibuildwheel locally on Windows:
+# export PATH=$PATH:/c/msys64/usr/bin:/c/msys64/mingw64/bin
+
+#
+# Make a setup.cfg to specify compiling with mingw64 (even though it says
+# mingw32...)
+#
+echo '[build]' > setup.cfg
+echo 'compiler = mingw32' >> setup.cfg
+cat setup.cfg
+
+# Install the mingw-w64 toolchain
+pacman -S --noconfirm mingw-w64-x86_64-gcc m4 make mingw-w64-x86_64-tools-git
+
+# This takes ~30mins
+bin/build_dependencies_unix.sh

bin/cibw_before_build_macosx.sh renamed to bin/cibw_before_all_macosx.sh

@@ -5,16 +5,39 @@ set -o errexit
 # Uncomment this to run cibuildwheel locally on Windows:
 # export PATH=$PATH:/c/msys64/usr/bin:/c/msys64/mingw64/bin
 
-#
-# Make a setup.cfg to specify compiling with mingw64 (even though it says
-# mingw32...)
-#
-echo '[build]' > setup.cfg
-echo 'compiler = mingw32' >> setup.cfg
-cat setup.cfg
-
-# Install the mingw-w64 toolchain
-pacman -S --noconfirm mingw-w64-x86_64-gcc m4 make mingw-w64-x86_64-tools-git
-
-# This takes ~30mins
-bin/build_dependencies_unix.sh
+# VER should be set be e.g. 310 for Python 3.10
+VER=`python -c 'import sys; print("%s%s" % sys.version_info[:2])'`
+echo VER=${VER}
+
+###################################################
+#  Find parent Python installation from the venv  #
+###################################################
+
+which python
+PYTHONBIN=`dirname $(which python)`
+PYTHONDIR=`dirname $PYTHONBIN`
+cfgfile=$PYTHONDIR/pyvenv.cfg
+homeline=`grep home $cfgfile`
+homepath=${homeline#*=}
+
+echo ---------------------------------------------------
+echo $homepath
+echo ---------------------------------------------------
+
+###################################################
+#  Find pythonXX.dll and make a .a library        #
+###################################################
+
+cd $homepath
+gendef python${VER}.dll
+dlltool --dllname python${VER}.dll 	\
+	--def python${VER}.def 		\
+	--output-lib libpython${VER}.a
+
+mv libpython${VER}.a libs
+
+###################################################
+#  Install build dependencies                     #
+###################################################
+
+pip install Cython numpy delvewheel

bin/cibw_before_all_windows.sh

@@ -9,5 +9,5 @@ set tempfile=tmpfile.deleteme
 set WHEELHOUSE=%1
 set WHEELNAME=%2
 
-msys2 -c bin/repair_mingw_wheel.sh
-rem C:\msys64\usr\bin\bash bin/repair_mingw_wheel.sh
+msys2 -c bin/cibw_repair_wheel_command_windows.sh
+rem C:\msys64\usr\bin\bash bin/cibw_repair_wheel_command_windows.sh