WIP: Parametrizing macbuild to make custom installations easier (KLayout#680)

* Changing indentation to 4 spaces

* squash

* removing more global variables (squash)

* | tee always exits with 0

* parameter is a dictionary now

* Changing default Makefile to HB38 and adding -rbinc2 option for Catalina

* Catalina building...

* macQAT fixed

* run_build_command depends on parameteres dict alone

* Adding options to macbuild/makeDMG4mac.py

In particular, we can now specify a -u (unsafe) option, and
specify the target dmg file with -t target.dmg

Author: thomaslima

.gitignore

@@ -37,6 +37,8 @@ build-*
 bin-*
 mkqtdecl.tmp
 testtmp
+*build.macos*
+*bin.macos*
 
 # private data
 private
@@ -54,3 +56,12 @@ src/klayout.pro.user
 *.egg-info/
 build/
 dist/
+
+
+# IDEs
+.vscode
+
+
+# Macos artifacts
+*.dmg
+*.dmg.md5

Makefile

@@ -3,10 +3,10 @@
 GITCOMMIT := $(shell git rev-parse --short HEAD)
 KLAYOUT_VERSION := $(shell source version.sh && echo $$KLAYOUT_VERSION)
 ifndef PYTHON_VERSION
-    PYTHON_VERSION := B37
+    PYTHON_VERSION := HB38
 endif
 ifndef MACOS_VERSION
-	MACOS_VERSION := HighSierra
+	MACOS_VERSION := Catalina
 endif
 
 .ONESHELL:
@@ -15,11 +15,11 @@ default: help
 
 help:
 	@echo "For Mac OS only"
-	@echo "make build PYTHON_VERSION=B37"
-	@echo "make deploy PYTHON_VERSION=B37"
+	@echo "make build PYTHON_VERSION=HB38"
+	@echo "make deploy PYTHON_VERSION=HB38"
 	@echo "make test MACOS_VERSION=HighSierra"
-	@echo "Valid Mac OS Versions: [Yosemite, ElCapitan, Sierra, HighSierra]"
-	@echo "Valid Python Version: [nil, Sys, B37]"
+	@echo "Valid Mac OS Versions: [Yosemite, ElCapitan, Sierra, HighSierra, Mojave, Catalina]"
+	@echo "Valid Python Version: [nil, Sys, HB38]"
 
 build:
 	@echo "Building for Mac $(GITCOMMIT)"
@@ -29,30 +29,36 @@ build:
 deploy:
 	@echo "Deploying 4 Mac $(GITCOMMIT)"
 	./build4mac.py -p $(PYTHON_VERSION) -q Qt5Brew -y
-	
+
 test:
 	@echo "Testing 4 Mac $(GITCOMMIT)"
-	qt5.pkg.macos-$(MACOS_VERSION)-release/klayout.app/Contents/MacOS/klayout -b -r test-pylib-script.py; \
-	cd qt5.build.macos-$(MACOS_VERSION)-release; \
+	PIP_REQUIRE_VIRTUALENV="false" HW-qt5Brew.pkg.macos-$(MACOS_VERSION)-release-RsysPhb38/klayout.app/Contents/MacOS/klayout -b -r test-pylib-script.py; \
+	cd qt5Brew.build.macos-$(MACOS_VERSION)-release-RsysPhb38; \
 	ln -s klayout.app/Contents/MacOS/klayout klayout; \
 	export TESTTMP=testtmp; \
 	export TESTSRC=..; \
 	export DYLD_LIBRARY_PATH=.:db_plugins/:lay_plugins/; \
 	./ut_runner -h || true; \
 	cd ..
 
+dmg-template:
+	mkdir -p testtemplate/klayout.app
+	./makeDMG4mac.py -p testtemplate -m -z -t klayoutDMGTemplate.dmg
+	cp -a klayoutDMGTemplate.dmg* macbuild/Resources/
+	rm -Rf testtemplate
+
 dropbox-deploy:
 	@echo "Preparing for dropbox deployment $(MACOS_VERSION) $(GITCOMMIT)"
-	mkdir -p deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION); \
-	pwd; \
-	ls -lah; \
-	touch build.txt; \
-	cp build.txt deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).log.txt; \
-	hdiutil convert macbuild/Resources/klayoutDMGTemplate.dmg -format UDRW -o work-KLayout.dmg; \
-	hdiutil resize -size 500m work-KLayout.dmg; \
-	hdiutil attach work-KLayout.dmg -readwrite -noverify -quiet -mountpoint tempKLayout -noautoopen; \
-	cp -a qt5.pkg.macos-$(MACOS_VERSION)-release/ tempKLayout/; \
-	hdiutil detach tempKLayout; \
-	hdiutil convert work-KLayout.dmg -format UDZO -imagekey zlib-level=9 -o deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg; \
-	md5 -q deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg > deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg.md5; \
+	mkdir -p deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)
+	pwd
+	ls -lah
+	touch build.txt
+	cp build.txt deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).log.txt
+	hdiutil convert macbuild/Resources/klayoutDMGTemplate.dmg -ov -format UDRW -o work-KLayout.dmg
+	hdiutil resize -size 500m work-KLayout.dmg
+	hdiutil attach -readwrite -noverify -quiet -mountpoint tempKLayout -noautoopen work-KLayout.dmg
+	cp -a HW-qt5Brew.pkg.macos-$(MACOS_VERSION)-release-RsysPhb38/ tempKLayout/
+	hdiutil detach tempKLayout
+	hdiutil convert work-KLayout.dmg -ov -format UDZO -imagekey zlib-level=9 -o deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg
+	md5 -q deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg > deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg.md5
 	rm work-KLayout.dmg

build.sh

@@ -532,6 +532,11 @@ if [ "$BIN" = "" ]; then
   BIN=$CURR_DIR/bin-$CONFIG
 fi
 
+if [ "$QMAKE_CCACHE" = 1 ]; then
+  echo "    Compilation caching is activated."
+else
+  echo "    Compilation caching is deactivated!"
+fi
 echo "    Installation target: $BIN"
 echo "    Build directory: $BUILD"
 

macbuild/.gitignore

@@ -1 +1,2 @@
 *.pyc
+KLayoutDMG.applescript

macbuild/Resources/klayoutDMGTemplate.dmg

@@ -26,6 +26,12 @@
 -------------------------------------------------------------------------------------------------
 on run (volumeName) -- most likely, the volume name is "KLayout"
     tell application "Finder"
+        repeat 20 times
+            if (exists (disk (volumeName as string))) then
+                exit repeat
+            end if
+            delay 1
+        end repeat
         tell disk (volumeName as string)
             -- [1] Open the volume
             open