mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-26 10:11:46 +00:00
Merge branch 'bonsai-bump-macos' into v0.8.0
This commit is contained in:
+6
-2
@@ -66,7 +66,11 @@ BLENDER_PLATFORM:=linux-x64
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(PLATFORM), macos)
|
ifeq ($(PLATFORM), macos)
|
||||||
|
ifeq ($(PYVERSION), py311)
|
||||||
PYPI_PLATFORM:=--platform macosx_10_10_x86_64
|
PYPI_PLATFORM:=--platform macosx_10_10_x86_64
|
||||||
|
else
|
||||||
|
PYPI_PLATFORM:=--platform macosx_10_13_x86_64
|
||||||
|
endif
|
||||||
BLENDER_PLATFORM:=macos-x64
|
BLENDER_PLATFORM:=macos-x64
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -281,7 +285,7 @@ ifeq ($(PLATFORM), macosm1)
|
|||||||
mv "$$prev_whl_name" "$$whl_name";
|
mv "$$prev_whl_name" "$$whl_name";
|
||||||
|
|
||||||
prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
|
prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
|
||||||
whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2/macosx_10_12_arm64/"); \
|
whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_arm64/"); \
|
||||||
mv "$$prev_whl_name" "$$whl_name";
|
mv "$$prev_whl_name" "$$whl_name";
|
||||||
|
|
||||||
# Has only universal build.
|
# Has only universal build.
|
||||||
@@ -291,7 +295,7 @@ ifeq ($(PLATFORM), macosm1)
|
|||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM), macos)
|
ifeq ($(PLATFORM), macos)
|
||||||
prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
|
prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
|
||||||
whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2/macosx_10_9_x86_64/"); \
|
whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \
|
||||||
mv "$$prev_whl_name" "$$whl_name";
|
mv "$$prev_whl_name" "$$whl_name";
|
||||||
|
|
||||||
prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
|
prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
|
||||||
|
|||||||
Reference in New Issue
Block a user