Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 13:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Bonsai to latest ifcmerge (#7581 #3096)

Browse Source 
This version has some functional differences:
- Structured JSON error message instead of free text (on STDOUT not STDERR)
- New --prioritise-local flag to control which side wins in merge conflicts (not used by Bonsai yet)
- IfcLocalPlacement conflicts now auto-resolve instead of failing the merge (partial solution to #6885)
- Float values are normalised when comparing entities (workaround for #7696)
This commit is contained in:
Bruno Postle
2026-04-02 07:54:20 +01:00
parent fdb2947345
commit 9d42f4c1ee
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/Makefile
+3 -3
View File
@@ -64,6 +64,7 @@ PYNUMBER:=3$(PYMINOR)
PYPI_VERSION:=3.$(PYMINOR) PYPI_VERSION:=3.$(PYMINOR)
endif # def PYVERSION endif # def PYVERSION
IFCMERGE_VERSION:=2026-04-02
ifdef PLATFORM ifdef PLATFORM
SUPPORTED_PLATFORMS := linux macos macosm1 win SUPPORTED_PLATFORMS := linux macos macosm1 win
@@ -240,10 +241,9 @@ endif
# required for three-way git merging # required for three-way git merging
ifeq ($(PLATFORM), win) ifeq ($(PLATFORM), win)
cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2025-01-26/ifcmerge.zip cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/$(IFCMERGE_VERSION)/ifcmerge.exe
cd build/bonsai/libs/bin && unzip ifcmerge.zip && rm ifcmerge.zip
else else
cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/main/ifcmerge && chmod +x ifcmerge cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/$(IFCMERGE_VERSION)/ifcmerge && chmod +x ifcmerge
endif endif
# Generate translations module for Bonsai build # Generate translations module for Bonsai build
src/bonsai/bonsai/tool/ifcgit.py
+1 -1
View File
@@ -546,7 +546,7 @@ class IfcGit:
repo.git.mergetool(tool=mergetool) repo.git.mergetool(tool=mergetool)
return None return None
except git.exc.GitCommandError as exc: except git.exc.GitCommandError as exc:
return re.sub("( stderr: '|')", "", exc.stderr) return re.sub("( stdout: '|')", "", exc.stdout)
@classmethod @classmethod
def git_merge_abort(cls) -> None: def git_merge_abort(cls) -> None: