Skip to content

Commit c4f823a

Browse files
MoultMoult
committed
Upgrade BlenderBIM Add-on to v0.7.0.
1 parent 343f56b commit c4f823a

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.github/workflows/ci-blenderbim-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'src/blenderbim/**'
77
- '.github/workflows/ci-blenderbim-matrix.yml'
88
branches:
9-
- v0.6.0
9+
- v0.7.0
1010

1111
env:
1212
major: 0

‎src/blenderbim/Makefile‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,18 @@ endif
9393
cp -r blenderbim/* dist/blenderbim/
9494

9595
# Provides IfcOpenShell Python functionality
96-
cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcblender-python-$(PYNUMBER)-v0.6.0-721fe47-$(PLATFORM)64.zip
96+
cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcblender-python-$(PYNUMBER)-v0.7.0-9853d3d-$(PLATFORM)64.zip
9797
cd dist/working && unzip ifcblender*
9898
cp -r dist/working/io_import_scene_ifc/ifcopenshell dist/blenderbim/libs/site/packages/
9999

100100
# See bug #812
101-
cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/blenderbim/occ_utils.py
101+
cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/blenderbim/occ_utils.py
102102
cd dist/working && mv occ_utils.py ../blenderbim/libs/site/packages/ifcopenshell/geom/occ_utils.py
103103
rm -rf dist/working
104104

105105
# Provides IfcConvert for construction documentation
106106
mkdir dist/working
107-
cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/IfcConvert-v0.6.0-81ad689-$(PLATFORM)64.zip
107+
cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/IfcConvert-v0.7.0-81ad689-$(PLATFORM)64.zip
108108
cd dist/working && unzip IfcConvert*
109109
ifeq ($(PLATFORM), win)
110110
cp -r dist/working/IfcConvert.exe dist/blenderbim/libs/
@@ -115,35 +115,35 @@ endif
115115

116116
# Provides dependencies that are part of IfcOpenShell
117117
mkdir dist/working
118-
cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/archive/v0.6.0.zip
119-
cd dist/working && unzip v0.6.0.zip
118+
cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/archive/v0.7.0.zip
119+
cd dist/working && unzip v0.7.0.zip
120120
# IfcOpenBot sometimes lags behind, so we hotfix the Python utilities
121-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/util/* dist/blenderbim/libs/site/packages/ifcopenshell/util/
122-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/api/* dist/blenderbim/libs/site/packages/ifcopenshell/api/
123-
cp dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/entity_instance.py dist/blenderbim/libs/site/packages/ifcopenshell/
124-
cp dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/file.py dist/blenderbim/libs/site/packages/ifcopenshell/
121+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/util/* dist/blenderbim/libs/site/packages/ifcopenshell/util/
122+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/api/* dist/blenderbim/libs/site/packages/ifcopenshell/api/
123+
cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/entity_instance.py dist/blenderbim/libs/site/packages/ifcopenshell/
124+
cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/file.py dist/blenderbim/libs/site/packages/ifcopenshell/
125125
# Provides bcf functionality
126-
cp -r dist/working/IfcOpenShell-0.6.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
126+
cp -r dist/working/IfcOpenShell-0.7.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
127127
# Provides IFCClash functionality
128-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifcclash/ifcclash dist/blenderbim/libs/site/packages/
128+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifcclash/ifcclash dist/blenderbim/libs/site/packages/
129129
# Provides BIMTester functionality
130130
cd dist/working && python -m venv env
131131
cd dist/working && . env/bin/activate && pip install pybabel
132132
cd dist/working && . env/bin/activate && pip install babel
133-
cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.6.0/src/ifcbimtester/bimtester/locale/
134-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
133+
cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.7.0/src/ifcbimtester/bimtester/locale/
134+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
135135
# Provides IFCCOBie functionality
136-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifccobie/* dist/blenderbim/libs/site/packages/
136+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifccobie/* dist/blenderbim/libs/site/packages/
137137
# Provides IFCDiff functionality
138-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
138+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
139139
# Provides IFCCSV functionality
140-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifccsv/* dist/blenderbim/libs/site/packages/
140+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifccsv/* dist/blenderbim/libs/site/packages/
141141
# Provides IFCPatch functionality
142-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifcpatch/ifcpatch dist/blenderbim/libs/site/packages/
142+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifcpatch/ifcpatch dist/blenderbim/libs/site/packages/
143143
# Provides IFC4D functionality
144-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifc4d/ifc4d dist/blenderbim/libs/site/packages/
144+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifc4d/ifc4d dist/blenderbim/libs/site/packages/
145145
# Provides IFC5D functionality
146-
cp -r dist/working/IfcOpenShell-0.6.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
146+
cp -r dist/working/IfcOpenShell-0.7.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
147147
rm -rf dist/working
148148

149149
# Provides Mustache templating in construction documentation
@@ -350,8 +350,8 @@ endif
350350
cd dist/working && tar -xzvf behave*
351351
cd dist/working/behave-1.2.6/ && cp -r behave ../../blenderbim/libs/site/packages/
352352
# See bug #1294
353-
cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/ifcbimtester/patch/model_core.patch
354-
cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/ifcbimtester/patch/runner_util.patch
353+
cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/model_core.patch
354+
cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/runner_util.patch
355355
cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/model_core.py < model_core.patch
356356
cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/runner_util.py < runner_util.patch
357357
rm -rf dist/working

0 commit comments

Comments
 (0)