Share common makefile instructions, use venv for running build, and separate dist/build dirs

src/bcf/Makefile

@@ -16,11 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with BCF.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=bcf
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: ci
 ci:
@@ -36,17 +33,6 @@ models:
 	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
 	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
 
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp src/bcf/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' src/bcf/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak src/bcf/__init__.py
-
 # .PHONY
 # api:
 #     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0

src/bsdd/Makefile

@@ -16,23 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with bSDD.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=bsdd.py
-SED:=sed -i
+IS_MODULE:=true
-ifeq ($(UNAME_S),Darwin)
+include ../common.mk
-SED:=sed -i '' -e
-endif
 
 .PHONY: test
 test:
 	pytest -p no:pytest-blender test
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp bsdd.py bsdd.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' bsdd.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv bsdd.py.bak bsdd.py

src/common.mk

@@ -0,0 +1,26 @@
+PYTHON:=python3.11
+PIP:=pip3.11
+VERSION:=$(shell cat ../../VERSION)
+SED:=sed -i
+ifeq ($(UNAME_S),Darwin)
+SED:=sed -i '' -e
+PYTHON:=python3
+endif
+
+.PHONY: dist
+dist:
+	rm -rf build
+	mkdir -p build
+	mkdir -p dist
+	cp -r $(PACKAGE_NAME) build/
+	cp pyproject.toml build/
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
+ifdef IS_MODULE
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/$(PACKAGE_NAME)
+else
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/$(PACKAGE_NAME)/__init__.py
+endif
+	cd build && $(PYTHON) -m venv env && . env/bin/activate && $(PIP) install build
+	cd build && . env/bin/activate && $(PYTHON) -m build
+	cp build/dist/*.whl dist/
+	rm -rf build

src/ifc4d/Makefile

@@ -16,23 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Ifc4D.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifc4d
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifc4d/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifc4d/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak ifc4d/__init__.py

src/ifc5d/Makefile

@@ -16,23 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Ifc5D.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifc5d
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifc5d/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifc5d/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak ifc5d/__init__.py

src/ifccityjson/Makefile

@@ -16,23 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcCityJSON.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifccityjson
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifccityjson/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifccityjson/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak ifccityjson/__init__.py

src/ifcclash/Makefile

@@ -16,23 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcClash.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifcclash
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifcclash/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifcclash/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak ifcclash/__init__.py

src/ifccsv/Makefile

@@ -16,23 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcCSV.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifccsv.py
-SED:=sed -i
+IS_MODULE:=true
-ifeq ($(UNAME_S),Darwin)
+include ../common.mk
-SED:=sed -i '' -e
-endif
 
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifccsv.py ifccsv.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifccsv.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv ifccsv.py.bak ifccsv.py

src/ifcdiff/Makefile

@@ -16,23 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcDiff.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifcdiff.py
-SED:=sed -i
+IS_MODULE:=true
-ifeq ($(UNAME_S),Darwin)
+include ../common.mk
-SED:=sed -i '' -e
-endif
 
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifcdiff.py ifcdiff.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifcdiff.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv ifcdiff.py.bak ifcdiff.py

src/ifcfm/Makefile

@@ -16,23 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcFM.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifcfm
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifcfm/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifcfm/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak ifcfm/__init__.py

src/ifcopenshell-python/Makefile

@@ -3,6 +3,7 @@ PYVERSION:=py311
 PLATFORM:=linux64
 
 PYTHON:=python3.11
+PIP:=pip3.11
 SED:=sed -i
 ifeq ($(OS),Windows_NT)
 HOSTOS:=win
@@ -105,28 +106,21 @@ dist:
 ifndef PLATFORM
 	$(error PLATFORM is not set)
 endif
-	rm -rf dist
+	rm -rf build
-	mkdir -p dist/working
+	mkdir -p build
-	mkdir -p dist/ifcopenshell
+	mkdir -p dist
-	cp -r ifcopenshell/* dist/ifcopenshell/
+	cp -r ifcopenshell build/
 
-	cd dist/working && $(PYTHON) -m venv env
+	mkdir build/botbuild
-	cd dist/working && . env/bin/activate && $(PIP) install build
+	cd build/botbuild && wget $(IOS_URL) && unzip ifcopenshell-python*
+	cp -r build/botbuild/ifcopenshell/*ifcopenshell_wrapper* build/ifcopenshell/
+	cp ../../README.md build/
+	cp pyproject.toml build/
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/ifcopenshell/__init__.py
 
-	cd dist/working && wget $(IOS_URL)
+	cd build && $(PYTHON) -m venv env && . env/bin/activate && $(PIP) install build
-	cd dist/working && unzip ifcopenshell-python*
+	cd build && . env/bin/activate && $(PYTHON) -m build
-	cp -r dist/working/ifcopenshell/*ifcopenshell_wrapper* dist/ifcopenshell/
+
-	rm -rf dist/working
+	mv build/dist/ifcopenshell-$(VERSION)-py3-none-any.whl dist/ifcopenshell-$(VERSION)-$(PYVERSION)-none-$(PLATFORMTAG).whl
-	# distutils cannot access anything outside the cwd, so hackishly swap out the README.md
+	rm -rf build
-	cp README.md ../README.bak
-	cp ../../README.md README.md
-	cp pyproject.toml pyproject.toml.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' dist/ifcopenshell/__init__.py
-	. dist/working/env/bin/activate && $(PYTHON) -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv ../README.bak README.md
-	cd dist && mv ifcopenshell-$(VERSION)-py3-none-any.whl ifcopenshell-$(VERSION)-$(PYVERSION)-none-$(PLATFORMTAG).whl
-	rm -rf dist/ifcopenshell
-	rm -rf dist/ifcopenshell.egg-info
-	rm -rf dist/ifcopenshell-$(VERSION).tar.gz

src/ifcopenshell-python/pyproject.toml

@@ -35,7 +35,6 @@ dev = ["pytest"]
 "Bug Tracker" = "https://github.com/ifcopenshell/ifcopenshell/issues"
 
 [tool.setuptools.packages.find]
-where = ["dist"]
 include = ["ifcopenshell*"]
 
 [tool.setuptools.package-data]

src/ifcpatch/Makefile

@@ -16,11 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcPatch.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifcpatch
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: test
 test:
@@ -29,14 +26,3 @@ test:
 .PHONY: qa
 qa:
 	black .
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifcpatch/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifcpatch/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak ifcpatch/__init__.py

src/ifctester/Makefile

@@ -16,23 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcTester.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
+PACKAGE_NAME:=ifctester
-SED:=sed -i
+include ../common.mk
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
 
 .PHONY: test
 test:
 	pytest -p no:pytest-blender test
-
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp ifctester/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifctester/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak ifctester/__init__.py

src/ifctester/build/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

src/ifctester/build/files/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

src/ifctester/pyproject.toml

@@ -23,8 +23,8 @@ Documentation = "https://docs.ifcopenshell.org"
 Issues = "https://github.com/IfcOpenShell/IfcOpenShell/issues"
 
 [tool.setuptools.packages.find]
-include = ["ifctester"]
+include = ["ifctester*"]
 exclude = ["test*"]
 
 [tool.setuptools.package-data]
-ifctester = ["*.xsd", "templates/*.html"]
+"*" = ["*.*"]