Refactor cibw_before_all_windows.sh

Author: oscarbenjamin

bin/cibw_before_all_windows.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -o errexit
+
+if [ $# -lt 2 ]; then
+    echo "usage: $0 <llvm-machine> <build-dependencies-args>..."
+    exit 1
+fi
+
+llvm_machine="$1"
+shift
+
+bin/build_dependencies_unix.sh "$@"
+
+mkdir -p .local/lib
+cd .local/bin
+for dll_file in libgmp-*.dll libmpfr-*.dll libflint*.dll
+do
+  lib_name=$(basename -s .dll "${dll_file}")
+  def_file=${lib_name}.def
+  name=$(echo "${lib_name}" | sed 's/^lib//;s/[-.][0-9].*$//')
+
+  gendef "${dll_file}"
+  llvm-lib /def:"${def_file}" /out:"../lib/${name}.lib" /machine:${llvm_machine} /nologo
+  rm "${def_file}"
+done
+cd ../..

bin/cibw_before_all_windows_amd64.sh

@@ -3,33 +3,20 @@
 set -o errexit
 
 pacman -S --noconfirm \
-    mingw-w64-ucrt-x86_64-gcc\
-    mingw-w64-ucrt-x86_64-llvm-tools\
-    mingw-w64-ucrt-x86_64-tools-git\
-    m4\
-    make\
-    base-devel\
-    autoconf-wrapper\
-    automake-wrapper\
-    libtool\
-    git\
+    mingw-w64-ucrt-x86_64-gcc \
+    mingw-w64-ucrt-x86_64-llvm-tools \
+    mingw-w64-ucrt-x86_64-tools-git \
+    m4 \
+    make \
+    base-devel \
+    autoconf-wrapper \
+    automake-wrapper \
+    libtool \
+    git \
     #
 
-bin/build_dependencies_unix.sh \
-    --use-gmp-github-mirror\
-    --patch-C23\
+bin/cibw_before_all_windows.sh \
+    x64 \
+    --use-gmp-github-mirror \
+    --patch-C23 \
     #
-
-mkdir -p .local/lib
-cd .local/bin
-for dll_file in libgmp-*.dll libmpfr-*.dll libflint*.dll
-do
-  lib_name=$(basename -s .dll "${dll_file}")
-  def_file=${lib_name}.def
-  name=$(echo "${lib_name}" | sed 's/^lib//;s/[-.][0-9].*$//')
-
-  gendef "${dll_file}"
-  llvm-lib /def:"${def_file}" /out:"../lib/${name}.lib" /machine:x64 /nologo
-  rm "${def_file}"
-done
-cd ../..

bin/cibw_before_all_windows_arm64.sh

@@ -3,36 +3,23 @@
 set -o errexit
 
 pacman -S --noconfirm \
-    mingw-w64-clang-aarch64-toolchain\
-    mingw-w64-clang-aarch64-llvm-tools\
-    mingw-w64-clang-aarch64-tools-git\
-    m4\
-    make\
-    base-devel\
-    autoconf-wrapper\
-    automake-wrapper\
-    libtool\
-    git\
+    mingw-w64-clang-aarch64-toolchain \
+    mingw-w64-clang-aarch64-llvm-tools \
+    mingw-w64-clang-aarch64-tools-git \
+    m4 \
+    make \
+    base-devel \
+    autoconf-wrapper \
+    automake-wrapper \
+    libtool \
+    git \
     #
 
-bin/build_dependencies_unix.sh \
-    --use-gmp-github-mirror\
-    --host aarch64-w64-mingw32\
-    --patch-C23\
-    --patch-ldd\
-    --patch-immintrin\
+bin/cibw_before_all_windows.sh \
+    arm64 \
+    --use-gmp-github-mirror \
+    --host aarch64-w64-mingw32 \
+    --patch-C23 \
+    --patch-ldd \
+    --patch-immintrin \
     #
-
-mkdir -p .local/lib
-cd .local/bin
-for dll_file in libgmp-*.dll libmpfr-*.dll libflint*.dll
-do
-  lib_name=$(basename -s .dll "${dll_file}")
-  def_file=${lib_name}.def
-  name=$(echo "${lib_name}" | sed 's/^lib//;s/[-.][0-9].*$//')
-
-  gendef "${dll_file}"
-  llvm-lib /def:"${def_file}" /out:"../lib/${name}.lib" /machine:arm64 /nologo
-  rm "${def_file}"
-done
-cd ../..