Draft: macOS Build system updates

.github/workflows/macOS.yml

@@ -0,0 +1,57 @@
+name: macOS CI
+on: [push]
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Homebrew
+        run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+      - name: Update Homebrew
+        run: brew update
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+      - name: Install and verify setuptools
+        id: install-setuptools
+        run: |
+          python3 --version
+          pip3 --version
+          pip3 install --upgrade pip setuptools wheel
+          python3 -c "import setuptools; print(setuptools.__version__)"
+      - name: Install Homebrew deps
+        id: install-deps
+        run: |
+          brew install gnu-tar pkg-config autoconf qt qt-creator
+      - name: Build on macOS
+        id: Build
+        run: |
+          xcodebuild -version
+          export PKGBUILD=`which pkgbuild`
+          export QMAKE=`which qmake`
+          ./Makepkgs -verbose
+      - name: Debug on failure
+        if: failure() && steps.Build.conclusion == 'failure'
+        run: |
+          cat /Users/runner/work/pcp/pcp/Logs/pcp
+      - name: Debug on Python installation failure
+        if: failure() && steps.install-python.conclusion == 'failure'
+        run: |
+          echo "Python 3.13 installation failed. Collecting debug info..."
+          brew --version
+          brew config
+          brew doctor
+          ls -la /usr/local/bin | grep python
+          df -h
+          brew list
+      - name: Debug on dependency installation failure
+        if: failure() && steps.install-deps.conclusion == 'failure'
+        run: |
+          echo "Dependency installation failed. Collecting debug info..."
+          brew --version
+          brew config
+          brew doctor
+          ls -la /usr/local/bin | grep python
+          df -h
+          brew list

INSTALL.md

@@ -216,6 +216,14 @@ optional" or "QA optional".
 The pcp package uses autoconf/configure and expects a GNU build
 environment (your platform must at least have gmake).
 
+```
+# MacOS - use Homebrew and ensure the following packages are installed 
+brew install  gnu-tar pkg-config python3 python-setuptools autoconf qt qt-creator
+```
+
+---
+
+### 2. Building PCP binaries
 If you just want to build a .rpm, .deb, .dmg, .msi[*] and/or
 tar file, use the "Makepkgs" script in the top level directory.
 This will configure and build the package for your platform and leave
@@ -241,6 +249,14 @@ $ dpkg -i *.deb
 $ cd pcp-<version>/build/rpm
 $ sudo rpm -U `ls -1 *.rpm | sed -e '/\.src\.rpm$/d'`
 ```
+**MacOS DMG install**
+```
+$ cd pcp-<version>/build/mac
+$ open *.dmg
+
+<A Finder window should open showing the .pkg you can double click to run the installer>
+```
+
 **tarball install** (where we don't have native packaging working yet)
 ```
 $ cd pcp-<version>/build/tar

Makepkgs

@@ -231,7 +231,7 @@ fi
 configenv=''
 if $dodeb
 then
-    # On Debian-based platforms, the debian/rules file already captures 
+    # On Debian-based platforms, the debian/rules file already captures
     # most of the required configure settings in $(configure_paths) and
     # $(configure_tools)
     #
@@ -271,7 +271,13 @@ then
     # On Mac OS X platforms, we install away from /usr/bin, /usr/lib
     # and so on because of security requirements in recent versions.
     #
-configopts="--sysconfdir=/etc --localstatedir=/var --prefix=/usr/local"
+    configopts="--sysconfdir=/etc --localstatedir=/var --prefix=/usr/local"
+    if [ -x /usr/bin/pkgbuild ]; then
+        echo "MacOS build system detected.  Using pkgbuild"
+        export PKGBUILD=/usr/bin/pkgbuild
+        export QMAKE=`which qmake`
+    fi
+
 elif [ $target = netbsd ]
 then
     # Try to mimic where pkgsrc/pkgin places things

build/GNUmakefile

@@ -39,7 +39,7 @@ pack_pcp :
 	if test ! -z "$(TAR)"; then \
 	    echo === tar === && $(MAKE) -j 1 -C tar $@ || exit $$?; \
 	fi; \
-	if test ! -z "$(PACKAGE_MAKER)"; then \
+	if test ! -z "$(PKGBUILD)"; then \
 	    echo === mac === && $(MAKE) -j 1 -C mac $@ || exit $$?; \
 	fi; \
 	if test ! -z "$(MKINSTALLP)"; then \

build/mac/GNUmakefile

@@ -28,7 +28,7 @@ pack_pcp : extrabits
 	 PACKAGE_MAJOR=${PACKAGE_MAJOR} \
 	 PACKAGE_MINOR=${PACKAGE_MINOR} \
 	 PACKAGE_BUILD=${PACKAGE_BUILD} \
-	./build-installer $(PACKAGE_MAKER) $(HDIUTIL) \
+	./build-installer $(PKGBUILD) $(HDIUTIL) \
 			  $$DIST_ROOT ${PACKAGE_NAME} idb 
 
 idb: $(DIST_MANIFEST)
@@ -41,6 +41,9 @@ idb: $(DIST_MANIFEST)
 # make source relative to DIST_ROOT
 # ensure that a symlink has a full path for the source (no change needed
 #   if source is already a full path)
+# Remove a linux-specific directory/file that isn't useful and isn't allowed in /usr/lib anyway (tmpfiles.d)
+# Get rid of the QA & Testsuite stuff is as they're not useful resources for the Mac installation (it's not a source-bundle) and some files don't correctly come across anyway
+# - this also speeds up the install and trims down the archive
 # append the installer scripts
 	@echo Making idb...
 	@echo "# Version 1" > idb
@@ -66,27 +69,23 @@ idb: $(DIST_MANIFEST)
 			printf "%s %s %s %s %s %s replace\n", $$1, $$2, $$3, $$4, $$6, $$5 ; \
 		} \
 		' $$DIST_MANIFEST \
-	| sed -e 's# '$$WA'/# #g' -e 's# /# #g' >> idb
+	| sed -e 's# '$$WA'/# #g' -e 's# /# #g' | \
+	grep -v "usr/lib/tmpfiles.d" | \
+	$(PCP_AWK_PROG) ' \
+		$$6 !~ /^qa/ && $$5 !~ /testsuite/ {print} \
+	 ' >> idb
 	@(bdir=`echo $(PCP_BINADM_DIR) | cut -c2-`; \
 	  echo "f 644 root wheel $$bdir/idb idb replace"; \
 	  echo "f 755 root wheel $$bdir/install-pcp install-pcp replace"; \
 	  echo "f 755 root wheel $$bdir/uninstall-pcp uninstall-pcp replace") >> idb
-	@echo "f 644 root wheel Library/StartupItems/pcp/StartupParameters.plist StartupParameters.plist replace" >> idb
-	@echo "d 755 root wheel Library/StartupItems/pcp/Resources . replace" >> idb
-	@echo "d 755 root wheel Library/StartupItems/pcp/Resources/English.lproj . replace" >> idb
-	@echo "f 644 root wheel Library/StartupItems/pcp/Resources/English.lproj/Localizable.strings English.lproj/Localizable.strings replace" >> idb
-	@echo "s 0 root wheel Library/StartupItems/pcp/pmcd etc/init.d/pmcd replace" >> idb
-	@echo "s 0 root wheel Library/StartupItems/pcp/pmie etc/init.d/pmie replace" >> idb
-	@echo "s 0 root wheel Library/StartupItems/pcp/pmproxy etc/init.d/pmproxy replace" >> idb
-	@echo "s 0 root wheel Library/StartupItems/pcp/pmlogger etc/init.d/pmlogger replace" >> idb
+	@echo "f 644 root wheel Library/LaunchDaemons/io.pcp.pmcd.plist io.pcp.pmcd.plist replace" >> idb
 	@echo idb created
 
 extrabits: idb
 	DIST_MANIFEST= $(INSTALL) -m 755 idb install-pcp uninstall-pcp \
 		$(PCP_BINADM_DIR)
-	DIST_MANIFEST= $(INSTALL) -m 644 StartupParameters.plist \
-		Library/StartupItems/pcp/StartupParameters.plist
-	DIST_MANIFEST= $(INSTALL) -m 644 English.lproj/Localizable.strings \
-		Library/StartupItems/pcp/Resources/English.lproj/Localizable.strings
+	DIST_MANIFEST= $(INSTALL) -m 644 io.pcp.pmcd.plist \
+		Library/LaunchDaemons/io.pcp.pmcd.plist
+
 
 include $(BUILDRULES)

build/mac/build-installer

@@ -2,7 +2,7 @@
 
 if [ ! -x "$1" -o ! -x "$2" -o ! -d "$3" -o -z "$4" -o ! -f "$5" ]; then
     if [ ! -x "$1" ]; then
-	echo PackageMaker not executable
+	echo pkgbuild not executable
     fi
     if [ ! -x "$2" ]; then
 	echo hdiutil not executable
@@ -22,7 +22,7 @@ fi
 
 IFDIR="installer-files"
 IRDIR="installer-resources"
-PKGMKR=$1
+PKGBUILD=$1
 HDIUTIL=$2
 DIST_ROOT=$3
 PACKAGE=$4-$PACKAGE_VERSION-$PACKAGE_BUILD
@@ -60,7 +60,7 @@ echo "Gathering files from the source tree using install-pcp"
 _do rm -rf $IFDIR
 _do mkdir $IFDIR
 cd $IFDIR
-_do ../install-pcp -R $DIST_ROOT -c $IDB
+_do ../install-pcp -v -R $DIST_ROOT -c $IDB
 cd $HERE
 
 pwd
@@ -87,19 +87,19 @@ for f in installer-info installer-description; do
 	    < $f > $nf || exit 1
 done
 
-echo "Launching PackageMaker..."
+echo "Launching pkgbuild..."
 
 _do rm -rf $PKG
 
-# PackageMaker returns non-zero value even if it succeeds.
-# PackageMaker must be run by the user logged into the localhost desktop.
-#
-_run $PKGMKR -build -p $HERE/$PKG  \
-	-f $HERE/installer-files -r $HERE/installer-resources \
-	-i $HERE/info -d $HERE/description &
-wait
+# create custom 'flatenned' directory to use for pkgbuild
+pkgroot=`mktemp -d /tmp/macos-pkg.XXXXXXXXX`
+cp -RP installer-files/* $pkgroot/
+cp -RP installer-resources/* $pkgroot/
 
-if [ ! -d $HERE/$PKG ]
+# pkgbuild must be run by the user logged into the localhost desktop.
+_run $PKGBUILD --identifier io.pcp.performancecopilot --version $PACKAGE_VERSION --nopayload --scripts $pkgroot $HERE/$PKG
+
+if [ ! -s $HERE/$PKG ]
 then
     echo "$prog: Package generation failed"
     exit 1
@@ -114,7 +114,6 @@ _do mv $PKG $PACKAGE
 _do $HDIUTIL makehybrid -quiet -o $PACKAGE.tmp $PACKAGE \
 	-hfs-openfolder dmg.tmp/$DMG -hfs
 _do $HDIUTIL convert -quiet $TEMPDMG -format UDRO -o $DMG
-_do $HDIUTIL internet-enable -quiet -yes $DMG
 
 if [ ! -f $HERE/$DMG ]
 then

build/mac/install-pcp

@@ -352,7 +352,7 @@ _install_file()
 			then
 			    _warn "Unable to remove existing $target, continuing"
 			fi
-			if _cmd $MV $source $target
+			if _cmd $CP $source $target
 			then
 			    installed=true
 			else
@@ -409,7 +409,7 @@ _install_file()
 	    then
 		_error "$target exists but is a directory"
 	    else
-		if _cmd $MV $source $target
+		if _cmd $CP $source $target
 		then
 		    installed=true
 		else

build/mac/installer-resources/postflight

@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2003-2004 Silicon Graphics, Inc.  All Rights Reserved.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-/Library/StartupItems/pcp/pmcd start
-/Library/StartupItems/pcp/pmlogger start
-
-exit 0

build/mac/installer-resources/postinstall

@@ -31,8 +31,6 @@ then
     exit
 fi
 
-cd $2
-
 if ./install-pcp -i -l /var/log/pcp_inst.log idb
 then
     :
@@ -102,4 +100,9 @@ do
     [ -d "$dir" ] && rm -rf "$dir"
 done
 
+# Ensure pmcd is loaded...
+launchctl bootstrap system /Library/LaunchDaemons/io.pcp.pmcd.plist
+# ...and then started by launchctl - it would get picked up by a reboot, but this leaves pmcd running after install
+launchctl kickstart -p -k system/io.pcp.pmcd
+
 status=0

build/mac/io.pcp.pmcd.plist

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Label</key>
+        <string>io.pcp.pmcd</string>
+        <key>ProgramArguments</key>
+        <array>
+            <string>/etc/init.d/pmcd</string>
+            <string>start</string>
+        </array>
+        <key>Disabled</key>
+        <false/>
+        <key>UserName</key>
+        <string>root</string>
+        <key>UserGroup</key>
+        <string>wheel</string>
+        <key>KeepAlive</key>
+        <false/>
+        <key>ThrottleInterval</key>
+        <integer>30</integer>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>StandardErrorPath</key>
+        <string>/tmp/pmcd.job.err</string>
+        <key>StandardOutPath</key>
+        <string>/tmp/pmcd.job.out</string>
+    </dict>
+</plist>