From 66abc92b39dfce27e7aff25d678133c6af173ae2 Mon Sep 17 00:00:00 2001 From: John Kurkowski Date: Fri, 3 Jun 2022 17:12:15 -0700 Subject: [PATCH 1/2] Increase build scripts usability * Mark build scripts executable * Allow re-running the macOS build script --- scripts/build_linux.sh | 0 scripts/build_macos.sh | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 scripts/build_linux.sh mode change 100644 => 100755 scripts/build_macos.sh diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh old mode 100644 new mode 100755 diff --git a/scripts/build_macos.sh b/scripts/build_macos.sh old mode 100644 new mode 100755 index 81f4f63..964ee2e --- a/scripts/build_macos.sh +++ b/scripts/build_macos.sh @@ -3,6 +3,7 @@ brew install pkg-config freetype fontconfig libpng jpeg cd lib/poppler -mkdir build && cd build +mkdir build +cd build cmake -D CMAKE_FIND_FRAMEWORK=LAST -D ENABLE_QT5=OFF -D ENABLE_LIBOPENJPEG=none -D ENABLE_CPP=OFF -D ENABLE_BOOST=OFF .. make poppler From b63c1d8c0859b053a6d77b3833ee5848d1471058 Mon Sep 17 00:00:00 2001 From: John Kurkowski Date: Fri, 3 Jun 2022 17:14:17 -0700 Subject: [PATCH 2/2] Let build scripts determine what shell they need I.e. in their shebang. Depending on the system, `sh` could run them with something unexpected. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd492de..71d75ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,9 +9,9 @@ on: env: CIBW_BUILD: "cp3?-manylinux_x86_64 cp3?-macosx_x86_64" CIBW_SKIP: "cp35-*" - CIBW_BEFORE_BUILD_LINUX: "sh scripts/build_linux.sh" + CIBW_BEFORE_BUILD_LINUX: "scripts/build_linux.sh" CIBW_REPAIR_WHEEL_COMMAND_LINUX: "LD_LIBRARY_PATH=$(pwd)/lib/poppler/build/:$LD_LIBRARY_PATH auditwheel repair -w {dest_dir} {wheel}" - CIBW_BEFORE_BUILD_MACOS: "sh scripts/build_macos.sh" + CIBW_BEFORE_BUILD_MACOS: "scripts/build_macos.sh" CIBW_REPAIR_WHEEL_COMMAND_MACOS: "DYLD_LIBRARY_PATH=$(pwd)/lib/poppler/build:$DYLD_LIBRARY_PATH delocate-listdeps {wheel} && delocate-wheel -w {dest_dir} -v {wheel}" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "call scripts/wheel_repair.bat {wheel} {dest_dir}"