remove out of date comments and debug code

Author: oscarbenjamin

bin/repair_mingw_wheel.bat

@@ -1,8 +1,8 @@
 rem
-rem This batch file serves the purpose of taking Windows style path arguments
-rem converting them to environment variables and calling msys2 This is because
-rem otherwise in CI msys2 -c will mangle the paths turning e.g. C:\a\b into
-rem C:ab.
+rem This batch file serves the purpose of taking Windows style path arguments,
+rem converting them to environment variables and calling msys2. This is needed
+rem because otherwise in CI msys2 -c will mangle the paths turning e.g. C:\a\b
+rem into C:ab.
 rem
 
 set tempfile=tmpfile.deleteme

bin/repair_mingw_wheel.sh

@@ -11,8 +11,9 @@ set -o errexit
 
 # We cannot use ordinary command line arguments in CI because msys2 -c mangles
 # them. Instead we have a batch file to receive the arguments and convert them
-# into environment variables. When running locally this script could be run
-# directly giving the parameters as command line arguments.
+# into environment variables before calling this script. When running locally
+# this script could be run directly giving the parameters as command line
+# arguments instead.
 
 if [[ -z "${WHEELHOUSE}" ]]; then
   WHEELNAME=$1
@@ -27,16 +28,8 @@ echo WHEELNAME=$WHEELNAME
 wheeldir=$(dirname $WHEELNAME)
 echo $wheeldir
 
-# Uncomment this to run cibuildwheel locally on Windows:
-# export PATH=$PATH:/c/msys64/usr/bin:/c/msys64/mingw64/bin
-
-# 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}
-#
-#WHEELNAME=python_flint-0.3.0-cp${VER}-cp${VER}-win_amd64.whl
-
-# delvewheel requires DLLs created by mingw64 to be stripped
+# delvewheel requires DLLs created by mingw64 to be stripped. This strips the
+# DLLs for GMP etc that will have been build previously.
 strip .local/bin/*.dll .local/lib/*.dll
 
 # Make sure to leave the wheel in the same directory
@@ -49,7 +42,9 @@ pushd $wheeldir
   wheel pack python_flint-*
 popd
 
-# Make the wheel relocatable
+# Make the wheel relocatable. This will fail with an error message about
+# --no-mangle if strip has not been applied to all mingw64-created .dll and
+# .pyd files that are needed for the wheel.
 delvewheel repair $WHEELNAME 	\
 	-w $WHEELHOUSE		\
 	--add-path .local/bin:.local/lib/

setup.py

@@ -15,47 +15,21 @@
     #
     if os.getenv('PYTHON_FLINT_MINGW64'):
         libraries = ["arb", "flint", "mpfr", "gmp"]
-        #
-        # Add the libpythonXXX.a file to Python installation
-        #
-
-        # e.g. finding the shared libs (dll/so) our python process loaded so far ...
-        #import psutil, os
-        #p = psutil.Process( os.getpid() )
-        #for dll in p.memory_maps():
-        #      print(dll.path)
-
-        #PYTHONDIR = os.path.dirname(sys.executable)
-        #PYTHONDIR = r'C:\Users\runneradmin\AppData\Local\pypa\cibuildwheel\Cache\nuget-cpython\python.3.9.13\tools'
-        #VER = '%s%s' % sys.version_info[:2]
-        #commands = f"""
-        #msys2 -c ls
-        #msys2 -c gendef python{VER}.dll
-        #msys2 -c ls
-        #msys2 -c dlltool --dllname python{VER}.dll --def python{VER}.def --output-lib libpython{VER}.a
-        #msys2 -c mv libpython{VER}.a libs
-        #msys2 -c echo "$C_INCLUDE_DIR"
-        #"""
-        #for cmd in commands.strip().splitlines():
-            #print(cmd.split())
-            #check_call(cmd.split(), cwd=PYTHONDIR)
-        #print(__file__)
         includedir = os.path.join(os.path.dirname(__file__), '.local', 'include')
         librarydir1 = os.path.join(os.path.dirname(__file__), '.local', 'bin')
         librarydir2 = os.path.join(os.path.dirname(__file__), '.local', 'lib')
         librarydirs = [librarydir1, librarydir2]
-        #print(includedir)
         default_include_dirs += [includedir]
-        #print(os.listdir(includedir))
-        #print(os.listdir(librarydir1))
-        #print(os.listdir(librarydir2))
         default_lib_dirs += librarydirs
+        # Add gcc to the PATH in GitHub Actions when this setup.py is called by
+        # cibuildwheel.
         os.environ['PATH'] += r';C:\msys64\mingw64\bin'
-        #print(default_lib_dirs)
     elif os.getenv('PYTHON_FLINT_MINGW64_TMP'):
+        # This would be used to build under Windows against these libraries if
+        # they have been installed somewhere other than .local
         libraries = ["arb", "flint", "mpfr", "gmp"]
     else:
-        # For the MSVC toolchain with mpir instead of gmp
+        # For the MSVC toolchain link with mpir instead of gmp
         libraries = ["arb", "flint", "mpir", "mpfr", "pthreads"]
 else:
     libraries = ["arb", "flint"]