@@ -55,20 +55,23 @@ jobs:
         with:
           repository: 'dlang/dmd'
           ref: ${{ inputs.release_branch }}
+          fetch-depth: 0
           path: 'dmd'
 
       - name: Clone phobos
         uses: actions/checkout@v4
         with:
           repository: 'dlang/phobos'
           ref: ${{ inputs.release_branch }}
+          fetch-depth: 0
           path: 'phobos'
 
       - name: Clone dlang.org
         uses: actions/checkout@v4
         with:
           repository: 'dlang/dlang.org'
           ref: ${{ inputs.release_branch }}
+          fetch-depth: 0
           path: 'dlang.org'
 
       # Fetch host compiler
@@ -126,7 +129,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             target: linux
-          - os: macos-13
+          - os: macos-14
             target: osx
           - os: windows-2022
             target: windows
 
@@ -138,6 +138,8 @@ struct Box
         {
             if (src.startsWith("default:"))
                 src = _tmpdir ~ "/" ~ src[8..$];
+            else if (src.startsWith("'default:"))
+                src = "'" ~ _tmpdir ~ "/" ~ src[9..$];
             if (tgt.startsWith("default:"))
                 tgt = _tmpdir ~ "/" ~ tgt[8..$];
 
@@ -329,18 +331,25 @@ void runBuild(ref Box box, string ver, bool isBranch, bool skipDocs, string ldcV
         break;
 
     case OS.windows:
-        with (box.shell())
+        version (NoVagrant)
+        {
+            // Migrated to GHA build_release_template.yml
+        }
+        else
         {
-            cmd(`cd clones\installer\windows`);
-            cmd(`&'C:\Program Files (x86)\NSIS\makensis'`~
-                ` '/DEmbedD2Dir=C:\Users\vagrant\dmd.`~ver~`.windows\dmd2'`~
-                ` '/DVersion2=`~ver~`' d2-installer.nsi`);
-            cmd(`move dmd-`~ver~`.exe C:\Users\vagrant\dmd-`~ver~`.exe`);
-            // sign installer
-            version (CodeSign)
-                cmd(`&C:\Users\vagrant\codesign\sign.ps1 C:\Users\vagrant\codesign\win.pfx C:\Users\vagrant\codesign\win.fingerprint C:\Users\vagrant\codesign\win.pass C:\Users\vagrant\dmd-`~ver~`.exe`);
+            with (box.shell())
+            {
+                cmd(`cd clones\installer\windows`);
+                cmd(`&'C:\Program Files (x86)\NSIS\makensis'`~
+                    ` '/DEmbedD2Dir=C:\Users\vagrant\dmd.`~ver~`.windows\dmd2'`~
+                    ` '/DVersion2=`~ver~`' d2-installer.nsi`);
+                cmd(`move dmd-`~ver~`.exe C:\Users\vagrant\dmd-`~ver~`.exe`);
+                // sign installer
+                version (CodeSign)
+                    cmd(`&C:\Users\vagrant\codesign\sign.ps1 C:\Users\vagrant\codesign\win.pfx C:\Users\vagrant\codesign\win.fingerprint C:\Users\vagrant\codesign\win.pass C:\Users\vagrant\dmd-`~ver~`.exe`);
+            }
+            box.scp("default:dmd-"~ver~".exe", "build/");
         }
-        box.scp("default:dmd-"~ver~".exe", "build/");
         break;
 
     case OS.osx:
@@ -636,9 +645,12 @@ int main(string[] args)
     immutable ver = gitTag.chompPrefix("v");
     mkdirRecurse("build");
 
-    version (NoVagrant) version(linux) {} else
-        if (!skipDocs)
+    version (NoVagrant)
+    {
+        version(linux) {}
+        else if (!skipDocs)
             copyDirectory("docs", workDir);
+    }
 
     foreach (p; platforms)
     {
 
@@ -18,12 +18,6 @@ TARGET_DIR=data
 # TARGET_SITE=erdani.com
 # TARGET_DIR=d
 
-MAKER:=$(shell \
-if [ -f /Developer/usr/bin/packagemaker ];\
-	then echo /Developer/usr/bin/packagemaker;\
-	else echo /Applications/PackageMaker.app/Contents/MacOS/PackageMaker;\
-fi)
-
 all: dmd.${VERSION}.dmg
 	rsync -az $< ${TARGET_SITE}:${TARGET_DIR}/dmd.${VERSION}.dmg
 
@@ -37,7 +31,10 @@ dmd.${VERSION}.dmg: dmd.${VERSION}.osx.zip
 	rm -rf dmg/
 	mkdir -p dmg/DMD2
 	cp uninstall.command dmg/DMD2/
-	${MAKER} -d dmd.pmdoc -o dmg/DMD2/DMD2.pkg --target 10.5
+	pkgbuild --root dmd/ \
+		--version ${VERSION} --identifier org.dlang.dmd.dmd2 \
+		--install-location /Library/D/dmd --scripts scripts/ \
+		--min-os-version 10.5 dmg/DMD2/DMD2.pkg
 	hdiutil create -srcfolder dmg/DMD2 $@
 
 clean:
 
@@ -33,15 +33,14 @@ The it will copy the dmd.conf  or dmd2.conf file into dmd/bin, this is
 needed  because the installer  will create  symlinks and  the dmd.conf
 need to have hard coded paths.
 
-Then it  will run  packagemaker to create  the installer, it  will use
-dmd.pmdoc or  dmd2.pmdoc, it  contains the GUI  for the  installer and
-what and how to install.  packagemaker will also pack post-install.sh,
-it  creates symlinks. It  will also  package the  contents of  the dmd
-directory into  the .pkg file it  will create.  The .pkg  file will be
-saved in dmg/DMD  then the uninstall.command file will  be copied here
-to, it's  a regular  shell script that  uninstalls everything,  it has
-".command" as the file extension  because then you can double click on
-it in Finder and it will launch a terminal and run the script.
+Then it  will run  pkgbuild to create  the installer. pkgbuild will
+also pack scripts/postinstall, it  creates symlinks. It  will also
+package the  contents of  the dmd directory into  the .pkg file it
+will create.  The .pkg  file will be saved in dmg/DMD  then the
+uninstall.command file will  be copied here to, it's  a regular  shell
+script that  uninstalls everything,  it has ".command" as the file
+extension  because then you can double click on it in Finder and it
+will launch a terminal and run the script.
 
 After  the  installer  is created  it  will  run  hdiutil on  the  dmg
 directory and  create a .dmg file with  the name you gave  with the -o
@@ -59,9 +58,5 @@ graphical user interface. It's very  easy to enable vnc: Apple Menu ->
 System  Preferences -> Sharing  -> enable  Screen Sharing  -> Computer
 Settings... -> VNC viewers ...
 
-You will need the GUI to run PackageMaker and look at the pmdoc files,
-if you don't want to read xml.
-
-
 /Jacob Carlborg