From e7eaa8a102d86086fa3159ad80c9224facb7739e Mon Sep 17 00:00:00 2001
From: develar <develar@gmail.com>
Date: Fri, 19 Jul 2019 09:41:11 +0200
Subject: [PATCH] fix(dmg): cannot build DMG on macOS 10.15

Close #3990
---
 .idea/codeStyles/Project.xml                  |   7 +
 .idea/dictionaries/develar.xml                |   1 +
 package.json                                  |   6 +-
 packages/app-builder-lib/package.json         |   4 +-
 packages/app-builder-lib/scheme.json          |   8 +-
 packages/app-builder-lib/src/configuration.ts |   8 +-
 .../app-builder-lib/src/options/macOptions.ts |  17 +-
 packages/app-builder-lib/src/packager.ts      |   9 +-
 .../src/publish/PublishManager.ts             |   2 +-
 .../src/targets/nsis/nsisOptions.ts           |   2 +-
 .../app-builder-lib/src/util/appBuilder.ts    |   4 +
 packages/app-builder-lib/src/util/config.ts   |  38 +-
 packages/builder-util/package.json            |   2 +-
 packages/dmg-builder/package.json             |   3 +-
 packages/dmg-builder/src/dmg.ts               | 147 ++--
 packages/dmg-builder/src/dmgUtil.ts           |  17 -
 .../dmg-builder/templates/dmgProperties.pl    |  44 -
 packages/dmg-builder/templates/settings.py    | 230 -----
 .../dmg-builder/vendor/Mac/Finder/DSStore.pm  | 733 ---------------
 .../Mac/Finder/DSStore/BuddyAllocator.pm      | 783 ----------------
 .../vendor/Mac/Finder/DSStore/Format.pod      | 552 ------------
 .../dmg-builder/vendor/biplist/__init__.py    | 278 ++++--
 .../dmg-builder/vendor/dmgbuild/__init__.py   |   3 -
 packages/dmg-builder/vendor/dmgbuild/core.py  | 832 ++++++------------
 .../dmg-builder/vendor/dmgbuild/resources.py  | 355 --------
 packages/dmg-builder/vendor/ds_store/store.py |   2 +-
 packages/electron-builder/package.json        |   2 +-
 test/fixtures/test-app-one/index.js           |  64 +-
 .../packages/test-app/index.js                |  67 --
 .../packages/test-app/index.js                |  67 --
 .../packages/test-app/index.js                |  67 --
 test/out/__snapshots__/BuildTest.js.snap      |   4 +-
 .../configurationValidationTest.js.snap       |  21 +-
 test/out/__snapshots__/globTest.js.snap       |  14 +-
 test/out/__snapshots__/protonTest.js.snap     |  38 +-
 test/out/mac/__snapshots__/dmgTest.js.snap    |  68 ++
 .../mac/__snapshots__/macArchiveTest.js.snap  |  20 +-
 test/src/mac/dmgTest.ts                       |  24 +
 test/src/protonTest.ts                        |   8 +-
 yarn.lock                                     |  48 +-
 40 files changed, 817 insertions(+), 3782 deletions(-)
 delete mode 100644 packages/dmg-builder/templates/dmgProperties.pl
 delete mode 100644 packages/dmg-builder/templates/settings.py
 delete mode 100644 packages/dmg-builder/vendor/Mac/Finder/DSStore.pm
 delete mode 100644 packages/dmg-builder/vendor/Mac/Finder/DSStore/BuddyAllocator.pm
 delete mode 100644 packages/dmg-builder/vendor/Mac/Finder/DSStore/Format.pod
 delete mode 100644 packages/dmg-builder/vendor/dmgbuild/__init__.py
 delete mode 100644 packages/dmg-builder/vendor/dmgbuild/resources.py

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 9f8e8a245ea..24e63815faf 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -64,6 +64,13 @@
         <option name="TAB_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Python">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="TypeScript">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="ELSE_ON_NEW_LINE" value="true" />
diff --git a/.idea/dictionaries/develar.xml b/.idea/dictionaries/develar.xml
index 0e4b38866c5..1bd6e0d4db0 100644
--- a/.idea/dictionaries/develar.xml
+++ b/.idea/dictionaries/develar.xml
@@ -312,6 +312,7 @@
       <w>psexec</w>
       <w>psmdcp</w>
       <w>pulseaudio</w>
+      <w>pythonioencoding</w>
       <w>pythonpath</w>
       <w>rcedit</w>
       <w>readpass</w>
diff --git a/package.json b/package.json
index b3941772a8e..5ecbab3d47a 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@types/debug": "^4.1.4",
     "@types/is-ci": "^2.0.0",
     "@types/semver": "^6.0.1",
-    "app-builder-bin": "3.4.0",
+    "app-builder-bin": "3.4.1",
     "archiver": "^3.0.0",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
@@ -55,10 +55,10 @@
     "minimatch": "^3.0.4",
     "normalize-package-data": "^2.5.0",
     "pako": "^1.0.10",
-    "parse-color": "^1.0.0",
-    "read-config-file": "4.0.1",
+    "read-config-file": "5.0.0",
     "sanitize-filename": "^1.6.1",
     "sax": "^1.2.4",
+    "schema-utils": "^2.0.1",
     "semver": "^6.2.0",
     "source-map-support": "^0.5.12",
     "stat-mode": "^0.3.0",
diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
index dc9d489c6b7..ae8466f60db 100644
--- a/packages/app-builder-lib/package.json
+++ b/packages/app-builder-lib/package.json
@@ -7,6 +7,7 @@
     "out",
     "templates",
     "scheme.json",
+    "electron-osx-sign",
     "certs/root_certs.keychain",
     "electron-osx-sign"
   ],
@@ -54,10 +55,11 @@
     "is-ci": "^2.0.0",
     "isbinaryfile": "^4.0.2",
     "js-yaml": "^3.13.1",
-    "read-config-file": "4.0.1",
+    "read-config-file": "5.0.0",
     "minimatch": "^3.0.4",
     "normalize-package-data": "^2.5.0",
     "sanitize-filename": "^1.6.1",
+    "schema-utils": "^2.0.1",
     "semver": "^6.2.0",
     "debug": "^4.1.1",
     "lazy-val": "^1.0.4",
diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
index 9ed54a2ca44..6f2f0f5d58f 100644
--- a/packages/app-builder-lib/scheme.json
+++ b/packages/app-builder-lib/scheme.json
@@ -794,12 +794,16 @@
                 },
                 "window": {
                     "$ref": "#/definitions/DmgWindow",
-                    "description": "The DMG windows position and size."
+                    "description": "The DMG windows position and size. With y co-ordinates running from bottom to top.\nThe Finder makes sure that the window will be on the user’s display, so if you want your window at the top left of the display you could use `\"x\": 0, \"y\": 100000` as the x, y co-ordinates.\nIt is not to be possible to position the window relative to the [top left](https://github.com/electron-userland/electron-builder/issues/3990#issuecomment-512960957) or relative to the center of the user’s screen."
                 },
                 "sign": {
                     "default": false,
                     "description": "Disable signing of the DMG when building. This can help solve issues with Gatekeeper disabling installation of your app.",
                     "type": "boolean"
+                },
+                "writeUpdateInfo": {
+                    "default": true,
+                    "type": "boolean"
                 }
             },
             "title": "DmgOptions",
@@ -5337,7 +5341,7 @@
             "type": "boolean"
         },
         "framework": {
-            "description": "The framework name. One of `electron`, `proton-native`, `libui`. Defaults to `electron`.",
+            "description": "The framework name. One of `electron`, `proton`, `libui`. Defaults to `electron`.",
             "type": [
                 "null",
                 "string"
diff --git a/packages/app-builder-lib/src/configuration.ts b/packages/app-builder-lib/src/configuration.ts
index f5ee083868d..63392d5576e 100644
--- a/packages/app-builder-lib/src/configuration.ts
+++ b/packages/app-builder-lib/src/configuration.ts
@@ -169,13 +169,7 @@ export interface Configuration extends PlatformSpecificBuildOptions {
   readonly launchUiVersion?: boolean | string | null
 
   /**
-   * @private
-   * @deprecated Set framework and nodeVersion if need.
-   */
-  readonly protonNodeVersion?: string | null
-
-  /**
-   * The framework name. One of `electron`, `proton-native`, `libui`. Defaults to `electron`.
+   * The framework name. One of `electron`, `proton`, `libui`. Defaults to `electron`.
    */
   readonly framework?: string | null
 
diff --git a/packages/app-builder-lib/src/options/macOptions.ts b/packages/app-builder-lib/src/options/macOptions.ts
index 332a61e0528..fb1a04a92cb 100644
--- a/packages/app-builder-lib/src/options/macOptions.ts
+++ b/packages/app-builder-lib/src/options/macOptions.ts
@@ -141,7 +141,7 @@ export interface DmgOptions extends TargetSpecificOptions {
    * The path to DMG icon (volume icon), which will be shown when mounted, relative to the [build resources](/configuration/configuration#MetadataDirectories-buildResources) or to the project directory.
    * Defaults to the application icon (`build/icon.icns`).
    */
-  readonly icon?: string | null
+  icon?: string | null
 
   /**
    * The size of all the icons inside the DMG.
@@ -172,10 +172,13 @@ export interface DmgOptions extends TargetSpecificOptions {
    * The disk image format. `ULFO` (lzfse-compressed image (OS X 10.11+ only)).
    * @default UDZO
    */
-  readonly format?: "UDRW" | "UDRO" | "UDCO" | "UDZO" | "UDBZ" | "ULFO"
+  format?: "UDRW" | "UDRO" | "UDCO" | "UDZO" | "UDBZ" | "ULFO"
 
   /**
-   * The DMG windows position and size.
+   * The DMG window position and size. With y co-ordinates running from bottom to top.
+   *
+   * The Finder makes sure that the window will be on the user’s display, so if you want your window at the top left of the display you could use `"x": 0, "y": 100000` as the x, y co-ordinates.
+   * It is not to be possible to position the window relative to the [top left](https://github.com/electron-userland/electron-builder/issues/3990#issuecomment-512960957) or relative to the center of the user’s screen.
    */
   window?: DmgWindow
 
@@ -190,6 +193,12 @@ export interface DmgOptions extends TargetSpecificOptions {
    * @default false
    */
   readonly sign?: boolean
+
+  /**
+   * @private
+   * @default true
+   */
+  writeUpdateInfo?: boolean
 }
 
 export interface DmgWindow {
@@ -200,7 +209,7 @@ export interface DmgWindow {
   x?: number
 
   /**
-   * The Y position relative to top of the screen.
+   * The Y position relative to bottom of the screen.
    * @default 100
    */
   y?: number
diff --git a/packages/app-builder-lib/src/packager.ts b/packages/app-builder-lib/src/packager.ts
index 444e2239c55..cd5d4b6a768 100644
--- a/packages/app-builder-lib/src/packager.ts
+++ b/packages/app-builder-lib/src/packager.ts
@@ -39,13 +39,6 @@ async function createFrameworkInfo(configuration: Configuration, packager: Packa
   }
 
   let nodeVersion = configuration.nodeVersion
-  // noinspection JSDeprecatedSymbols
-  if (framework == null && configuration.protonNodeVersion != null) {
-    framework = "proton"
-    // noinspection JSDeprecatedSymbols
-    nodeVersion = configuration.protonNodeVersion
-  }
-
   if (framework === "electron" || framework == null) {
     return await createElectronFrameworkSupport(configuration, packager)
   }
@@ -56,7 +49,7 @@ async function createFrameworkInfo(configuration: Configuration, packager: Packa
 
   const distMacOsName = `${packager.appInfo.productFilename}.app`
   const isUseLaunchUi = configuration.launchUiVersion !== false
-  if (framework === "proton") {
+  if (framework === "proton" || framework === "proton-native") {
     return new ProtonFramework(nodeVersion, distMacOsName, isUseLaunchUi)
   }
   else if (framework === "libui") {
diff --git a/packages/app-builder-lib/src/publish/PublishManager.ts b/packages/app-builder-lib/src/publish/PublishManager.ts
index b8cd1742be1..ffbeee67428 100644
--- a/packages/app-builder-lib/src/publish/PublishManager.ts
+++ b/packages/app-builder-lib/src/publish/PublishManager.ts
@@ -390,7 +390,7 @@ async function resolvePublishConfigurations(publishers: any, platformPackager: P
     }
 
     if (serviceName != null) {
-      log.debug(null, `Detect ${serviceName} as publish provider`)
+      log.debug(null, `detect ${serviceName} as publish provider`)
       return [(await getResolvedPublishConfig(platformPackager, packager, {provider: serviceName}, arch, errorIfCannot))!]
     }
   }
diff --git a/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts b/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts
index 5fa9bbafe50..595f03a44f4 100644
--- a/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts
+++ b/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts
@@ -124,7 +124,7 @@ export interface NsisOptions extends CommonNsisOptions, CommonWindowsInstallerCo
   readonly deleteAppDataOnUninstall?: boolean
 
   /**
-   * Defaults to `true` for web installer (`nsis-web`)
+   * @private
    */
   differentialPackage?: boolean
 
diff --git a/packages/app-builder-lib/src/util/appBuilder.ts b/packages/app-builder-lib/src/util/appBuilder.ts
index a12d6940028..5a869bf9c2e 100644
--- a/packages/app-builder-lib/src/util/appBuilder.ts
+++ b/packages/app-builder-lib/src/util/appBuilder.ts
@@ -4,6 +4,10 @@ import { SpawnOptions } from "child_process"
 export function executeAppBuilderAsJson<T>(args: Array<string>): Promise<T> {
   return executeAppBuilder(args)
     .then(rawResult => {
+      if (rawResult === "") {
+        return Object.create(null) as T
+      }
+
       try {
         return JSON.parse(rawResult) as T
       }
diff --git a/packages/app-builder-lib/src/util/config.ts b/packages/app-builder-lib/src/util/config.ts
index dbba20880e2..e32103d9485 100644
--- a/packages/app-builder-lib/src/util/config.ts
+++ b/packages/app-builder-lib/src/util/config.ts
@@ -1,12 +1,15 @@
-import { DebugLogger, deepAssign, InvalidConfigurationError, log } from "builder-util"
+import { DebugLogger, deepAssign, InvalidConfigurationError, log, safeStringifyJson } from "builder-util"
 import { statOrNull } from "builder-util/out/fs"
 import { readJson } from "fs-extra"
 import { Lazy } from "lazy-val"
 import * as path from "path"
-import { getConfig as _getConfig, loadParentConfig, orNullIfFileNotExist, ReadConfigRequest, validateConfig as _validateConfig } from "read-config-file"
+import { getConfig as _getConfig, loadParentConfig, orNullIfFileNotExist, ReadConfigRequest } from "read-config-file"
 import { FileSet } from ".."
 import { Configuration } from "../configuration"
 import { reactCra } from "../presets/rectCra"
+const validateSchema = require("schema-utils")
+
+declare const PACKAGE_VERSION: string
 
 // https://github.com/electron-userland/electron-builder/issues/1847
 function mergePublish(config: Configuration, configFromOptions: Configuration) {
@@ -222,19 +225,30 @@ export async function validateConfig(config: Configuration, debugLogger: DebugLo
     throw new InvalidConfigurationError(`appImage.systemIntegration is deprecated, https://github.com/TheAssassin/AppImageLauncher is used for desktop integration"`)
   }
 
-  await _validateConfig(config, schemeDataPromise, (message, errors) => {
-    if (debugLogger.isEnabled) {
-      debugLogger.add("invalidConfig", JSON.stringify(errors, null, 2))
-    }
+  // noinspection JSUnusedGlobalSymbols
+  validateSchema(await schemeDataPromise.value, config, {
+    name: `electron-builder ${PACKAGE_VERSION}`,
+    postFormatter: (formattedError: string, error: any): string => {
+      if (debugLogger.isEnabled) {
+        debugLogger.add("invalidConfig", safeStringifyJson(error))
+      }
 
-    return `${message}
+      const site = "https://www.electron.build"
+      let url = `${site}/configuration/configuration`
+      const targets = new Set(["mac", "dmg", "pkg", "mas", "win", "nsis", "appx", "linux", "appimage", "snap"])
+      const dataPath: string = error.dataPath == null ? null : error.dataPath
+      const targetPath = dataPath.startsWith(".") ? dataPath.substr(1).toLowerCase() : null
+      if (targetPath != null && targets.has(targetPath)) {
+        url = `${site}/configuration/${targetPath}`
+      }
 
-How to fix:
-1. Open https://electron.build/configuration/configuration
-2. Search the option name on the page.
-  * Not found? The option was deprecated or not exists (check spelling).
-  * Found? Check that the option in the appropriate place. e.g. "title" only in the "dmg", not in the root.
+      return `${formattedError}\n  How to fix:
+  1. Open ${url}
+  2. Search the option name on the page (or type in into Search to find across the docs).
+    * Not found? The option was deprecated or not exists (check spelling).
+    * Found? Check that the option in the appropriate place. e.g. "title" only in the "dmg", not in the root.
 `
+    },
   })
 }
 
diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
index 36379065ac0..3802bac44af 100644
--- a/packages/builder-util/package.json
+++ b/packages/builder-util/package.json
@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "3.4.0",
+    "app-builder-bin": "3.4.1",
     "temp-file": "^3.3.4",
     "fs-extra": "^8.1.0",
     "is-ci": "^2.0.0",
diff --git a/packages/dmg-builder/package.json b/packages/dmg-builder/package.json
index eeb2dd0e595..a6bf524daed 100644
--- a/packages/dmg-builder/package.json
+++ b/packages/dmg-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dmg-builder",
-  "version": "1.0.1",
+  "version": "0.0.0-semantic-release",
   "main": "out/dmgUtil.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",
@@ -15,7 +15,6 @@
   "dependencies": {
     "fs-extra": "^8.1.0",
     "bluebird-lst": "^1.0.9",
-    "parse-color": "^1.0.0",
     "builder-util": "~0.0.0-semantic-release",
     "iconv-lite": "^0.5.0",
     "js-yaml": "^3.13.1",
diff --git a/packages/dmg-builder/src/dmg.ts b/packages/dmg-builder/src/dmg.ts
index a5390ee904c..12dbd9bc96d 100644
--- a/packages/dmg-builder/src/dmg.ts
+++ b/packages/dmg-builder/src/dmg.ts
@@ -1,15 +1,16 @@
-import { Arch, AsyncTaskManager, exec, InvalidConfigurationError, isEmptyOrSpaces, log, spawn, deepAssign, executeAppBuilder } from "builder-util"
+import { DmgOptions, Target } from "app-builder-lib"
+import { findIdentity, isSignAllowed } from "app-builder-lib/out/codeSign/macCodeSign"
+import MacPackager from "app-builder-lib/out/macPackager"
+import { createBlockmap } from "app-builder-lib/out/targets/differentialUpdateInfoBuilder"
+import { executeAppBuilderAsJson } from "app-builder-lib/out/util/appBuilder"
+import { Arch, AsyncTaskManager, exec, InvalidConfigurationError, isEmptyOrSpaces, log, spawn } from "builder-util"
 import { CancellationToken } from "builder-util-runtime"
 import { copyDir, copyFile, exists, statOrNull } from "builder-util/out/fs"
-import { addLicenseToDmg } from "./dmgLicense"
-import { applyProperties, attachAndExecute, computeBackground, computeBackgroundColor, detach, transformBackgroundFileIfNeed } from "./dmgUtil"
 import { stat } from "fs-extra"
 import * as path from "path"
 import sanitizeFileName from "sanitize-filename"
-import { findIdentity, isSignAllowed } from "app-builder-lib/out/codeSign/macCodeSign"
-import { Target, DmgOptions } from "app-builder-lib"
-import MacPackager from "app-builder-lib/out/macPackager"
-import { createBlockmap } from "app-builder-lib/out/targets/differentialUpdateInfoBuilder"
+import { addLicenseToDmg } from "./dmgLicense"
+import { attachAndExecute, computeBackground, detach, getDmgVendorPath, transformBackgroundFileIfNeed } from "./dmgUtil"
 
 export class DmgTarget extends Target {
   readonly options: DmgOptions = this.packager.config.dmg || Object.create(null)
@@ -29,11 +30,11 @@ export class DmgTarget extends Target {
       arch,
     })
 
-    const specification = await this.computeDmgOptions()
-    const volumeName = sanitizeFileName(this.computeVolumeName(specification.title))
+    const volumeName = sanitizeFileName(this.computeVolumeName(this.options.title))
 
     const tempDmg = await createStageDmg(await packager.getTempFile(".dmg"), appPath, volumeName)
 
+    const specification = await this.computeDmgOptions()
     // https://github.com/electron-userland/electron-builder/issues/2115
     const backgroundFile = specification.background == null ? null : await transformBackgroundFileIfNeed(specification.background, packager.info.tempDirManager)
     const finalSize = await computeAssetSize(packager.info.cancellationToken, tempDmg, specification, backgroundFile)
@@ -50,7 +51,7 @@ export class DmgTarget extends Target {
     }
 
     // dmg file must not exist otherwise hdiutil failed (https://github.com/electron-userland/electron-builder/issues/1308#issuecomment-282847594), so, -ov must be specified
-    const args = ["convert", tempDmg, "-ov", "-format", specification.format!, "-o", artifactPath]
+    const args = ["convert", tempDmg, "-ov", "-format", specification.format!!, "-o", artifactPath]
     if (specification.format === "UDZO") {
       args.push("-imagekey", `zlib-level=${process.env.ELECTRON_BUILDER_COMPRESSION_LEVEL || "9"}`)
     }
@@ -69,14 +70,14 @@ export class DmgTarget extends Target {
     }
 
     const safeArtifactName = packager.computeSafeArtifactName(artifactName, "dmg")
-    const updateInfo = await createBlockmap(artifactPath, this, packager, safeArtifactName)
+    const updateInfo = this.options.writeUpdateInfo === false ? null : await createBlockmap(artifactPath, this, packager, safeArtifactName)
     await packager.info.callArtifactBuildCompleted({
       file: artifactPath,
       safeArtifactName,
       target: this,
       arch,
       packager,
-      isWriteUpdateInfo: true,
+      isWriteUpdateInfo: updateInfo != null,
       updateInfo,
     })
   }
@@ -129,48 +130,11 @@ export class DmgTarget extends Target {
 
   // public to test
   async computeDmgOptions(): Promise<DmgOptions> {
-    // appdmg
-    const appdmgWindow = (this.options.window as any) || {}
-    const oldPosition = appdmgWindow.position
-    const oldSize = appdmgWindow.size
-    const oldIconSize = (this.options as any)["icon-size"]
-    const oldBackgroundColor = (this.options as any)["background-color"]
-    if (oldPosition != null) {
-      log.warn({solution: "use dmg.window"}, "dmg.window.position is deprecated")
-    }
-    if (oldSize != null) {
-      log.warn({solution: "use dmg.window"}, "dmg.window.size is deprecated")
-    }
-    if (oldIconSize != null) {
-      log.warn({solution: "use dmg.iconSize"}, "dmg.icon-size is deprecated")
-    }
-    if (oldBackgroundColor != null) {
-      log.warn({solution: "use dmg.backgroundColor"}, "dmg.background-color is deprecated")
-    }
-
     const packager = this.packager
-    const specification = deepAssign<DmgOptions>({
-        window: {
-          x: 400,
-          y: 100,
-        },
-        iconSize: oldIconSize,
-        backgroundColor: oldBackgroundColor,
-        icon: "icon" in this.options ? undefined : await packager.getIconPath()
-      },
-      this.options,
-      oldPosition == null ? null : {
-        window: {
-          x: oldPosition.x,
-          y: oldPosition.y,
-        }
-      },
-      oldSize == null ? null : {
-        window: {
-          width: oldSize.width,
-          height: oldSize.height,
-        }
-      })
+    const specification: DmgOptions = {...this.options}
+    if (specification.icon == null && specification.icon !== null) {
+      specification.icon = await packager.getIconPath()
+    }
 
     if (specification.icon != null && isEmptyOrSpaces(specification.icon)) {
       throw new InvalidConfigurationError("dmg.icon cannot be specified as empty string")
@@ -181,7 +145,6 @@ export class DmgTarget extends Target {
       if (background != null) {
         throw new InvalidConfigurationError("Both dmg.backgroundColor and dmg.background are specified — please set the only one")
       }
-      specification.backgroundColor = computeBackgroundColor(specification.backgroundColor)
     }
     else if (background == null) {
       specification.background = await computeBackground(packager)
@@ -195,10 +158,10 @@ export class DmgTarget extends Target {
         (specification as any).format = "UDZO"
       }
       else if (packager.compression === "store") {
-        (specification as any).format = "UDRO"
+        specification.format = "UDRO"
       }
       else {
-        (specification as any).format = packager.compression === "maximum" ? "UDBZ" : "UDZO"
+        specification.format = packager.compression === "maximum" ? "UDBZ" : "UDZO"
       }
     }
 
@@ -257,7 +220,7 @@ async function computeAssetSize(cancellationToken: CancellationToken, dmgFile: s
 }
 
 async function customizeDmg(volumePath: string, specification: DmgOptions, packager: MacPackager, backgroundFile: string | null | undefined) {
-  const window = specification.window!
+  const window = specification.window
   const env: any = {
     ...process.env,
     volumePath,
@@ -265,32 +228,21 @@ async function customizeDmg(volumePath: string, specification: DmgOptions, packa
     iconSize: specification.iconSize || 80,
     iconTextSize: specification.iconTextSize || 12,
 
-    windowX: window.x,
-    windowY: window.y,
-
-    VERSIONER_PERL_PREFER_32_BIT: "true"
+    PYTHONIOENCODING: "utf8",
   }
 
   if (specification.backgroundColor != null || specification.background == null) {
     env.backgroundColor = specification.backgroundColor || "#ffffff"
-    env.windowWidth = (window.width || 540).toString()
-    env.windowHeight = (window.height || 380).toString()
+
+    if (window != null) {
+      env.windowX = (window.x == null ? 100 : window.x).toString()
+      env.windowY = (window.y == null ? 400 : window.y).toString()
+      env.windowWidth = (window.width || 540).toString()
+      env.windowHeight = (window.height || 380).toString()
+    }
   }
   else {
     delete env.backgroundColor
-
-    if (window.width == null) {
-      delete env.windowWidth
-    }
-    else {
-      env.windowWidth = window.width.toString()
-    }
-    if (window.height == null) {
-      delete env.windowHeight
-    }
-    else {
-      env.windowHeight = window.height.toString()
-    }
   }
 
   const args = ["dmg", "--volume", volumePath]
@@ -298,26 +250,55 @@ async function customizeDmg(volumePath: string, specification: DmgOptions, packa
     args.push("--icon", (await packager.getResource(specification.icon))!!)
   }
   if (backgroundFile != null) {
-    env.backgroundFilename = path.basename(backgroundFile)
     args.push("--background", backgroundFile)
   }
-  await executeAppBuilder(args)
+
+  const data: any = await executeAppBuilderAsJson(args)
+  if (data.backgroundWidth != null) {
+    env.windowWidth = window == null ? null : window.width
+    env.windowHeight = window == null ? null : window.height
+
+    if (env.windowWidth == null) {
+      env.windowWidth = data.backgroundWidth.toString()
+    }
+    if (env.windowHeight == null) {
+      env.windowHeight = data.backgroundHeight.toString()
+    }
+
+    if (env.windowX == null) {
+      env.windowX = 400
+    }
+    if (env.windowY == null) {
+      env.windowY = Math.round((1440 - env.windowHeight) / 2).toString()
+    }
+  }
+
+  Object.assign(env, data)
 
   const asyncTaskManager = new AsyncTaskManager(packager.info.cancellationToken)
-  await applyProperties(await computeDmgEntries(specification, volumePath, packager, asyncTaskManager), env, asyncTaskManager, packager)
+  env.iconLocations = await computeDmgEntries(specification, volumePath, packager, asyncTaskManager)
+  await asyncTaskManager.awaitTasks()
+
+  await exec("/usr/bin/python", [path.join(getDmgVendorPath(), "dmgbuild/core.py")], {
+    cwd: getDmgVendorPath(),
+    env
+  })
   return packager.packagerOptions.effectiveOptionComputed == null || !(await packager.packagerOptions.effectiveOptionComputed({volumePath, specification, packager}))
 }
 
-async function computeDmgEntries(specification: DmgOptions, volumePath: string, packager: MacPackager, asyncTaskManager: AsyncTaskManager) {
+async function computeDmgEntries(specification: DmgOptions, volumePath: string, packager: MacPackager, asyncTaskManager: AsyncTaskManager): Promise<string> {
   let result = ""
   for (const c of specification.contents!!) {
     if (c.path != null && c.path.endsWith(".app") && c.type !== "link") {
-      log.warn({path: c.path, reason: "actual path to app will be used instead"}, `do not specify path for application`)
+      log.warn({path: c.path, reason: "actual path to app will be used instead"}, "do not specify path for application")
     }
 
     const entryPath = c.path || `${packager.appInfo.productFilename}.app`
     const entryName = c.name || path.basename(entryPath)
-    result += `&makeEntries("${entryName}", Iloc_xy => [ ${c.x}, ${c.y} ]),\n`
+    if (result.length !== 0) {
+      result += ",\n"
+    }
+    result += `'${entryName}': (${c.x}, ${c.y})`
 
     if (c.type === "link") {
       asyncTaskManager.addTask(exec("ln", ["-s", `/${entryPath.startsWith("/") ? entryPath.substring(1) : entryPath}`, `${volumePath}/${entryName}`]))
@@ -326,7 +307,7 @@ async function computeDmgEntries(specification: DmgOptions, volumePath: string,
     else if (!isEmptyOrSpaces(c.path) && (c.type === "file" || c.type === "dir")) {
       const source = await packager.getResource(c.path)
       if (source == null) {
-        log.warn({entryPath, reason: "doesn't exist"}, `skipped DMG item copying`)
+        log.warn({entryPath, reason: "doesn't exist"}, "skipped DMG item copying")
         continue
       }
 
diff --git a/packages/dmg-builder/src/dmgUtil.ts b/packages/dmg-builder/src/dmgUtil.ts
index a80a9daea0f..bf1afefcf74 100644
--- a/packages/dmg-builder/src/dmgUtil.ts
+++ b/packages/dmg-builder/src/dmgUtil.ts
@@ -1,9 +1,7 @@
 import { exec } from "builder-util"
 import { PlatformPackager } from "app-builder-lib"
-import { AsyncTaskManager } from "builder-util/out/asyncTaskManager"
 import { exists } from "builder-util/out/fs"
 import { executeFinally } from "builder-util/out/promise"
-import { outputFile, readFile } from "fs-extra"
 import * as path from "path"
 import { TmpDir } from "temp-file"
 
@@ -52,10 +50,6 @@ export async function detach(name: string) {
   }
 }
 
-export function computeBackgroundColor(rawValue: string) {
-  return require("parse-color")(rawValue).hex
-}
-
 export async function computeBackground(packager: PlatformPackager<any>): Promise<string> {
   const resourceList = await packager.resourceList
   if (resourceList.includes("background.tiff")) {
@@ -69,17 +63,6 @@ export async function computeBackground(packager: PlatformPackager<any>): Promis
   }
 }
 
-export async function applyProperties(entries: any, env: any, asyncTaskManager: AsyncTaskManager, packager: PlatformPackager<any>) {
-  const dmgPropertiesFile = await packager.getTempFile("dmgProperties.pl")
-  asyncTaskManager.addTask(outputFile(dmgPropertiesFile, (await readFile(path.join(getDmgTemplatePath(), "dmgProperties.pl"), "utf-8")).replace("$ENTRIES", entries)))
-  await asyncTaskManager.awaitTasks()
-
-  await exec("/usr/bin/perl", [dmgPropertiesFile], {
-    cwd: getDmgVendorPath(),
-    env
-  })
-}
-
 export async function transformBackgroundFileIfNeed(file: string, tmpDir: TmpDir): Promise<string> {
   if (file.endsWith(".tiff") || file.endsWith(".TIFF")) {
     return file
diff --git a/packages/dmg-builder/templates/dmgProperties.pl b/packages/dmg-builder/templates/dmgProperties.pl
deleted file mode 100644
index d1a5e7a3757..00000000000
--- a/packages/dmg-builder/templates/dmgProperties.pl
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/perl -w
-
-use Mac::Finder::DSStore qw( writeDSDBEntries makeEntries );
-use Mac::Memory qw( );
-use Mac::Files qw( NewAliasMinimal );
-use Encode ();
-use utf8;
-
-my($backgroundWidth, $backgroundHeight);
-
-if (defined($ENV{'backgroundFilename'}) && !defined($ENV{'windowWidth'}) && !defined($ENV{'windowHeight'})) {
-  $ENV{'backgroundFilename'} = Encode::decode("UTF-8", $ENV{'backgroundFilename'});
-  open(SIPS, "sips -g pixelHeight -g pixelWidth -g format '$ENV{'volumePath'}/.background/$ENV{'backgroundFilename'}' |") || die;
-  while(<SIPS>) {
-      if (/\bpixelWidth: (\d+)/) {
-          $backgroundWidth = $1;
-      }
-      elsif (/\bpixelHeight: (\d+)/) {
-          $backgroundHeight = $1;
-      }
-  }
-  ( close(SIPS) &&
-    defined($backgroundWidth) &&
-    defined($backgroundHeight) )|| die "Cannot query image dimensions";
-}
-
-# perl DOESN'T DECODE incoming env variables properly, so, you MUST explicitly decode it using Encode::decode("UTF-8", ...)
-# see http://stackoverflow.com/questions/2437877/how-can-i-properly-use-environment-variables-encoded-as-windows-1251-in-perl
-
-&writeDSDBEntries("$ENV{'volumePath'}/.DS_Store",
-    &makeEntries(".background", Iloc_xy => [ 2560, 170 ]),
-    &makeEntries(".DS_Store", Iloc_xy => [ 2610, 170 ]),
-    &makeEntries(".fseventsd", Iloc_xy => [ 2660, 170 ]),
-    &makeEntries(".Trashes", Iloc_xy => [ 2710, 170 ]),
-    &makeEntries(".VolumeIcon.icns", Iloc_xy => [ 2760, 170 ]),
-    &makeEntries(".",
-        (defined($ENV{'backgroundColor'}) ? BKGD_color : BKGD_alias) => (defined($ENV{'backgroundColor'}) ? "$ENV{'backgroundColor'}" : NewAliasMinimal("$ENV{'volumePath'}/.background/$ENV{'backgroundFilename'}")),
-        ICVO => 1,
-        fwi0_flds => [ $ENV{'windowY'}, $ENV{'windowX'}, $ENV{'windowY'} + (defined($ENV{'windowHeight'}) ? $ENV{'windowHeight'} : $backgroundHeight), $ENV{'windowX'} + (defined($ENV{'windowWidth'}) ? $ENV{'windowWidth'} : $backgroundWidth), "icnv", 0, 0 ],
-        icvo => pack('A4 n A4 A4 n*', "icv4", $ENV{'iconSize'}, "none", "botm", 0, 0, 0, 0, 0, 1, 0, 100, 1),
-        icvt => $ENV{'iconTextSize'}
-    ),
-    $ENTRIES
-);
diff --git a/packages/dmg-builder/templates/settings.py b/packages/dmg-builder/templates/settings.py
deleted file mode 100644
index 2b791f14a1b..00000000000
--- a/packages/dmg-builder/templates/settings.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import biplist
-import os.path
-
-application = <%= people.join(", "); %>
-appname = os.path.basename(application)
-
-def icon_from_app(app_path):
-    plist_path = os.path.join(app_path, 'Contents', 'Info.plist')
-    plist = biplist.readPlist(plist_path)
-    icon_name = plist['CFBundleIconFile']
-    icon_root,icon_ext = os.path.splitext(icon_name)
-    if not icon_ext:
-        icon_ext = '.icns'
-    icon_name = icon_root + icon_ext
-    return os.path.join(app_path, 'Contents', 'Resources', icon_name)
-
-# .. Basics ....................................................................
-
-# Volume format (see hdiutil create -help)
-format = defines.get('format')
-
-# Compression level (if relevant)
-compression_level = defines.get('compressionLevel', 9)
-
-# Volume size
-size = defines.get('size', None)
-
-# Files to include
-files = [ application ]
-
-# Symlinks to create
-symlinks = { 'Applications': '/Applications' }
-
-# Volume icon
-#
-# You can either define icon, in which case that icon file will be copied to the
-# image, *or* you can define badge_icon, in which case the icon file you specify
-# will be used to badge the system's Removable Disk icon
-#
-#icon = '/path/to/icon.icns'
-badge_icon = icon_from_app(application)
-
-# Where to put the icons
-icon_locations = {
-    appname:        (140, 120),
-    'Applications': (500, 120)
-    }
-
-# .. Window configuration ......................................................
-
-# Background
-#
-# This is a STRING containing any of the following:
-#
-#    #3344ff          - web-style RGB color
-#    #34f             - web-style RGB color, short form (#34f == #3344ff)
-#    rgb(1,0,0)       - RGB color, each value is between 0 and 1
-#    hsl(120,1,.5)    - HSL (hue saturation lightness) color
-#    hwb(300,0,0)     - HWB (hue whiteness blackness) color
-#    cmyk(0,1,0,0)    - CMYK color
-#    goldenrod        - X11/SVG named color
-#    builtin-arrow    - A simple built-in background with a blue arrow
-#    /foo/bar/baz.png - The path to an image file
-#
-# The hue component in hsl() and hwb() may include a unit; it defaults to
-# degrees ('deg'), but also supports radians ('rad') and gradians ('grad'
-# or 'gon').
-#
-# Other color components may be expressed either in the range 0 to 1, or
-# as percentages (e.g. 60% is equivalent to 0.6).
-background = 'builtin-arrow'
-
-show_status_bar = False
-show_tab_view = False
-show_toolbar = False
-show_pathbar = False
-show_sidebar = False
-sidebar_width = 180
-
-# Window position in ((x, y), (w, h)) format
-window_rect = ((100, 100), (640, 280))
-
-# Select the default view; must be one of
-#
-#    'icon-view'
-#    'list-view'
-#    'column-view'
-#    'coverflow'
-#
-default_view = 'icon-view'
-
-# General view configuration
-show_icon_preview = False
-
-# Set these to True to force inclusion of icon/list view settings (otherwise
-# we only include settings for the default view)
-include_icon_view_settings = 'auto'
-include_list_view_settings = 'auto'
-
-# .. Icon view configuration ...................................................
-
-arrange_by = None
-grid_offset = (0, 0)
-grid_spacing = 100
-scroll_position = (0, 0)
-label_pos = 'bottom' # or 'right'
-text_size = 16
-icon_size = 128
-
-# .. List view configuration ...................................................
-
-# Column names are as follows:
-#
-#   name
-#   date-modified
-#   date-created
-#   date-added
-#   date-last-opened
-#   size
-#   kind
-#   label
-#   version
-#   comments
-#
-list_icon_size = 16
-list_text_size = 12
-list_scroll_position = (0, 0)
-list_sort_by = 'name'
-list_use_relative_dates = True
-list_calculate_all_sizes = False,
-list_columns = ('name', 'date-modified', 'size', 'kind', 'date-added')
-list_column_widths = {
-    'name': 300,
-    'date-modified': 181,
-    'date-created': 181,
-    'date-added': 181,
-    'date-last-opened': 181,
-    'size': 97,
-    'kind': 115,
-    'label': 100,
-    'version': 75,
-    'comments': 300,
-    }
-list_column_sort_directions = {
-    'name': 'ascending',
-    'date-modified': 'descending',
-    'date-created': 'descending',
-    'date-added': 'descending',
-    'date-last-opened': 'descending',
-    'size': 'descending',
-    'kind': 'ascending',
-    'label': 'ascending',
-    'version': 'ascending',
-    'comments': 'ascending',
-    }
-
-# .. License configuration .....................................................
-
-# Text in the license configuration is stored in the resources, which means
-# it gets stored in a legacy Mac encoding according to the language.  dmgbuild
-# will *try* to convert Unicode strings to the appropriate encoding, *but*
-# you should be aware that Python doesn't support all of the necessary encodings;
-# in many cases you will need to encode the text yourself and use byte strings
-# instead here.
-
-# Recognized language names are:
-#
-#  af_ZA, ar, be_BY, bg_BG, bn, bo, br, ca_ES, cs_CZ, cy, da_DK, de_AT, de_CH,
-#  de_DE, dz_BT, el_CY, el_GR, en_AU, en_CA, en_GB, en_IE, en_SG, en_US, eo,
-#  es_419, es_ES, et_EE, fa_IR, fi_FI, fo_FO, fr_001, fr_BE, fr_CA, fr_CH,
-#  fr_FR, ga-Latg_IE, ga_IE, gd, grc, gu_IN, gv, he_IL, hi_IN, hr_HR, hu_HU,
-#  hy_AM, is_IS, it_CH, it_IT, iu_CA, ja_JP, ka_GE, kl, ko_KR, lt_LT, lv_LV,
-#  mk_MK, mr_IN, mt_MT, nb_NO, ne_NP, nl_BE, nl_NL, nn_NO, pa, pl_PL, pt_BR,
-#  pt_PT, ro_RO, ru_RU, se, sk_SK, sl_SI, sr_RS, sv_SE, th_TH, to_TO, tr_TR,
-#  uk_UA, ur_IN, ur_PK, uz_UZ, vi_VN, zh_CN, zh_TW
-
-# license = {
-#     'default-language': 'en_US',
-#     'licenses': {
-#         # For each language, the text of the license.  This can be plain text,
-#         # RTF (in which case it must start "{\rtf1"), or a path to a file
-#         # containing the license text.  If you're using RTF,
-#         # watch out for Python escaping (or read it from a file).
-#         'English': b'''{\\rtf1\\ansi\\ansicpg1252\\cocoartf1504\\cocoasubrtf820
-# {\\fonttbl\\f0\\fnil\\fcharset0 Helvetica-Bold;\\f1\\fnil\\fcharset0 Helvetica;}
-# {\\colortbl;\\red255\\green255\\blue255;\\red0\\green0\\blue0;}
-# {\\*\\expandedcolortbl;;\\cssrgb\\c0\\c0\\c0;}
-# \\paperw11905\\paperh16837\\margl1133\\margr1133\\margb1133\\margt1133
-# \\deftab720
-# \\pard\\pardeftab720\\sa160\\partightenfactor0
-
-# \\f0\\b\\fs60 \\cf2 \\expnd0\\expndtw0\\kerning0
-# \\up0 \\nosupersub \\ulnone \\outl0\\strokewidth0 \\strokec2 Test License\\
-# \\pard\\pardeftab720\\sa160\\partightenfactor0
-
-# \\fs36 \\cf2 \\strokec2 What is this?\\
-# \\pard\\pardeftab720\\sa160\\partightenfactor0
-
-# \\f1\\b0\\fs22 \\cf2 \\strokec2 This is the English license. It says what you are allowed to do with this software.\\
-# \\
-# }''',
-#     },
-#     'buttons': {
-#         # For each language, text for the buttons on the licensing window.
-#         #
-#         # Default buttons and text are built-in for the following languages:
-#         #
-#         #   English (en_US), German (de_DE), Spanish (es_ES), French (fr_FR),
-#         #   Italian (it_IT), Japanese (ja_JP), Dutch (nl_NL), Swedish (sv_SE),
-#         #   Brazilian Portuguese (pt_BR), Simplified Chinese (zh_CN),
-#         #   Traditional Chinese (zh_TW), Danish (da_DK), Finnish (fi_FI),
-#         #   Korean (ko_KR), Norwegian (nb_NO)
-#         #
-#         # You don't need to specify them for those languages; if you fail to
-#         # specify them for some other language, English will be used instead.
-
-#         'en_US': (
-#             b'English',
-#             b'Agree',
-#             b'Disagree',
-#             b'Print',
-#             b'Save',
-#             b'If you agree with the terms of this license, press "Agree" to '
-#             b'install the software.  If you do not agree, press "Disagree".'
-#         ),
-#     },
-# }
diff --git a/packages/dmg-builder/vendor/Mac/Finder/DSStore.pm b/packages/dmg-builder/vendor/Mac/Finder/DSStore.pm
deleted file mode 100644
index 66ae1ec5aec..00000000000
--- a/packages/dmg-builder/vendor/Mac/Finder/DSStore.pm
+++ /dev/null
@@ -1,733 +0,0 @@
-package Mac::Finder::DSStore;
-
-=head1 NAME
-
-Mac::Finder::DSStore - Read and write Macintosh Finder DS_Store files
-
-=head1 DESCRIPTION
-
-C<Mac::Finder::DSStore> provides a handful of functions for reading and
-writing the desktop database files created by the Macintosh Finder.
-
-=head1 FUNCTIONS
-
-Many functions take a C<$store> argument which is the opened file as
-an instance of L<Mac::Finder::DSStore::BuddyAllocator>, or a C<$block>
-argument which is a specific block of the file as an instance of
-L<Mac::Finder::DSStore::BuddyAllocator::Block>.
-
-=cut
-
-use strict;
-use warnings;
-use POSIX qw(ceil);
-use Carp qw(croak);
-use Fcntl;
-require Exporter;
-
-our($VERSION) = '1.00';
-our(@ISA) = qw(Exporter);
-our(@EXPORT_OK) = qw( getDSDBEntries putDSDBEntries writeDSDBEntries makeEntries );
-
-our($testpoint);
-
-=head2 @records = &Mac::Finder::DSStore::getDSDBEntries($store[, $callback])
-
-Retrieves the "superblock" pointed to by the C<DSDB> entry in the store's table
-of contents, and traverses the B-tree it points to, returning a list of
-the records in the tree. Alternately, you can supply a callback which will
-be invoked for each record, and C<getDSDBEntries> will return an empty list.
-
-=cut
-
-sub getBTreeRootblock {
-    my($store) = @_;
-    return $store->blockByNumber($store->{toc}->{DSDB})->read(20, 'N*');
-}
-
-sub getDSDBEntries {
-    my($file, $callback) = @_;
-
-    my(@retval);
-
-    $callback = sub { push(@retval, $_[0]); } unless defined $callback;
-
-    my($rootnode, $height, $nrec, $nnodes, $blksize) = &getBTreeRootblock($file);
-    
-    my($n) = &traverse_btree($file, $rootnode, $callback);
-
-    warn "Header node count ($nrec) not equal to actual node count ($n)"
-	if $n != $nrec;
-
-    @retval;
-}
-
-=head2 &Mac::Finder::DSStore::putDSDBEntries($store, $arrayref)
-
-C<$arrayref> must contain a correctly ordered list of
-C<Mac::Finder::DSStore::Entry> objects. They will be evenly
-organized into a B-tree structure and written to the C<$store>. If there is
-an existing tree of records in the file already, it will be deallocated.
-
-This function does not flush the allocator's information back to the file.
-
-=cut
-
-sub putDSDBEntries {
-    my($file, $recs) = @_;
-    
-    my($tocblock, $pagesize);
-    my($pagecount, $reccount, $height);
-
-    # Delete the old btree (but keep its superblock), or allocate a superblock.
-    if(defined($file->{toc}->{DSDB})) {
-	$tocblock = $file->{toc}->{DSDB};
-	my($old_rootblock);
-	($old_rootblock, $pagesize) = (&getBTreeRootblock($file))[0, 4];
-	&freeBTreeNode($file, $old_rootblock);
-    } else {
-	$tocblock = $file->allocate( 20 );
-	$file->{toc}->{DSDB} = $tocblock;
-	$pagesize = 0x1000;
-    }
-
-    $reccount = @$recs;
-    $pagecount = 0;
-    $height = 0;
-
-    my(@children);
-    
-    # Partition the records into btree nodes, from the bottom of
-    # the tree working towards the root.
-    do {
-	my(@sizes);
-
-	if (@children) {
-            # Interior node: child pointers interleaved with records
-	    @sizes = map { 4 + $_->byteSize } @$recs;
-	} else {
-            # Leaf node: just a bunch of records
-	    @sizes = map { $_->byteSize } @$recs;
-	}
-
-        # In addition to @sizes, each page contains a record
-        # count and a flag/childnode field (4 bytes each)
-	my(@interleaf) = &partition_sizes($pagesize - 8, @sizes);
-	my(@nchildren);
-
-	my($next) = 0;
-	foreach my $non (@interleaf, 1+$#$recs) {
-	    my($blknr) = $file->allocate($pagesize);
-	    push(@nchildren, $blknr);
-	    my($blk) = $file->blockByNumber($blknr, 1);
-	    if (@children) {
-		&writeBTreeNode($blk,
-				[ @$recs[ $next .. $non-1 ] ],
-				[ @children[ $next .. $non ] ] );
-	    } else {
-		&writeBTreeNode($blk,
-				[ @$recs[ $next .. $non-1 ] ]);
-	    }
-            $blk->close(1);
-	    $next = $non + 1;
-	    $pagecount ++;
-	}
-	
-	$height ++;
-	$recs = [ map { $recs->[$_] } @interleaf ];
-	@children = @nchildren;
-	die unless @children == 1+@$recs;
-    } while(@children > 1);
-    die unless 0 == @$recs;
-
-    my($masterblock) = $file->blockByNumber($tocblock, 1);
-    $masterblock->write('NNNNN',
-			$children[0],
-			$height - 1,
-			$reccount,
-			$pagecount,
-			$pagesize);
-    $masterblock->close;
-
-    1;
-}
-
-# Given a list of sizes, break them into groups so that
-# each group sums to no more than $max, not including the items
-# that separate them (returned in @ejecta).
-sub partition_sizes {
-    my($max, @sizes) = @_;
-    my($sum) = 0;
-    $sum += $_ foreach @sizes;
-
-    return () if $sum <= $max;
-
-    my(@ejecta);
-    my($bcount) = ceil($sum / $max);
-    my($target) = $sum / $bcount;
-
-    my($n) = 0;
-    for(;;) {
-	my($bsum) = 0;
-	while( $n < @sizes && $bsum < $target && ($bsum + $sizes[$n]) < $max ) {
-	    $bsum += $sizes[$n];
-	    $n ++;
-	}
-
-	last if $n >= @sizes;
-
-	push(@ejecta, $n);
-	$n++;
-    }
-
-    @ejecta;
-}
-
-sub traverse_btree {
-    my($store, $nodenr, $callback) = @_;
-    my($count);
-    my($values, $pointers) = &readBTreeNode( $store->blockByNumber( $nodenr ) );
-
-    if ($testpoint) {
-        my($o) = Mac::Finder::DSStore::BuddyAllocator::StringBlock->new();
-        {
-            # Temporarily disable the test point so writeBTreeNode doesn't
-            # recursively invoke it
-            local($testpoint) = undef;
-            &writeBTreeNode($o, $values, $pointers);
-        }
-        my($actual) = $store->blockByNumber( $nodenr )->copyback;
-        my($roundtrip) = $o->copyback;
-        $actual = substr($actual, 0, length($roundtrip));
-        $testpoint->( $actual, $roundtrip );
-    }
-
-    $count = @$values;
-    
-    if (defined $pointers) {
-	die "Value count should be one less than pointer count" 
-	    unless ( @$values + 1 ) == ( @$pointers ) ;
-	$count += &traverse_btree($store, shift(@$pointers), $callback);
-	while(@$values) {
-	    &{$callback}(shift @$values);
-	    $count += &traverse_btree($store, shift(@$pointers), $callback);
-	}
-    } else {
-	&{$callback}($_) foreach @$values;
-    }
-
-    $count;
-}
-
-sub freeBTreeNode {
-    my($allocator, $nodeid) = @_;
-    my($block) = $allocator->blockByNumber( $nodeid );
-    
-    if($block->read(4, 'N') != 0) {
-	$block->seek(0);
-	my(undef, $pointers) = &readBTreeNode($block);
-	&freeBTreeNode($allocator, $_) foreach @$pointers;
-    }
-
-    $allocator->free($nodeid);
-}
-
-sub readBTreeNode {
-    my($node) = @_;
-
-    my($pointer) = $node->read(4, 'N');
-
-    my($count) = $node->read(4, 'N');
-    if ($pointer > 0) {
-	my(@pointers, @values);
-	while($count) {
-	    push(@pointers, $node->read(4, 'N'));
-	    push(@values, Mac::Finder::DSStore::Entry->readEntry($node));
-	    $count --;
-	}
-	push(@pointers, $pointer);
-	return \@values, \@pointers;
-    } else {
-	my(@values);
-	while($count) {
-	    push(@values, Mac::Finder::DSStore::Entry->readEntry($node));
-	    $count --;
-	}
-	return \@values, undef;
-    }
-}
-
-sub writeBTreeNode {
-    my($into, $values, $pointers) = @_;
-
-    if (!$pointers) {
-	# A leaf node: no pointers, just database entries.
-	$into->write('NN', 0, scalar(@$values));
-	$_->write($into) foreach @$values;
-    } else {
-	# An internal node: interleaved pointers and values,
-	# with the final pointer moved to the front.
-	my(@vals) = @$values;
-	my(@ps) = @$pointers;
-	die "number of pointers must be one more than number of entries"
-	    unless 1+@vals == @ps;
-	$into->write('NN', pop(@ps), scalar(@vals));
-	while(@vals) {
-	    $into->write('N', shift(@ps));
-	    ( shift(@vals) )->write($into);
-	}
-    }
-
-    if($testpoint) {
-        my($x) = [ &readBTreeNode($into->copyback) ];
-        $testpoint->( [ $values, $pointers], $x );
-    }
-}
-
-=head2 &Mac::Finder::DSStore::writeDSDBEntries($file, @entries)
-
-A convenience function which sorts a list of entries and writes them
-to the specified file using C<putDSDBEntries>, then flushes the allocator's
-data structures to disk. 
-C<$file> may be a filename or an open file handle.
-The store object is returned, but you don't need to do anything else with it.
-
-=cut
-
-sub writeDSDBEntries {
-    my($store, $recs);
-    {
-        my($file, @entries) = @_;
-
-        require IO::File;
-        require Mac::Finder::DSStore::BuddyAllocator;
-        
-        unless(ref $file) {
-            my($filename) = $file;
-            $file = IO::File->new( $filename, Fcntl::O_RDWR | Fcntl::O_CREAT );
-            croak "$filename: $!, died" unless $file;
-        }
-
-        if((stat($file))[7] > 32) {
-            $store = Mac::Finder::DSStore::BuddyAllocator->open($file);
-        } else {
-            $store = Mac::Finder::DSStore::BuddyAllocator->new($file);
-        }
-
-        $recs = [ sort { $a->cmp($b) } @entries ];
-    }
-
-    putDSDBEntries($store, $recs);
-    $store->writeMetaData;
-
-    $store;
-}
-
-=head2 &Mac::Finder::DSStore::makeEntries($filename, [ what => value ... ])
-
-C<makeEntries> encapsulates some information about the format of individual
-records in the DS_Store file. It returns a list of records constructed with the
-given filename and with the information specified in the rest of its args.
-Most args come in pairs, a name and a value, so C<makeEntries> kind of looks
-like it takes a hash. Some names take no value and some could take several.
-Some produce more than one record as a result.
-
-See the output of the F<examples/dsstore_dump.pl> script for an example of how
-to use this, and check the source code for a list of the formats it accepts.
-
-This function might change in the future.
-
-=cut
-
-sub makeEntries {
-    my($filename, @info) = @_;
-    my(@results);
-    
-    while(@info) {
-        my($recordType) = shift @info;
-        
-        if ($recordType =~ /^....$/) {
-            my($record) = Mac::Finder::DSStore::Entry->new($filename, $recordType);
-            $record->value( shift @info );
-            push(@results, $record);
-        } elsif ($recordType =~ /^(....)_hex$/) {
-            my($record) = Mac::Finder::DSStore::Entry->new($filename, $1);
-            $record->value( pack('H*', shift @info) );
-            push(@results, $record);            
-        } else {
-            my($mkr) = $Mac::Finder::DSStore::Entry::{'make_'.$recordType};
-            croak "Don't know how to handle '$recordType'" unless $mkr;
-            push(@results, &{$mkr}($filename, $recordType, \@info));
-        }
-    }
-    
-    @results;    
-}
-
-package Mac::Finder::DSStore::Entry;
-
-=head1 Mac::Finder::DSStore::Entry
-
-This class holds the individual records from the database. Each record
-contains a filename (in some cases, "." to refer to the containing
-directory), a 4-character record type, and a value. The value is
-one of a few concrete types, according to the record type.
-
-=cut
-
-use strict;
-use warnings;
-use Encode ();
-use Carp qw(croak);
-
-#
-# Concrete types of known ids
-#
-our(%types) = (
-               'BKGD' => 'blob',
-               'bwsp' => 'blob',
-               'cmmt' => 'ustr',
-               'dilc' => 'blob',
-               'dscl' => 'bool',
-               'extn' => 'ustr',
-               'fwi0' => 'blob',
-               'fwsw' => 'long',
-               'fwvh' => 'shor',
-               'GRP0' => 'ustr',
-               'icgo' => 'blob',
-               'icsp' => 'blob',
-               'icvo' => 'blob',
-               'ICVO' => 'bool',
-               'icvp' => 'blob',
-               'icvt' => 'shor',
-               'Iloc' => 'blob',
-               'info' => 'blob',
-               'lg1S' => 'comp',
-               'logS' => 'comp',
-               'lssp' => 'blob',
-               'lsvo' => 'blob',
-               'LSVO' => 'bool',
-               'lsvP' => 'blob',
-               'lsvp' => 'blob',
-               'lsvt' => 'shor',
-               'moDD' => 'dutc',
-               'modD' => 'dutc',
-               'ph1S' => 'comp',
-               'phyS' => 'comp',
-               'pict' => 'blob',
-               'vSrn' => 'long',
-               'vstl' => 'type',
-               );
-
-=head2 $entry = ...::Entry->new($filename, $typecode)
-
-Creates a new entry with no value. The concrete type is inferred from the
-record type code.
-
-=head2 $entry->filename
-
-Gets the filename of an entry.
-
-=head2 $entry->strucId
-
-Gets the record type of this entry, as a four-character string, indicating
-what aspect of the file the entry describes.
-
-=head2 $entry->value([$value])
-
-Gets or sets the value of an entry.
-
-If the concrete type is C<blob> or C<type>, the value is interpreted as a byte string; 
-if it is C<ustr>, as a character string.
-If the concrete type is C<long>, C<shor>, C<comp>, C<dutc>, or C<bool>,
-then the value should be an integer.
-
-=cut
-
-sub new {
-    my($class, $filename, $strucId, @opts) = @_;
-    
-    croak "no opts supported yet, died" if @opts;
-
-    bless([ $filename, $strucId, $types{$strucId}, undef ],
-          ref $class || $class);
-}
-
-sub filename {
-    $_[0]->[0];
-}
-
-sub strucId {
-    $_[0]->[1];
-}
-
-sub value {
-    my($self, $value) = @_;
- 
-    return $self->[3] unless defined $value;
-   
-    croak "Can't set a value on an entry with no concrete type"
-        unless defined($self->[2]);
-    
-    my($t) = $self->[2];
-    if($t eq 'blob' or $t eq 'ustr') {
-        $self->[3] = '' . $value;
-    } elsif ($t eq 'bool' or $t eq 'shor' or $t eq 'long') {
-        $self->[3] = 0 + $value;
-    } elsif ($t eq 'type') {
-        $value = '' . $value;
-        croak "'type' values must be exactly four bytes long"
-            unless length($value) == 4;
-        $self->[3] = $value;
-    } else {
-        die "Unknown concrete type $t, died";
-    }
-
-    $self->[3];
-}
-
-sub readEntry {
-    my($class, $block) = @_;
-
-    my($filename, $strucId, $strucType, $value);
-
-    $filename = &readFilename($block);
-    $strucId = $block->read(4);
-    $strucType = $block->read(4);
-    
-    if ($strucType eq 'bool') {
-	$value = $block->read(1, 'C');
-    } elsif ($strucType eq 'long' or $strucType eq 'shor') {
-	$value = $block->read(4, 'N');
-    } elsif ($strucType eq 'blob') {
-	my($bloblen) = $block->read(4, 'N');
-	$value = $block->read($bloblen);
-    } elsif ($strucType eq 'ustr') {
-	my($strlen) = $block->read(4, 'N');
-	$value = Encode::decode('UTF-16BE', $block->read(2 * $strlen));
-    } elsif ($strucType eq 'type') {
-        $value = $block->read(4);
-    } elsif ($strucType eq 'comp' || $strucType eq 'dutc') {
-        $value = $block->read(8, 'Q>');
-    } else {
-	die "Unknown struc type '$strucType', died";
-    }
-
-    return bless([ $filename, $strucId, $strucType, $value ],
-		 ref($class) || $class);
-}
-
-sub readFilename {
-    my($block) = @_;
-
-    my($flen) = $block->read(4, 'N');
-    my($utf16be) = $block->read(2 * $flen);
-    
-    return Encode::decode('UTF-16BE', $utf16be, Encode::FB_CROAK);
-}
-
-sub byteSize {
-    my($filename, $strucId, $strucType, $value) = @{$_[0]};
-    my($size);
-
-    # TODO: We're assuming that the filename is completely normal
-    # basic-multilingual-plane characters, and doesn't need to be de/re-
-    # composed or anything.
-    $size = length($filename) * 2 + 12;
-    # 12 bytes: 4 each for filename length, struct id, and struct type
-
-    if ($strucType eq 'long' or $strucType eq 'shor' or $strucType eq 'type') {
-	$size += 4;
-    } elsif ($strucType eq 'bool') {
-	$size += 1;
-    } elsif ($strucType eq 'blob') {
-	$size += 4 + length($value);
-    } elsif ($strucType eq 'ustr') {
-	$size += 4 + 2 * length($value);
-    } elsif ($strucType eq 'comp' or $strucType eq 'dutc') {
-        $size += 8;
-    } else {
-	die "Unknown struc type '$strucType', died";
-    }
-
-    $size;
-}
-
-sub write {
-    my($self, $into) = @_;
-    
-    my($fname) = Encode::encode('UTF-16BE', $self->[0]);
-
-    my($strucType) = $self->[2];
-
-    $into->write('N a* a4 a4', length($fname)/2, $fname,
-		 $self->[1], $strucType);
-
-    if ($strucType eq 'long' or $strucType eq 'shor') {
-	$into->write('N', $self->[3]);
-    } elsif ($strucType eq 'bool') {
-	$into->write('C', $self->[3]);
-    } elsif ($strucType eq 'blob') {
-	$into->write('N', length($self->[3]));
-	$into->write($self->[3]);
-    } elsif ($strucType eq 'ustr') {
-	$into->write('N', length($self->[3]));
-	$into->write(Encode::encode('UTF-16BE', $self->[3]));
-    } elsif ($strucType eq 'type') {
-        $into->write('a4', $self->[3]);
-    } elsif ($strucType eq 'comp' or $strucType eq 'dutc') {
-        $into->write('Q>', $self->[3]);
-    } else {
-	die "Unknown struc type '$strucType', died";
-    }
-}
-
-=head2 $entry->cmp($other)
-
-Returns -1, 0, or 1 depending on the relative ordering of the two entries,
-according to (a guess at) the record ordering used by the store's B-tree.
-
-=cut
-
-sub cmp {
-    my($self, $other) = @_;
-
-    #
-    # There's probably some wacky Mac-specific Unicode collation
-    # rule for these, but case-insensitive comparison is a good
-    # approximation
-    #
-
-    # Ordering in the btree is Finder-filename-ordering on the files,
-    # and simple bytewise ordering on the structure IDs.
-
-    ( lc($self->[0]) cmp lc($other->[0]) ) 
-        ||
-    ( $self->[1] cmp $other->[1] );
-}
-
-#
-#  The make_foo subs are used by Mac::Finder::DSStore::makeEntries.
-#
-
-sub make_BKGD_default {
-    my($filename, undef, undef) = @_;
-
-    my($rec) = Mac::Finder::DSStore::Entry->new($filename, 'BKGD');
-    $rec->value( pack('A4 x8', 'DefB') );
-    $rec;
-}
-
-sub make_BKGD_color {
-    my($filename, $strucId, $argv) = @_;
-    my($color) = shift @$argv;
-    my($rgb);
-
-    if ($color =~ /^\#([0-9a-f]+)$/i) {
-        if(length($1) == 3) {
-            ( $rgb = $1 ) =~ s/(.)(.)(.)/$1$1$1$1$2$2$2$2$3$3$3$3/;
-        } elsif (length($1) == 6) {
-            ( $rgb = $1 ) =~ s/(..)(..)(..)/$1$1$2$2$3$3/;
-        } elsif (length($1) == 12) {
-            $rgb = $1;
-        }
-    }
-
-    croak "Can't parse color string '$color'"
-        unless $rgb;
-
-    my($rec) = Mac::Finder::DSStore::Entry->new($filename, 'BKGD');
-    $rec->value( pack('A4 H12 x2', 'ClrB', $rgb) );
-
-    $rec;
-}
-
-sub make_BKGD_alias {
-    my($filename, $strucId, $argv) = @_;
-
-    my($image) = shift @$argv;
-
-    if(!ref $image) {
-        require Mac::Memory;
-        require Mac::Files;
-        $image = Mac::Files::NewAlias($image);
-    }
-
-    my($isize) = $image->size;
-    my($bkgd, $pict);
-
-    $bkgd = Mac::Finder::DSStore::Entry->new($filename, 'BKGD');
-    $bkgd->value( pack('A4 N nn', 'PctB', $isize, 0, 0) );
-
-    $pict = Mac::Finder::DSStore::Entry->new($filename, 'pict');
-    $pict->value( $image->get );
-
-    ( $bkgd, $pict );
-}
-
-sub _make_packed {
-    my($filename, $strucId, $fmt, @values) = @_;
-    my($record) = Mac::Finder::DSStore::Entry->new($filename, $strucId);
-    $record->value( pack($fmt, @values) );
-    $record;
-}
-
-sub _make_packed_arrayref {
-    my($filename, $strucId, $argv, $format, $reqcount, $dflt) = @_;
-    my($values) = shift @$argv;
-
-    croak "$strucId argument must be an array ref"
-        unless ref $values;
-
-    croak "$strucId argument must have at least $reqcount items"
-        unless $reqcount <= @$values;
-
-    my($max) = $reqcount + @$dflt;
-
-    croak "$strucId argument can't have more than $max items"
-        if $max < @$values;
-
-    my(@fields) = @$values;
-    if ($max > @fields) {
-        push(@fields, @{$dflt}[ ( @fields - $max ) .. -1 ]);
-    }
-
-    return &_make_packed($filename, substr($strucId, 0, 4),
-                         $format, @fields);
-}
-
-sub make_Iloc_xy {
-    my($filename, $strucId, $argv) = @_;
-    return &_make_packed_arrayref($filename, $strucId, $argv,
-                                  'NN nnnn', 2, [65535, 65535, 65535, 0]);
-}
-
-sub make_fwi0_flds {
-    my($filename, $strucId, $argv) = @_;
-    my($flds) = shift @$argv;
-    
-    croak "$strucId argument must have 7 values"
-        unless 7 == @$flds;
-
-    return &_make_packed($filename, 'fwi0', 'n4 A4 n*', @$flds);
-}
-    
-
-=head1 SEE ALSO
-
-See L<Mac::Finder::DSStore::Format> for more detailed information on
-the record types found in a DS_Store file.
-
-See L<Mac::Finder::DSStore::BuddyAllocator> for the low-level organization
-of the DS_Store file.
-
-=head1 AUTHOR
-
-Copyright 2008 by Wim Lewis E<lt>wiml@hhhh.orgE<gt>.
-
-Some information is from Mark Mentovai via the Mozilla project.
-Thanks also to Martin Baker for bug reports.
-
-=cut
-
-1;
diff --git a/packages/dmg-builder/vendor/Mac/Finder/DSStore/BuddyAllocator.pm b/packages/dmg-builder/vendor/Mac/Finder/DSStore/BuddyAllocator.pm
deleted file mode 100644
index 76647184d7b..00000000000
--- a/packages/dmg-builder/vendor/Mac/Finder/DSStore/BuddyAllocator.pm
+++ /dev/null
@@ -1,783 +0,0 @@
-package Mac::Finder::DSStore::BuddyAllocator;
-
-=head1 NAME
-
-Mac::Finder::DSStore::BuddyAllocator - Allocate space within a file
-
-=head1 DESCRIPTION
-
-C<Mac::Finder::DSStore::BuddyAllocator>
-implements a buddy-allocation scheme within a file. It's used by
-C<Mac::Finder::DSStore> to read certain files created by the Macintosh
-Finder.
-
-The allocation methods do not perform any actual file I/O.
-The contents of allocated blocks are read and written by the caller using
-methods on C<BuddyAllocator::Block>.
-If the C<allocate> and C<free> methods are used,
-or if the C<toc> hash is modified,
-C<writeMetaData> must be called for the changes to be reflected in the file.
-
-=head1 METHODS
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-
-our($VERSION) = '1.00';
-
-# Debug logging. Uncomment these and all uses of them to activate.
-# It might be nice to make this more easily switchable.
-#our($loglevel) = 0;
-#sub logf {
-#    print STDERR ( ' ' x $loglevel ) . sprintf($_[0], @_[1 .. $#_ ]) . "\n";
-#}
-
-=head2 $allocator = Mac::Finder::DSStore::BuddyAllocator->open($fh)
-
-C<open($fh)> constructs a new buddy allocator 
-and initializes its state from the information in the file.
-The file handle is retained by the allocator for future
-operations.
-
-=cut
-
-sub open {
-    my($class, $fh) = @_;
-
-    binmode($fh);
-
-    # read the file header: 32 bytes, plus a mysterious extra
-    # four bytes at the front
-    my($fheader);
-    $fh->read($fheader, 4 + 0x20) == 0x24
-	or die "Can't read file header: $!";
-    my($magic1, $magic, $offset, $size, $offset2, $unk2) = unpack('N a4 NNN a16', $fheader);
-    die 'bad magic' unless $magic eq 'Bud1' and $magic1 == 1;
-    die 'inconsistency: two root addresses are different'
-	unless $offset == $offset2;
-
-    my($self) = {
-	fh => $fh,
-	unk2 => $unk2,
-	fudge => 4,  # add this to offsets for some unknown reason
-    };
-    bless($self, ref($class) || $class);
-    
-    # retrieve the root/index block which contains the allocator's
-    # book-keeping data
-    my ($rootblock) = $self->getBlock($offset, $size);
-
-    # parse out the offsets of all the allocated blocks
-    # these are in tagged offset format (27 bits offset, 5 bits size)
-    my($offsetcount, $unk3) = $rootblock->read(8, 'NN');
-    # not sure what the word following the offset count is
-    $self->{'unk3'} = $unk3;
-    # For some reason, offsets are always stored in blocks of 256.
-    my(@offsets);
-    while($offsetcount > 0) {
-	push(@offsets, $rootblock->read(1024, 'N256'));
-	$offsetcount -= 256;
-    }
-    # 0 indicates an empty slot; don't need to keep those around
-    while($offsets[$#offsets] == 0) { pop(@offsets); }
-    grep { $_ = undef if $_ == 0 } @offsets;
-
-    # Next, read N key/value pairs
-    my($toccount) = $rootblock->read(4, 'N');
-    my($toc) = {
-    };
-    while($toccount--) {
-	my($len) = $rootblock->read(1, 'C');
-	my($name) = $rootblock->read($len);
-	my($value) = $rootblock->read(4, 'N');
-	$toc->{$name} = $value;
-    }
-
-    $self->{'offsets'} = \@offsets;
-    $self->{'toc'} = $toc;
-
-    # Finally, read the free lists.
-    my($freelists) = { };
-    for(my $width = 0; $width < 32; $width ++) {
-	my($blkcount) = $rootblock->read(4, 'N');
-	$freelists->{$width} = [ $rootblock->read(4 * $blkcount, 'N*') ];
-    }
-    $self->{'freelist'} = $freelists;
-
-    return $self;
-}
-
-=head2 $allocator = Mac::Finder::DSStore::BuddyAllocator->new($fh)
-
-Similar to C<open>, but does not read anything from the file. This
-can be used to create a new file from scratch.
-
-=cut
-
-sub new {
-    my($cls, $fh) = @_;
-
-    binmode($fh) if defined($fh);
-
-    my($self) = {
-	fh => $fh,
-	toc => { },
-	offsets => [ ],
-	freelist => { },
-
-	# And the mystery meat goes here...
-	unk2 => pack('NNNN', 0x100C, 0x0087, 0x200B, 0 ),
-	unk3 => 0,
-	fudge => 4
-    };
-    bless($self, ref $cls || $cls);
-
-    # All our freelists are empty...
-    foreach my $width (0 .. 30) {
-	$self->{freelist}->{$width} = [ ];
-    }
-    # ... except for a single 2GB block starting at 0
-    $self->{freelist}->{31} = [ 0 ];
-
-    # Allocate the header block, 2^5 bytes wide
-    my($hdr) = $self->_alloc(5);
-    # it had better be at offset zero
-    ( $hdr == 0 ) or die;
-
-    $self;
-}
-
-=head2 $allocator->close( )
-
-Closes the underlying file handle.
-
-=cut
-
-sub close {
-    my($self) = @_;
-    my($fh) = $self->{fh};
-
-    delete $self->{fh};
-
-    $fh->close;
-}
-
-=head2 $allocator->listBlocks($verbose)
-
-List all the blocks in order and see if there are any gaps or overlaps.
-If C<$verbose> is true, then the blocks are listed to the current
-output filehandle. Returns true if the allocated and free blocks
-have no gaps or overlaps.
-
-=cut
-
-sub listBlocks {
-    my($self, $verbose) = @_;
-    my(%byaddr);
-    my($addr, $len);
-
-    # We store all blocks (allocated and free) in %byaddr,
-    # then go through its keys in order
-
-    # Store the implicit 32-byte block that holds the file header
-    push(@{$byaddr{0}}, "5 (file header)");
-
-    # Store all the numbered/allocated blocks from @offsets
-    for my $blnum (0 .. $#{$self->{'offsets'}}) {
-	my($addr_size) = $self->{'offsets'}->[$blnum];
-	next unless defined $addr_size;
-	$addr = $addr_size & ~0x1F;
-	$len = $addr_size & 0x1F;
-	push(@{$byaddr{$addr}}, "$len (blkid $blnum)");
-    }
-
-    # Store all the blocks in the freelist(s)
-    for $len (keys %{$self->{'freelist'}}) {
-	for $addr (@{$self->{'freelist'}->{$len}}) {
-	    push(@{$byaddr{$addr}}, "$len (free)");
-	}
-    }
-
-    my($gaps, $overlaps) = (0, 0);
-
-    # Loop through the blocks in order of address
-    my(@addrs) = sort {$a <=> $b} keys %byaddr;
-    $addr = 0;
-    while(@addrs) {
-	my($next) = shift @addrs;
-	if ($next > $addr) {
-	    print "... ", ($next - $addr), " bytes unaccounted for\n"
-		if $verbose;
-	    $gaps ++;
-	}
-	my(@uses) = @{$byaddr{$next}};
-	printf "%08x %s\n", $next, join(', ', @uses)
-	    if $verbose;
-	$overlaps ++ if @uses > 1;
-
-	# strip off the length (log_2(length) really) from the info str
-	($len = $uses[0]) =~ s/ .*//;
-	$addr = $next + ( 1 << (0 + $len) );
-    }
-
-    ( $gaps == 0 && $overlaps == 0 );
-}
-
-=head2 $allocator->writeMetaData( )
-
-Writes the allocator's metadata (header block and root block)
-back to the file.
-
-=cut
-
-sub writeMetaData {
-    my($self) = @_;
-
-    # Root block nr is hardcoded to 0.
-    # We don't actually care, but the DSStore btree does.
-    my($blocknr) = 0;
-
-    # Before computing the size of the rootblock to allocate it,
-    # make sure it'll be large enough to hold its own (eventual)
-    # allocation information.
-    $self->{offsets}->[0] = undef unless exists $self->{offsets}->[0];
-
-    my($rbs) = $self->rootBlockSize();
-    $self->allocate($rbs, $blocknr);
-    
-    $self->writeRootblock($self->blockByNumber($blocknr, 1));
-
-    my($blockOffset, $blockLength) = $self->blockOffset($blocknr);
-
-    $self->{fh}->seek(0, 0);
-    $self->{fh}->write(pack('N', 1)); # magic1
-    $self->_sought(0)->write(pack('a4 NNN a16',
-				  'Bud1', # magic
-				  $blockOffset, $blockLength, $blockOffset,
-				  $self->{unk2}));
-
-    $self->{fh}->flush;
-}
-
-sub rootBlockSize {
-    my($self) = @_;
-    my($size);
-
-    $size = 8;  # The offset count and the unknown field that follows it
-    
-    # The offset blocks, rounded up to a multiple of 256 entries
-    my($offsetcount) = scalar( @{$self->{'offsets'}} );
-    my($tail) = $offsetcount % 256;
-    $offsetcount += 256 - $tail if ($tail);
-    $size += 4 * $offsetcount;
-
-    # The table of contents
-    $size += 4; # count
-    $size += (5 + length($_)) foreach keys %{$self->{'toc'}};
-
-    # The freelists
-    foreach my $width (0 .. 31) {
-	$size += 4 + 4 * scalar( @{$self->{'freelist'}->{$width}} );
-    }
-
-    $size;
-}
-
-sub writeRootblock {
-    my($self, $into) = @_;
-
-    my(@offsets) = @{$self->{'offsets'}};
-    
-    # Write the offset count & the unknown field that follows it
-    $into->write('NN', scalar(@offsets), $self->{'unk3'});
-    
-    # Write the offsets (using 0 to indicate an unused slot)
-    $into->write('N*', map { (defined($_) && $_ > 0)? $_ : 0 } @offsets);
-    
-    # The offsets are always written in blocks of 256.
-    my($offsetcount) = scalar(@offsets) % 256;
-    if ($offsetcount > 0) {
-	# Fill out the last block
-	$into->write('N*', (0) x (256-$offsetcount));
-    }
-
-    # The DS_Store files only ever have one item in their
-    # table of contents, so I'm not sure if it needs to be sorted or what
-    my(@tockeys) = sort keys %{$self->{'toc'}};
-    $into->write('N', scalar(@tockeys));
-    foreach my $entry (@tockeys) {
-	$into->write('C a* N', length($entry), $entry, $self->{'toc'}->{$entry});
-    }
-    
-    # And finally the freelists
-    for my $width ( 0 .. 31 ) {
-	my($blks) = $self->{'freelist'}->{$width};
-	$into->write('N N*', scalar(@$blks), @$blks);
-    }
-}
-
-=head2 $block = $allocator->blockByNumber(blocknumber[, write])
-
-Retrieves a block by its block number (I<aka> block ID).
-
-If C<write> is supplied and is true, then the returned block implements the
-C<write> method but not the C<read> method.
-
-=head2 $block = $allocator->getBlock(offset, size)
-
-Retrieves a block (a BuddyAllocator::Block instance) by offset & length.
-Normally you should use C<blockByNumber> instead of this method.
-
-=cut
-
-sub getBlock {
-    my($self, $offset, $size) = @_;
-
-    return Mac::Finder::DSStore::BuddyAllocator::Block->new($self, $offset, $size);
-}
-
-# Retrieve a block by its block number (small integer)
-sub blockByNumber {
-    my($self, $id, $write) = @_;
-    my($addr) = $self->{offsets}->[$id];
-    return undef unless $addr;
-    my($offset, $len);
-    $offset = $addr & ~0x1F;
-    $len = 1 << ( $addr & 0x1F );
-#    print "  node id $id is $len bytes at 0x".sprintf('%x', $offset)."\n";
-    if (!defined($write) || !$write) {
-	return Mac::Finder::DSStore::BuddyAllocator::Block->new($self, $offset, $len);
-    } else {
-	return Mac::Finder::DSStore::BuddyAllocator::WriteBlock->new($self, $offset, $len);
-    }
-}
-
-=head2 ( $offset, $size ) = $allocator->blockOffset(blockid)
-
-Retrieves the file offset and size in bytes of a given block.
-The offset doesn't include the 4-byte fudge.
-In scalar context, just returns the offset.
-
-=cut
-
-sub blockOffset {
-    my($self, $id) = @_;
-    my($addr) = $self->{offsets}->[$id];
-    croak "Block $id is not allocated" unless $addr;
-    my($offset) = $addr & ~0x1F;
-    return $offset unless wantarray;
-    return ( $offset,  1 << ( $addr & 0x1F ) );
-}
-
-# Return freelist + index of a block's buddy in its freelist (or empty list)
-sub _buddy {
-    my($self, $offset, $width) = @_;
-    my($freelist, $buddyaddr);
-
-    $freelist = $self->{'freelist'}->{$width};
-    $buddyaddr = $offset ^ ( 1 << $width );
-
-    return ($freelist,
-	    grep { $freelist->[$_] == $buddyaddr } 0 .. $#$freelist );
-}
-
-# Free a block, coalescing ith buddies as needed.
-sub _free {
-    my($self, $offset, $width) = @_;
-
-    my($freelist, $buddyindex) = $self->_buddy($offset, $width);
-
-    if(defined($buddyindex)) {
-	# our buddy is free. Coalesce, and add the coalesced block to flist.
-	my($buddyoffset) = splice(@$freelist, $buddyindex, 1);
-	#&logf("Combining %x with buddy %x", $offset, $buddyoffset);
-	$self->_free($offset & $buddyoffset, $width+1);
-    } else {
-	#&logf("Adding block %x to freelist %d", $offset, $width);
-	@$freelist = sort( @$freelist, $offset );
-    }
-}
-
-# Allocate a block of a specified width, splitting as needed.
-sub _alloc {
-    my($self, $width) = @_;
-    
-    #&logf("Allocating a block of width %d", $width);
-    #$loglevel ++;
-
-    my($flist) = $self->{'freelist'}->{$width};
-    if (@$flist) {
-	# There is a block of the desired size; return it.
-	#&logf("Pulling %x from freelist", $flist->[0]); $loglevel --;
-	return shift @$flist;
-    } else {
-	# Allocate a block of the next larger size; split it.
-	my($offset) = $self->_alloc($width + 1);
-	# and put the other half on the free list.
-	my($buddy) = $offset ^ ( 1 << $width );
-	#&logf("Splitting %x into %x and %x", $offset, $offset, $buddy);
-	#$loglevel ++;
-	$self->_free($buddy, $width);
-	#$loglevel -= 2;
-	return $offset;
-    }
-}
-
-=head2 $blocknumber = $allocator->allocate($size, [$blocknumber])
-
-Allocates or re-allocates a block to be at least C<$size> bytes long.
-If C<$blocknumber> is given, the specified block will be grown or
-shrunk if needed, otherwise a new block number will be chosen and
-given to the allocated block.
-
-Unlike the libc C<realloc> function, this may move a block even if the
-block is not grown.
-
-=head2 $allocator->free($blocknumer)
-
-Releases the block number and the block associated with it back to the
-block pool.
-
-=cut
-
-sub allocate {
-    my($self, $bytes, $blocknum) = @_;
-    my($offsets) = $self->{'offsets'};
-
-    #if(defined($blocknum)) {
-    #    &logf("(Re)allocating %d bytes for blkid %d", $bytes, $blocknum);
-    #}
-
-    if(!defined($blocknum)) {
-	$blocknum = 1;
-	# search for an empty slot, or extend the array
-	$blocknum++ while defined($offsets->[$blocknum]);
-	#&logf("Allocating %d bytes, assigning blkid %d", $bytes, $blocknum);
-    }
-
-    #$loglevel ++;
-
-    my($wantwidth) = 5;
-    # Minimum width, since that's how many low-order bits we steal for the tag
-    $wantwidth ++ while $bytes > 1 << $wantwidth;
-
-    my($blkaddr, $blkwidth, $blkoffset);
-
-    if(exists($offsets->[$blocknum]) && $offsets->[$blocknum]) {
-	$blkaddr = $offsets->[$blocknum];
-	$blkwidth = $blkaddr & 0x1F;
-	$blkoffset = $blkaddr & ~0x1F;
-	if ($blkwidth == $wantwidth) {
-	    #&logf("Block is already width %d, no change", $wantwidth);
-	    #$loglevel --;
-	    # The block is currently of the desired size. Leave it alone.
-	    return $blocknum;
-	} else {
-	    #&logf("Freeing wrong-sized block");
-	    #$loglevel ++;
-	    # Free the current block, allocate a new one.
-	    $self->_free($blkoffset, $blkwidth);
-	    delete $offsets->[$blocknum];
-	    #$loglevel --;
-	}
-    }
-
-    # Allocate a block, update the offsets table, and return the new offset
-    $blkoffset = $self->_alloc($wantwidth);
-    $blkaddr = $blkoffset | $wantwidth;
-    $offsets->[$blocknum] = $blkaddr;
-    #$loglevel --;
-    $blocknum;
-}
-
-sub free {
-    my($self, $blknum) = @_;
-    my($blkaddr) = $self->{'offsets'}->[$blknum];
-
-    #&logf("Freeing block index %d", $blknum);
-    #$loglevel ++;
-
-    if($blkaddr) {
-	my($blkoffset, $blkwidth);
-	$blkwidth = $blkaddr & 0x1F;
-	$blkoffset = $blkaddr & ~0x1F;
-	$self->_free($blkoffset, $blkwidth);
-    }
-
-    delete $self->{'offsets'}->[$blknum];
-    #$loglevel --;
-    undef;
-}
-
-=head1 ATTRIBUTES
-
-=head2 $allocator->{toc}
-
-C<toc> holds a hashref whose keys are short strings and whose values
-are integers. This table of contents is read and written as part of the
-allocator's metadata but is not otherwise used by the allocator;
-users of the allocator use it to find their data within the file.
-
-=head2 $allocator->{fh}
-
-The file handle passed in to C<open> or C<new>. If you find yourself needing
-to use this, you should probably try to extend the class so that you don't.
-
-=cut
-
-# Used by ...::Block to get a positioned file handle.
-sub _sought {
-    my($self, $offset) = @_;
-
-    my($fh) = $self->{fh};
-    $fh->seek($offset + $self->{fudge}, 0)
-	or croak;
-    $fh;
-}
-
-package Mac::Finder::DSStore::BuddyAllocator::Block;
-
-=head1 BuddyAllocator::Block
-
-C<BuddyAllocator::Block> instances are returned by the
-C<blockByNumber> and C<getBlock> methods. They hold a pointer into
-the file and provide a handful of useful methods.
-
-(There are also two other classes, C<WriteBlock> and C<StringBlock>,
-which might be returned instead. Think of this as an interface rather
-than as a concrete class.)
-
-=head2 $block->read(length, [format])
-
-Reads C<length> bytes from the block (advancing the read pointer
-correspondingly). If C<format> is specified, the bytes read are
-unpacked using the format; otherwise a byte string is returned. 
-
-=head2 $block->length( )
-
-Returns the length (or size) of this block.
-
-=head2 $block->seek(position[, whence])
-
-Adjusts the read/write pointer within the block.
-
-=head2 $block->write(bytes)
-
-=head2 $block->write(format, items...)
-
-Writes data to the underlying file, at the position represented by this
-block. If multiple arguments are given, the first is a format string
-and the rest are the remaining arguments to C<pack>.
-
-=head2 $block->close([ zerofill ])
-
-This is generally a no-op, but if called on a writable block with
-C<zerofill = true>, then zeroes will be written from the current
-location to the end of the allocated block.
-
-=head2 $block->copyback( )
-
-Returns the block's contents as a string. For write blocks, this
-reads from the file. This is just here for debugging purposes and
-might change.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-
-#
-# Block objects are created by the buddy allocator; they're a
-# reference to an array with the following components:
-#
-#  [ $allocator, $value, $position]
-#
-
-sub new {
-    my($class, $allocator, $offset, $size) = @_;
-
-    my($value);
-    $allocator->_sought($offset)->read($value, $size)
-	> 0 or die;
-    # Previously, this died if we couldn't read the full block.
-    # Not sure if it's really an error not to read the full
-    # block if the next layer up doesn't need the full block.
-    # So now we're succeeding as long as we get something; if
-    # the reader overruns it'll die in substr().
-
-    bless([ $allocator, $value, 0 ], ref $class || $class);
-}
-
-sub read {
-    my($self, $len, $unpack) = @_;
-
-    my($pos) = $self->[2];
-    die "out of range: pos=$pos len=$len max=".(length($self->[1])) if $pos + $len > length($self->[1]);
-    my($bytes) = substr($self->[1], $pos, $len);
-    $self->[2] = $pos + $len;
-    
-    $unpack? unpack($unpack, $bytes) : $bytes;
-}
-
-sub length {
-    return CORE::length($_[0]->[1]);
-}
-
-sub close {
-    1;
-}
-
-sub seek {
-    my($self, $pos, $whence) = @_;
-    $whence = 0 unless defined $whence;
-    if ($whence == 0) {
-	# pos = pos
-    } elsif ($whence == 1) {
-	$pos += $self->[2];
-    } elsif ($whence == 2) {
-	$pos += $self->length();
-    } else {
-	croak "seek: whence=$whence";
-    }
-    $self->[2] = $pos;
-}
-
-sub copyback {
-    return $_[0]->[1];
-}
-
-package Mac::Finder::DSStore::BuddyAllocator::WriteBlock;
-
-use strict;
-use warnings;
-use Carp;
-
-#
-# Write blocks
-#
-
-sub new {
-    my($class, $allocator, $offset, $size) = @_;
-
-    croak "Missing arguments"
-	unless defined($offset) && defined($size);
-    croak "Bad offset"
-	if $offset <= 0;
-
-    bless([ $allocator, undef, 0, $offset, $size ], ref $class || $class);
-}
-
-sub read {
-    my($self) = @_;
-
-    croak "This is a write-only block";
-}
-
-sub length {
-    return ($_[0]->[4]);
-}
-
-sub seek {
-    my($self, $pos, $whence) = @_;
-    if ($whence == 0) {
-	$self->[2] = $pos;
-    } elsif ($whence == 1) {
-	$self->[2] += $pos;
-    } elsif ($whence == 2) {
-	$self->[2] = $self->length + $pos;
-    } else {
-	croak "seek: whence=$whence";
-    }
-    undef $self->[1];
-    $self;
-}
-
-sub write {
-    my($self, $what, @args) = @_;;
-
-    if (!defined($self->[1])) {
-	$self->[1] = $self->[0]->_sought($self->[2] + $self->[3]);
-    }
-
-    if (@args) {
-	$what = pack($what, @args);
-    }
-
-    my($wlen) = CORE::length($what);
-
-    croak "Writing past end of block (writing $wlen at ".($self->[2]).", end is at ".($self->[4])."), died"
-        if $self->[2]+$wlen > $self->[4];
-
-    $self->[1]->write($what);
-    $self->[2] += $wlen;
-}
-
-sub close {
-    my($self, $fill) = @_;
-    if (defined($fill) && $fill && $self->[2] < $self->[4]) {
-        $self->write("\0" x ($self->[4] - $self->[2]));
-    }
-    undef $self->[1];
-    1;
-}
-
-#
-# This is just here for debugging/testing purposes
-#
-
-sub copyback {
-    my($self) = @_;
-
-    my($r) = Mac::Finder::DSStore::BuddyAllocator::Block->new(@{$self}[0, 3, 2]);
-
-    undef $self->[1]; # probably need to re-seek now
-
-    return $r;
-}
-
-package Mac::Finder::DSStore::BuddyAllocator::StringBlock;
-
-use strict;
-use warnings;
-
-#
-# This one's kind of handy, really, but is only used for debugging and
-# test harnesses right now.
-#
-
-sub new {
-    my($x) = '';
-    bless(\$x, ref $_[0] || $_[0]);
-}
-
-sub write {
-    my($self, $what, @args) = @_;;
-
-    if (@args) {
-	$what = pack($what, @args);
-    }
-
-    ${$self} .= $what;
-}
-
-sub copyback {
-    ${$_[0]};
-}
-
-=head1 AUTHOR
-
-Written by Wim Lewis as part of the Mac::Finder::DSStore package.
-
-This file is copyright 2008 by Wim Lewis.
-All rights reserved.
-This program is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-
-=cut
-
-1;
diff --git a/packages/dmg-builder/vendor/Mac/Finder/DSStore/Format.pod b/packages/dmg-builder/vendor/Mac/Finder/DSStore/Format.pod
deleted file mode 100644
index af5934a0d95..00000000000
--- a/packages/dmg-builder/vendor/Mac/Finder/DSStore/Format.pod
+++ /dev/null
@@ -1,552 +0,0 @@
-=head1 DS_Store Format
-
-Some notes on the format of the Macintosh Finder's F<.DS_Store> files.
-
-=head1 OVERVIEW
-
-The Mac OS X Finder stores information about how it displays directories
-and files in files named F<.DS_Store> in each directory which it has touched.
-(This seems to be a departure from the pre-OSX method of storing all the
-information in one file at the root of each filesystem).
-The format is not documented by Apple.
-The information in this file is based on the reverse-engineering notes
-by Mark Mentovai published on the Mozilla wiki,
-and further investigation by me (Wim Lewis).
-
-=head1 FILE FORMAT
-
-The F<.DS_Store> file holds a series of records giving attributes of
-the files in the directory or of the directory itself (referred to as
-F<.>). These records are stored in a B-tree, and the pages of the
-B-tree are stored in the file by a "buddy allocator" along with a
-small amount of metadata. The allocator also provides a level of
-indirection, from small integers to file offsets, presumably allowing
-blocks to be relocated as they grow and shrink.
-
-The file is generally big-endian. Unless otherwise noted, an "integer"
-is a four-byte (32-bit) big-endian number, probably unsigned (but I'm
-not always sure about that).
-
-=head2 Records
-
-A record has the following format:
-
-=over
-
-=item *
-
-Filename length, in characters, as an integer. (4 bytes)
-
-=item *
-
-Filename, in big-endian UTF-16. Presumably with the same Unicode
-composition rules as the HFS+ filesystem. (2 * length bytes)
-
-=item *
-
-Structure id or type, a FourCharCode indicating what property of the
-file this entry describes. (4 bytes)
-
-=item *
-
-Data type (4 bytes), indicating what kind of data field follows:
-
-=over
-
-=item C<'long'>
-
-An integer (4 bytes)
-
-=item C<'shor'>
-
-A short integer? Still stored as four bytes, but the first two are
-always zero.
-
-=item C<'bool'>
-
-A boolean value, stored as one byte.
-
-=item C<'blob'>
-
-An arbitrary block of bytes, stored as an integer followed by that
-many bytes of data.
-
-=item C<'type'>
-
-Four bytes, containing a FourCharCode.
-
-=item C<'ustr'>
-
-A Unicode text string, stored as an integer character count followed 
-by 2*count bytes of data in UTF-16.
-
-=item C<'comp'>
-
-An eight-byte (64-bit) integer.
-(I don't know why the abbreviation "comp" was chosen for this.)
-
-=item C<'dutc'>
-
-A datestamp, represented as an 8-byte integer count of the number
-of (1/65536)-second intervals since the Mac epoch in 1904. Given
-the name, this probably corresponds to the C<UTCDateTime> structure.
-
-=back
-
-=back
-
-A given structure id/type always seems to have the same type of data
-associated with it, and any structure id appears at most once per
-filename. Some only appear on files, and some only appear on
-directories (including the filename F<.>).
-
-Information about a directory (its Finder window view settings, for
-example) is usually held in its parent directory's store file, unless
-the directory is at the root of its volume, in which case it's held
-in the directory itself with the filename F<.>.
-
-I've encountered the following record types:
-
-=over
-
-=item C<'BKGD'>
-
-12-byte C<blob>, directories only. Indicates the background of the
-Finder window viewing this directory (in icon mode). The format
-depends on the kind of background:
-
-=over
-
-=item Default background
-
-FourCharCode C<DefB>, followed by eight unknown bytes, probably garbage.
-
-=item Solid color
-
-FourCharCode C<ClrB>, followed by an RGB value in six bytes, followed by two unknown bytes.
-
-=item Picture
-
-FourCharCode C<PctB>, followed by the the length of the blob
-stored in the C<'pict'> record, followed by four unknown bytes.
-The C<'pict'> record points to the actual background image.
-
-=back
-
-=item C<'ICVO'>
-
-C<bool>, directories only. Unknown meaning. Always seems to be 1, so
-presumably 0 is the default value.
-
-=item C<'Iloc'>
-
-16-byte C<blob>, attached to files and directories. 
-The file's icon location. Two 4-byte values representing the
-horizontal and vertical positions of the icon's center (not
-top-left). (Then, 6 bytes 0xff and 2 bytes 0?) For the purposes of the
-center, the icon only is taken into account, not any label. The icon's
-size comes from the icvo blob.
-
-=item C<'LSVO'>
-
-C<bool>, attached to directories. Purpose unknown.
-
-=item C<'bwsp'>
-
-A C<blob> containing a binary plist. This contains the size
-and layout of the window (including whether optional parts like
-the sidebar or path bar are visible).
-This appeared in Snow Leopard (10.6).
-
-The plist contains the keys C<WindowBounds> (a string in the same
-format in which AppKit saves window frames); C<SidebarWidth> (a
-float), and booleans C<ShowSidebar>, C<ShowToolbar>, C<ShowStatusBar>,
-and C<ShowPathbar>.  Sometimes contains C<ViewStyle> (a string),
-C<TargetURL> (a string), and C<TargetPath> (an array of strings).
-
-=item C<'cmmt'>
-
-C<ustr>, containing a file's "Spotlight Comments".
-(The comment is also stored in the C<com.apple.metadata:kMDItemFinderComment>
-xattr; this copy may be historical.)
-
-=item C<'dilc'>
-
-32-byte C<blob>, attached to files and directories.
-Unknown, may indicate the icon location
-when files are displayed on the desktop.
-
-=item C<'dscl'>
-
-C<bool>, attached to subdirectories. Indicates that the
-subdirectory is open (disclosed) in list view.
-
-=item C<'extn'>
-
-C<ustr>. Often contains the file extension of the file, but sometimes
-contains a different extension.
-Purpose unknown.
-
-=item C<'fwi0'>
-
-16-byte C<blob>, directories only.
-Finder window information.
-The data is first four two-byte values representing the top, left,
-bottom, and right edges of the rect defining the content area of the
-window. The next four bytes represent the view of the window: C<icnv>
-is icon view, other values are C<clmv> and C<Nlsv>.
-The next four bytes are unknown, and are either zeroes or
-C<00 01 00 00>.
-
-On Leopard (10.5), the view-type information seems to be ignored,
-but see C<vstl>. On Snow Leopard (10.6), some more of this record's
-function seems to have been taken over by the plist records C<bwsp>,
-C<lsvp>, and and C<lsvP>.
-
-=item C<'fwsw'>
-
-C<long>, directories only. Finder window sidebar width, in
-pixels/points. Zero if collapsed.
-
-=item C<'fwvh'>
-
-C<shor>, directories only.
-Finder window vertical height. If present, it overrides the height
-defined by the rect in fwi0. The Finder seems to create these (at
-least on 10.4) even though it will do the right thing for window
-height with only an fwi0 around, perhaps this is because the stored
-height is weird when accounting for toolbars and status bars. 
-
-=item C<'GRP0'>
-
-C<ustr>. Unknown; I've only seen this once.
-
-=item C<'icgo'>
-
-8-byte C<blob>, directories (and files?).
-Unknown. Probably two integers, and often the value C<00 00 00 00 00
-00 00 04>.
-
-=item C<'icsp'>
-
-8-byte C<blob>, directories only.
-Unknown, usually all but the last two bytes are zeroes.
-
-=item C<'icvo'>
-
-18- or 26-byte C<blob>, directories only.
-Icon view options. There seem to be two formats for this blob.
-
-If the first 4 bytes are "icvo", then 8 unknown bytes (flags?), then 2 bytes
-corresponding to the selected icon view size, then 4 unknown bytes
-C<6e 6f 6e 65> (the text "none", guess that this is the "keep
-arranged by" setting?).
-
-If the first 4 bytes are "icv4", then:
-two bytes indicating the icon size in pixels, typically 48;
-a 4CC indicating the "keep arranged by" setting
-(or C<none> for none or C<grid> for align to grid);
-another 4CC, either C<botm> or C<rght>,  indicating the label position I<w.r.t.> the icon;
-and then 12 unknown bytes (flags?).
-
-Of the flag bytes, the low-order bit of the second byte is 1 if "Show
-item info" is checked, and the low-order bit of the 12th (last) byte
-is 1 if the "Show icon preview" checkbox is checked. The tenth byte
-usually has the value 4, and the remainder are zero.
-
-=item C<'icvp'>
-
-A C<blob> containing a plist, giving settings for the icon view.
-Appeared in Snow Leopard (10.6), probably supplanting C<'icvo'>.
-
-The plist holds a dictionary with several key-value pairs:
-booleans C<showIconPreview>, C<showItemInfo>, and C<labelOnBottom>;
-numbers C<scrollPositionX>, C<scrollPositionY>, C<gridOffsetX>, C<gridOffsetY>,
-C<textSize>, C<iconSize>, C<gridSpacing>, and C<viewOptionsVersion>;
-string C<arrangeBy>.
-
-The value of the C<backgroundType> key (an integer) presumably controls
-the presence of further optional keys such as C<backgroundColorRed>/C<backgroundColorGreen>/C<backgroundColorBlue>.
-
-=item C<'icvt'>
-
-C<shor>, directories only.
-Icon view text label (filename) size, in points.
-
-=item C<'info'>
-
-40- or 48-byte C<blob>, attached to directories and files.
-Unknown. The first 8 bytes look like a timestamp as in C<dutc>.
-
-=item C<'logS'> or C<'lg1S'>
-
-C<comp>, directories only. Appears to contain the logical size in
-bytes of the directory's contents, perhaps as a cache to speed up
-display in the Finder.
-I think that C<'logS'> appeared in 10.7 and was
-supplanted by C<'lg1S'> in 10.8. See also C<'ph1S'>.
-
-=item C<'lssp'>
-
-8-byte C<blob>, directories only.
-Unknown. Possibly the scroll position in list view mode?
-
-=item C<'lsvo'>
-
-76-byte C<blob>, directories only.
-List view options. Seems to contain the columns displayed in list
-view, their widths, and their sort ordering if any. Presumably
-supplanted by C<lsvp> and/or C<lsvP>.
-
-These list view settings are shared between list view and the list
-portion of coverflow view.
-
-=item C<'lsvt'>
-
-C<shor>, directories only.
-List view text (filename) size, in points.
-
-=item C<'lsvp'>
-
-A C<blob> containing a binary plist. List view settings, perhaps
-supplanting the C<'lsvo'> record. Appeared in Snow Leopard (10.6).
-
-The plist contains boolean values for the keys C<showIconPreview>,
-C<useRelativeDates>, and C<calculateAllSizes>; numbers for
-C<scrollPositionX>, C<scrollPositionY>, C<textSize>, C<iconSize>, and
-C<viewOptionsVersion> (typically 1); and a string, C<sortColumn>.
-
-There is also a C<columns> key containing the set of columns, their widths,
-visibility, column ordering, sort ordering.
-The only difference between C<lsvp> and C<lsvP> appears to be the
-format of the columns specification: an array or a dictionary.
-
-=item C<'lsvP'>
-
-A C<blob> containing a binary plist.
-Often occurs with C<lsvp>, but may have appeared in 10.7 or 10.8.
-
-=item C<'modD'> and C<'moDD'>
-
-C<dutc> timestamps; directories only.
-One or both may appear.
-Typically the same as the directory's modification date.
-Unknown purpose; appeared in 10.7 or 10.8.
-Possibly used to detect when C<logS> needs to be recalculated?
-
-=item C<'phyS'> or C<'ph1S'>
-
-C<comp>, directories only. This number is always a multiple of
-8192 and slightly larger than C<'logS'> / C<'lg1S'>, which always
-seems to be present if this is (though the reverse is not always true).
-Presumably it is the corresponding physical size (an integer number of
-8k-byte disk blocks). 
-
-=item C<'pict'>
-
-Variable-length C<blob>, directories only.
-Despite the name, this contains not a PICT image but an Alias record
-(see I<Inside Macintosh: Files>) which resolves to the file containing
-the actual background image. See also C<'BKGD'>.
-
-=item C<'vSrn'>
-
-C<long>, attached to directories.
-Always appears to contain the value 1.
-Appeared in 10.7 or 10.8.
-
-=item C<'vstl'>
-
-C<type>, directories only. Indicates the style of the view
-(one of C<icnv>, C<clmv>, C<Nlsv>, or C<Flwv>,
-indicating respectively: icon view, column/browser view, list view, and coverflow view)
-selected by the Finder's "Always open in icon [or other style] view"
-checkbox.
-This appears to be a new addition to the Leopard (10.5) Finder.
-
-=back
-
-=head2 B-Tree
-
-The records are stored in a B-tree structure. The B-tree consists of a
-small master block containing a few statistics and a pointer to the
-root node; one or more leaf (external) nodes; and zero or more
-non-leaf (internal) nodes.
-
-The header block is pointed to by the C<DSDB> entry in the buddy
-allocator's directory. It is 20 bytes long and contains five integers:
-
-=over
-
-=item
-
-The block number of the root node of the B-tree
-
-=item
-
-The number of levels of internal nodes (tree height minus one --- that
-is, for a tree containing only a single, leaf, node this will be zero)
-
-=item
-
-The number of records in the tree
-
-=item
-
-The number of nodes in the tree (tree nodes, not including this header
-block)
-
-=item
-
-Always 0x1000, probably the tree node page size 
-
-=back
-
-Individual nodes are either leaf nodes containing a bunch of records,
-or non-leaf (internal) nodes containing N records and N+1 pointers to
-child nodes.
-
-Each node starts with two integers, C<P> and C<count>. If C<P> is 0,
-then this is a leaf node and C<count> is immediately followed by that
-many records. If C<P> is nonzero, then this is an internal node, and
-C<count> is followed by the block number of the leftmost child, then a
-record, then another block number, I<etc.>, for a total of C<count>
-child pointers and C<count> records. C<P> is itself the rightmost
-child pointer, that is, it is logically at the end of the node.
-
-This relies on 0 not being a valid value for a block number. As far as
-I can tell, 0 is a valid value for a block number but it always holds
-the block containing the buddy allocator's internal information,
-presumably because that block is allocated first.
-
-The ordering of records within the B-tree is by case-insensitive
-comparison of their filenames, secondarily sorted on the structure
-ID (record type) field. My guess is that the string comparison follows
-the same rules as HFS+ described in Apple's TN1150.
-
-=head2 Buddy Allocator
-
-B-tree pages and other info are stored in blocks managed by a buddy
-allocator. The allocator maintains a list of the offsets and sizes of
-blocks (indexed by small integers) and a freelist. 
-The allocator also stores a small amount of metadata, including a
-directory or table of contents which maps short strings to block
-numbers. The only entry in that table of contents maps the string
-C<DSDB> ("desktop services database"?) to the B-tree's master block.
-
-The buddy allocator is in charge of all but the first 36 bytes of
-the file, and manages a notional 2GB address space, although the file is
-of course truncated to the last allocated block. All its offsets are
-relative to the fourth byte of the file. Another way to describe this
-is that the file consists of a four-byte header (always C<00 00 00
-01>) followed by a 2GB buddy-allocated area, the first 32-byte block
-of which is allocated but does not appear on the buddy allocator's
-allocation list.
-
-The 32-byte header has the following fields:
-
-=over
-
-=item *
-
-Magic number C<Bud1> (C<42 75 64 31>)
-
-=item *
-
-Offset to the allocator's bookkeeping information block
-
-=item *
-
-Size of the allocator's bookkeeping information block
-
-=item *
-
-A second copy of the offset; the Finder will refuse to read the file
-if this does not match the first copy. Perhaps this is a safeguard
-against corruption from an interrupted write transaction.
-
-=item *
-
-Sixteen bytes of unknown purpose.
-These might simply be the unused space at the end of the block,
-since
-the minimum allocation size is 32 bytes, as will be seen later.
-
-=back
-
-The offset and size indicate where to find the block containing the
-rest of the buddy allocator's state. That block has the following
-fields:
-
-=over
-
-=item Block count
-
-Integer. The number of blocks in the allocated-blocks list.
-
-=item Unknown
-
-Four unknown bytes. Appear to always be 0.
-
-=item Block addresses
-
-Array of integers. There are I<block count> block addresses here, with
-unassigned block numbers represented by zeroes. This is followed by
-enough zeroes to round the section up to the next multiple of 256
-entries (1024 bytes).
-
-=item Directory count
-
-Integer, indicates the number of directory entries.
-
-=item Directory entries
-
-Each consists of a 1-byte count, followed by that many bytes of name
-(in ASCII or perhaps some 1-byte superset such as MacRoman), followed
-by a 4-byte integer containing the entry's block number.
-
-=item Free lists
-
-There are 32 freelists, one for each power of two from 2^0 to
-2^31. Each freelist has a count followed by that many offsets.
-
-=back
-
-There are three different ways to refer to a given block. Most of the
-file uses what I call block numbers or block IDs, which are indexes
-into the C<block address> table. Block ID 0 always seems to refer to
-the buddy allocator's metadata block itself.
-
-The entries in the block address table are what I call block addresses.
-Each address is a packed offset+size. The least-significant 5 bits of
-the number indicate the block's size, as a power of 2 (from 2^5 to
-2^31). If those bits are masked off, the result is the starting offset
-of the block (keeping in mind the 4-byte fudge factor). Since the
-lower 5 bits are unusable to store an offset, blocks must be allocated
-on 32-byte boundaries, and as a side effect the minimum block size is
-32 bytes
-(in which case the least significant 5 bits are equal to C<0x05>).
-
-The free lists contain actual block offsets, not "addresses". The
-size of the referenced blocks is implied by which freelist the block
-is in; a free block in freelist N is 2^N bytes long.
-
-Although the header block is not explicitly allocated, the allocator
-behaves as if it is; other blocks are split in order to accommodate it
-in the buddy scheme, and its buddy block (at 0x20) is either on the
-freelist or allocated. (Usually it holds the B-tree's master block.)
-
-Other than the 4-byte prefix and the 32-byte header block, every byte
-in the file is either in a block on the allocated blocks list, or is in a
-block on one of the free lists.
-
-=head1 CREDITS
-
-Original reverse-engineering effort by Mark Mentovai,
-L<https://wiki.mozilla.org/DS_Store_File_Format>. Some of the text
-describing record types has been copied from that wiki page.
-
-Further investigation and documentation by Wim Lewis
-E<lt>wiml@hhhh.orgE<gt>.
-
-Also thanks to Yvan BARTHE<Eacute>LEMY for investigation and bugfixes.
diff --git a/packages/dmg-builder/vendor/biplist/__init__.py b/packages/dmg-builder/vendor/biplist/__init__.py
index 17d35178d14..3cbe3341d70 100644
--- a/packages/dmg-builder/vendor/biplist/__init__.py
+++ b/packages/dmg-builder/vendor/biplist/__init__.py
@@ -15,12 +15,12 @@
 
 Date values can only be datetime.datetime objects.
 
-The exceptions InvalidPlistException and NotBinaryPlistException may be 
+The exceptions InvalidPlistException and NotBinaryPlistException may be
 thrown to indicate that the data cannot be serialized or deserialized as
 a binary plist.
 
 Plist generation example:
-    
+
     from biplist import *
     from datetime import datetime
     plist = {'aKey':'aValue',
@@ -84,24 +84,24 @@ class Uid(object):
     integer = 0
     def __init__(self, integer):
         self.integer = integer
-    
+
     def __repr__(self):
         return "Uid(%d)" % self.integer
-    
+
     def __eq__(self, other):
         if isinstance(self, Uid) and isinstance(other, Uid):
             return self.integer == other.integer
         return False
-    
+
     def __cmp__(self, other):
         return self.integer - other.integer
-    
+
     def __lt__(self, other):
         return self.integer < other.integer
-    
+
     def __hash__(self):
         return self.integer
-    
+
     def __int__(self):
         return int(self.integer)
 
@@ -222,21 +222,24 @@ class PlistReader(object):
     offsets = None
     trailer = None
     currentOffset = 0
-    
+    # Used to detect recursive object references.
+    offsetsStack = []
+
     def __init__(self, fileOrStream):
         """Raises NotBinaryPlistException."""
         self.reset()
         self.file = fileOrStream
-    
+
     def parse(self):
         return self.readRoot()
-    
+
     def reset(self):
         self.trailer = None
         self.contents = ''
         self.offsets = []
         self.currentOffset = 0
-    
+        self.offsetsStack = []
+
     def readRoot(self):
         result = None
         self.reset()
@@ -250,13 +253,44 @@ def readRoot(self):
         trailerContents = self.contents[-32:]
         try:
             self.trailer = PlistTrailer._make(unpack("!xxxxxxBBQQQ", trailerContents))
+
+            if pow(2, self.trailer.offsetSize*8) < self.trailer.offsetTableOffset:
+                raise InvalidPlistException("Offset size insufficient to reference all objects.")
+
+            if pow(2, self.trailer.objectRefSize*8) < self.trailer.offsetCount:
+                raise InvalidPlistException("Too many offsets to represent in size of object reference representation.")
+
             offset_size = self.trailer.offsetSize * self.trailer.offsetCount
             offset = self.trailer.offsetTableOffset
+
+            if offset + offset_size > pow(2, 64):
+                raise InvalidPlistException("Offset table is excessively long.")
+
+            if self.trailer.offsetSize > 16:
+                raise InvalidPlistException("Offset size is greater than maximum integer size.")
+
+            if self.trailer.objectRefSize == 0:
+                raise InvalidPlistException("Object reference size is zero.")
+
+            if offset >= len(self.contents) - 32:
+                raise InvalidPlistException("Offset table offset is too large.")
+
+            if offset < len("bplist00x"):
+                raise InvalidPlistException("Offset table offset is too small.")
+
+            if self.trailer.topLevelObjectNumber >= self.trailer.offsetCount:
+                raise InvalidPlistException("Top level object number is larger than the number of objects.")
+
             offset_contents = self.contents[offset:offset+offset_size]
             offset_i = 0
+            offset_table_length = len(offset_contents)
+
             while offset_i < self.trailer.offsetCount:
                 begin = self.trailer.offsetSize*offset_i
-                tmp_contents = offset_contents[begin:begin+self.trailer.offsetSize]
+                end = begin+self.trailer.offsetSize
+                if end > offset_table_length:
+                    raise InvalidPlistException("End of object is at invalid offset %d in offset table of length %d" % (end, offset_table_length))
+                tmp_contents = offset_contents[begin:end]
                 tmp_sized = self.getSizedInteger(tmp_contents, self.trailer.offsetSize)
                 self.offsets.append(tmp_sized)
                 offset_i += 1
@@ -265,24 +299,41 @@ def readRoot(self):
         except TypeError as e:
             raise InvalidPlistException(e)
         return result
-    
+
     def setCurrentOffsetToObjectNumber(self, objectNumber):
+        if objectNumber > len(self.offsets) - 1:
+            raise InvalidPlistException("Invalid offset number: %d" % objectNumber)
         self.currentOffset = self.offsets[objectNumber]
-    
+        if self.currentOffset in self.offsetsStack:
+            raise InvalidPlistException("Recursive data structure detected in object: %d" % objectNumber)
+
+    def beginOffsetProtection(self):
+        self.offsetsStack.append(self.currentOffset)
+        return self.currentOffset
+
+    def endOffsetProtection(self, offset):
+        try:
+            index = self.offsetsStack.index(offset)
+            self.offsetsStack = self.offsetsStack[:index]
+        except ValueError as e:
+            pass
+
     def readObject(self):
+        protection = self.beginOffsetProtection()
         result = None
         tmp_byte = self.contents[self.currentOffset:self.currentOffset+1]
+        if len(tmp_byte) != 1:
+            raise InvalidPlistException("No object found at offset: %d" % self.currentOffset)
         marker_byte = unpack("!B", tmp_byte)[0]
         format = (marker_byte >> 4) & 0x0f
         extra = marker_byte & 0x0f
         self.currentOffset += 1
-        
+
         def proc_extra(extra):
             if extra == 0b1111:
-                #self.currentOffset += 1
                 extra = self.readObject()
             return extra
-        
+
         # bool, null, or fill byte
         if format == 0b0000:
             if extra == 0b0000:
@@ -297,11 +348,9 @@ def proc_extra(extra):
                 raise InvalidPlistException("Invalid object found at offset: %d" % (self.currentOffset - 1))
         # int
         elif format == 0b0001:
-            extra = proc_extra(extra)
             result = self.readInteger(pow(2, extra))
         # real
         elif format == 0b0010:
-            extra = proc_extra(extra)
             result = self.readReal(extra)
         # date
         elif format == 0b0011 and extra == 0b0011:
@@ -333,42 +382,50 @@ def proc_extra(extra):
         elif format == 0b1101:
             extra = proc_extra(extra)
             result = self.readDict(extra)
-        else:    
+        else:
             raise InvalidPlistException("Invalid object found: {format: %s, extra: %s}" % (bin(format), bin(extra)))
+        self.endOffsetProtection(protection)
         return result
-    
+
+    def readContents(self, length, description="Object contents"):
+        end = self.currentOffset + length
+        if end >= len(self.contents) - 32:
+            raise InvalidPlistException("%s extends into trailer" % description)
+        elif length < 0:
+            raise InvalidPlistException("%s length is less than zero" % length)
+        data = self.contents[self.currentOffset:end]
+        return data
+
     def readInteger(self, byteSize):
-        result = 0
-        original_offset = self.currentOffset
-        data = self.contents[self.currentOffset:self.currentOffset + byteSize]
-        result = self.getSizedInteger(data, byteSize, as_number=True)
-        self.currentOffset = original_offset + byteSize
-        return result
-    
+        data = self.readContents(byteSize, "Integer")
+        self.currentOffset = self.currentOffset + byteSize
+        return self.getSizedInteger(data, byteSize, as_number=True)
+
     def readReal(self, length):
-        result = 0.0
         to_read = pow(2, length)
-        data = self.contents[self.currentOffset:self.currentOffset+to_read]
+        data = self.readContents(to_read, "Real")
         if length == 2: # 4 bytes
             result = unpack('>f', data)[0]
         elif length == 3: # 8 bytes
             result = unpack('>d', data)[0]
         else:
-            raise InvalidPlistException("Unknown real of length %d bytes" % to_read)
+            raise InvalidPlistException("Unknown Real of length %d bytes" % to_read)
         return result
-    
-    def readRefs(self, count):    
+
+    def readRefs(self, count):
         refs = []
         i = 0
         while i < count:
-            fragment = self.contents[self.currentOffset:self.currentOffset+self.trailer.objectRefSize]
+            fragment = self.readContents(self.trailer.objectRefSize, "Object reference")
             ref = self.getSizedInteger(fragment, len(fragment))
             refs.append(ref)
             self.currentOffset += self.trailer.objectRefSize
             i += 1
         return refs
-    
+
     def readArray(self, count):
+        if not isinstance(count, (int, long)):
+            raise InvalidPlistException("Count of entries in dict isn't of integer type.")
         result = []
         values = self.readRefs(count)
         i = 0
@@ -378,8 +435,10 @@ def readArray(self, count):
             result.append(value)
             i += 1
         return result
-    
+
     def readDict(self, count):
+        if not isinstance(count, (int, long)):
+            raise InvalidPlistException("Count of keys/values in dict isn't of integer type.")
         result = {}
         keys = self.readRefs(count)
         values = self.readRefs(count)
@@ -392,39 +451,58 @@ def readDict(self, count):
             result[key] = value
             i += 1
         return result
-    
+
     def readAsciiString(self, length):
-        result = unpack("!%ds" % length, self.contents[self.currentOffset:self.currentOffset+length])[0]
+        if not isinstance(length, (int, long)):
+            raise InvalidPlistException("Length of ASCII string isn't of integer type.")
+        data = self.readContents(length, "ASCII string")
+        result = unpack("!%ds" % length, data)[0]
         self.currentOffset += length
         return str(result.decode('ascii'))
-    
+
     def readUnicode(self, length):
+        if not isinstance(length, (int, long)):
+            raise InvalidPlistException("Length of Unicode string isn't of integer type.")
         actual_length = length*2
-        data = self.contents[self.currentOffset:self.currentOffset+actual_length]
-        # unpack not needed?!! data = unpack(">%ds" % (actual_length), data)[0]
+        data = self.readContents(actual_length, "Unicode string")
         self.currentOffset += actual_length
         return data.decode('utf_16_be')
-    
+
     def readDate(self):
-        result = unpack(">d", self.contents[self.currentOffset:self.currentOffset+8])[0]
+        data = self.readContents(8, "Date")
+        x = unpack(">d", data)[0]
+        if math.isnan(x):
+            raise InvalidPlistException("Date is NaN")
         # Use timedelta to workaround time_t size limitation on 32-bit python.
-        result = datetime.timedelta(seconds=result) + apple_reference_date
+        try:
+            result = datetime.timedelta(seconds=x) + apple_reference_date
+        except OverflowError:
+            if x > 0:
+                result = datetime.datetime.max
+            else:
+                result = datetime.datetime.min
         self.currentOffset += 8
         return result
-    
+
     def readData(self, length):
-        result = self.contents[self.currentOffset:self.currentOffset+length]
+        if not isinstance(length, (int, long)):
+            raise InvalidPlistException("Length of data isn't of integer type.")
+        result = self.readContents(length, "Data")
         self.currentOffset += length
         return Data(result)
-    
+
     def readUid(self, length):
+        if not isinstance(length, (int, long)):
+            raise InvalidPlistException("Uid length isn't of integer type.")
         return Uid(self.readInteger(length+1))
-    
+
     def getSizedInteger(self, data, byteSize, as_number=False):
         """Numbers of 8 bytes are signed integers when they refer to numbers, but unsigned otherwise."""
         result = 0
+        if byteSize == 0:
+            raise InvalidPlistException("Encountered integer with byte size of 0.")
         # 1, 2, and 4 byte integers are unsigned
-        if byteSize == 1:
+        elif byteSize == 1:
             result = unpack('>B', data)[0]
         elif byteSize == 2:
             result = unpack('>H', data)[0]
@@ -477,16 +555,16 @@ def __repr__(self):
 
 class StringWrapper(object):
     __instances = {}
-    
+
     encodedValue = None
     encoding = None
-    
+
     def __new__(cls, value):
         '''Ensure we only have a only one instance for any string,
          and that we encode ascii as 1-byte-per character when possible'''
-        
+
         encodedValue = None
-        
+
         for encoding in ('ascii', 'utf_16_be'):
             try:
                encodedValue = value.encode(encoding)
@@ -497,26 +575,26 @@ def __new__(cls, value):
                     cls.__instances[encodedValue].encodedValue = encodedValue
                     cls.__instances[encodedValue].encoding = encoding
                 return cls.__instances[encodedValue]
-        
+
         raise ValueError('Unable to get ascii or utf_16_be encoding for %s' % repr(value))
-    
+
     def __len__(self):
         '''Return roughly the number of characters in this string (half the byte length)'''
         if self.encoding == 'ascii':
             return len(self.encodedValue)
         else:
             return len(self.encodedValue)//2
-    
+
     def __lt__(self, other):
         return self.encodedValue < other.encodedValue
-    
+
     @property
     def encodingMarker(self):
         if self.encoding == 'ascii':
             return 0b0101
         else:
             return 0b0110
-    
+
     def __repr__(self):
         return '<StringWrapper (%s): %s>' % (self.encoding, self.encodedValue)
 
@@ -530,7 +608,9 @@ class PlistWriter(object):
     referencePositions = None
     wrappedTrue = None
     wrappedFalse = None
-    
+    # Used to detect recursive object references.
+    objectsStack = []
+
     def __init__(self, file):
         self.reset()
         self.file = file
@@ -540,19 +620,21 @@ def __init__(self, file):
     def reset(self):
         self.byteCounts = PlistByteCounts(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
         self.trailer = PlistTrailer(0, 0, 0, 0, 0)
-        
+
         # A set of all the uniques which have been computed.
         self.computedUniques = set()
         # A list of all the uniques which have been written.
         self.writtenReferences = {}
         # A dict of the positions of the written uniques.
         self.referencePositions = {}
-        
+
+        self.objectsStack = []
+
     def positionOfObjectReference(self, obj):
         """If the given object has been written already, return its
            position in the offset table. Otherwise, return None."""
         return self.writtenReferences.get(obj)
-        
+
     def writeRoot(self, root):
         """
         Strategy is:
@@ -575,7 +657,7 @@ def writeRoot(self, root):
         self.trailer = self.trailer._replace(**{'objectRefSize':self.intSize(len(self.computedUniques))})
         self.writeObjectReference(wrapped_root, output)
         output = self.writeObject(wrapped_root, output, setReferencePosition=True)
-        
+
         # output size at this point is an upper bound on how big the
         # object reference offsets need to be.
         self.trailer = self.trailer._replace(**{
@@ -584,43 +666,65 @@ def writeRoot(self, root):
             'offsetTableOffset':len(output),
             'topLevelObjectNumber':0
             })
-        
+
         output = self.writeOffsetTable(output)
         output += pack('!xxxxxxBBQQQ', *self.trailer)
         self.file.write(output)
 
+    def beginRecursionProtection(self, obj):
+        if not isinstance(obj, (set, dict, list, tuple)):
+            return
+        if id(obj) in self.objectsStack:
+            raise InvalidPlistException("Recursive containers are not allowed in plists.")
+        self.objectsStack.append(id(obj))
+
+    def endRecursionProtection(self, obj):
+        if not isinstance(obj, (set, dict, list, tuple)):
+            return
+        try:
+            index = self.objectsStack.index(id(obj))
+            self.objectsStack = self.objectsStack[:index]
+        except ValueError as e:
+            pass
+
     def wrapRoot(self, root):
+        result = None
+        self.beginRecursionProtection(root)
+
         if isinstance(root, bool):
             if root is True:
-                return self.wrappedTrue
+                result = self.wrappedTrue
             else:
-                return self.wrappedFalse
+                result = self.wrappedFalse
         elif isinstance(root, float):
-            return FloatWrapper(root)
+            result = FloatWrapper(root)
         elif isinstance(root, set):
             n = set()
             for value in root:
                 n.add(self.wrapRoot(value))
-            return HashableWrapper(n)
+            result = HashableWrapper(n)
         elif isinstance(root, dict):
             n = {}
             for key, value in iteritems(root):
                 n[self.wrapRoot(key)] = self.wrapRoot(value)
-            return HashableWrapper(n)
+            result = HashableWrapper(n)
         elif isinstance(root, list):
             n = []
             for value in root:
                 n.append(self.wrapRoot(value))
-            return HashableWrapper(n)
+            result = HashableWrapper(n)
         elif isinstance(root, tuple):
             n = tuple([self.wrapRoot(value) for value in root])
-            return HashableWrapper(n)
+            result = HashableWrapper(n)
         elif isinstance(root, (str, unicode)) and not isinstance(root, Data):
-            return StringWrapper(root)
+            result =  StringWrapper(root)
         elif isinstance(root, bytes):
-            return Data(root)
+            result = Data(root)
         else:
-            return root
+            result = root
+
+        self.endRecursionProtection(root)
+        return result
 
     def incrementByteCount(self, field, incr=1):
         self.byteCounts = self.byteCounts._replace(**{field:self.byteCounts.__getattribute__(field) + incr})
@@ -633,7 +737,7 @@ def check_key(key):
                 raise InvalidPlistException('Data cannot be dictionary keys in plists.')
             elif not isinstance(key, StringWrapper):
                 raise InvalidPlistException('Keys must be strings.')
-        
+
         def proc_size(size):
             if size > 0b1110:
                 size += self.intSize(size)
@@ -645,7 +749,7 @@ def proc_size(size):
                 return
             else:
                 self.computedUniques.add(obj)
-        
+
         if obj is None:
             self.incrementByteCount('nullBytes')
         elif isinstance(obj, BoolWrapper):
@@ -659,7 +763,7 @@ def proc_size(size):
         elif isinstance(obj, FloatWrapper):
             size = self.realSize(obj)
             self.incrementByteCount('realBytes', incr=1+size)
-        elif isinstance(obj, datetime.datetime):    
+        elif isinstance(obj, datetime.datetime):
             self.incrementByteCount('dateBytes', incr=2)
         elif isinstance(obj, Data):
             size = proc_size(len(obj))
@@ -719,15 +823,15 @@ def proc_variable_length(format, length):
             else:
                 result += pack('!B', (format << 4) | length)
             return result
-        
+
         def timedelta_total_seconds(td):
             # Shim for Python 2.6 compatibility, which doesn't have total_seconds.
             # Make one argument a float to ensure the right calculation.
             return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10.0**6) / 10.0**6
-       
+
         if setReferencePosition:
             self.referencePositions[obj] = len(output)
-        
+
         if obj is None:
             output += pack('!B', 0b00000000)
         elif isinstance(obj, BoolWrapper):
@@ -771,7 +875,7 @@ def timedelta_total_seconds(td):
                     output += proc_variable_length(0b1100, len(obj))
                 else:
                     output += proc_variable_length(0b1010, len(obj))
-            
+
                 objectsToWrite = []
                 for objRef in sorted(obj) if isinstance(obj, set) else obj:
                     (isNew, output) = self.writeObjectReference(objRef, output)
@@ -798,7 +902,7 @@ def timedelta_total_seconds(td):
                 for objRef in objectsToWrite:
                     output = self.writeObject(objRef, output, setReferencePosition=True)
         return output
-    
+
     def writeOffsetTable(self, output):
         """Writes all of the object reference offsets."""
         all_positions = []
@@ -818,12 +922,12 @@ def writeOffsetTable(self, output):
             output += self.binaryInt(position, self.trailer.offsetSize)
             all_positions.append(position)
         return output
-    
+
     def binaryReal(self, obj):
         # just use doubles
         result = pack('>d', obj.value)
         return result
-    
+
     def binaryInt(self, obj, byteSize=None, as_number=False):
         result = b''
         if byteSize is None:
@@ -847,7 +951,7 @@ def binaryInt(self, obj, byteSize=None, as_number=False):
         else:
             raise InvalidPlistException("Core Foundation can't handle integers with size greater than 16 bytes.")
         return result
-    
+
     def intSize(self, obj):
         """Returns the number of bytes necessary to store the given integer."""
         # SIGNED
@@ -868,6 +972,6 @@ def intSize(self, obj):
             return 16
         else:
             raise InvalidPlistException("Core Foundation can't handle integers with size greater than 8 bytes.")
-    
+
     def realSize(self, obj):
         return 8
diff --git a/packages/dmg-builder/vendor/dmgbuild/__init__.py b/packages/dmg-builder/vendor/dmgbuild/__init__.py
deleted file mode 100644
index e7f985c3223..00000000000
--- a/packages/dmg-builder/vendor/dmgbuild/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from .core import build_dmg
-
-__all__ = ['dmgbuild']
diff --git a/packages/dmg-builder/vendor/dmgbuild/core.py b/packages/dmg-builder/vendor/dmgbuild/core.py
index ee1abe6554f..a90bae3379a 100644
--- a/packages/dmg-builder/vendor/dmgbuild/core.py
+++ b/packages/dmg-builder/vendor/dmgbuild/core.py
@@ -1,582 +1,292 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import json
 import os
-import pkg_resources
 import re
-import shutil
-import subprocess
 import sys
-import tempfile
-import tokenize
+reload(sys)  # Reload is a hack
+sys.setdefaultencoding('UTF8')
+
+sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 try:
-    {}.iteritems
-    iteritems = lambda x: x.iteritems()
-    iterkeys = lambda x: x.iterkeys()
+  {}.iteritems
+  iteritems = lambda x: x.iteritems()
+  iterkeys = lambda x: x.iterkeys()
 except AttributeError:
-    iteritems = lambda x: x.items()
-    iterkeys = lambda x: x.keys()
+  iteritems = lambda x: x.items()
+  iterkeys = lambda x: x.keys()
 try:
-    unicode
+  unicode
 except NameError:
-    unicode = str
+  unicode = str
 
 import biplist
 from mac_alias import *
 from ds_store import *
 
-from . import colors
+from colors import parseColor
 
 try:
-    from . import badge
+  from badge import badge
 except ImportError:
-    badge = None
-
-_hexcolor_re = re.compile(r'#[0-9a-f]{3}(?:[0-9a-f]{3})?')
+  badge = None
 
 class DMGError(Exception):
-    pass
-
-def hdiutil(cmd, *args, **kwargs):
-    plist = kwargs.get('plist', True)
-    all_args = ['/usr/bin/hdiutil', cmd]
-    all_args.extend(args)
-    if plist:
-        all_args.append('-plist')
-    p = subprocess.Popen(all_args, stdout=subprocess.PIPE, close_fds=True)
-    output, errors = p.communicate()
-    if plist:
-        results = biplist.readPlistFromString(output)
-    else:
-        results = output
-    retcode = p.wait()
-    return retcode, results
-
-# On Python 2 we can just execfile() it, but Python 3 deprecated that
-def load_settings(filename, settings):
-    if sys.version_info[0] == 2:
-        execfile(filename, settings, settings)
-    else:
-        encoding = 'utf-8'
-        with open(filename, 'rb') as fp:
-            try:
-                encoding = tokenize.detect_encoding(fp.readline)[0]
-            except SyntaxError:
-                pass
-
-        with open(filename, 'r', encoding=encoding) as fp:
-            exec(compile(fp.read(), filename, 'exec'), settings, settings)
-
-def load_json(filename, settings):
-    """Read an appdmg .json spec.  Uses the defaults for appdmg, rather than
-       the usual defaults for dmgbuild. """
-
-    with open(filename, 'r') as fp:
-        json_data = json.load(fp)
-
-    if 'title' not in json_data:
-        raise ValueError('missing \'title\' in JSON settings file')
-    if 'contents' not in json_data:
-        raise ValueError('missing \'contents\' in JSON settings file')
-
-    settings['volume_name'] = json_data['title']
-    settings['icon'] = json_data.get('icon', None)
-    settings['badge_icon'] = json_data.get('badge-icon', None)
-    bk = json_data.get('background', None)
-    if bk is None:
-        bk = json_data.get('background-color', None)
-    if bk is not None:
-        settings['background'] = bk
-    settings['icon_size'] = json_data.get('icon-size', 80)
-    wnd = json_data.get('window', { 'position': (100, 100),
-                                    'size': (640, 480) })
-    pos = wnd.get('position', { 'x': 100, 'y': 100 })
-    siz = wnd.get('size', { 'width': 640, 'height': 480 })
-    settings['window_rect'] = ((pos.get('x', 100), pos.get('y', 100)),
-                               (siz.get('width', 640), siz.get('height', 480)))
-    settings['format'] = json_data.get('format', 'UDZO')
-    settings['compression_level'] = json_data.get('compression-level', None)
-    settings['license'] = json_data.get('license', None)
-    files = []
-    symlinks = {}
-    icon_locations = {}
-    for fileinfo in json_data.get('contents', []):
-        if 'path' not in fileinfo:
-            raise ValueError('missing \'path\' in contents in JSON settings file')
-        if 'x' not in fileinfo:
-            raise ValueError('missing \'x\' in contents in JSON settings file')
-        if 'y' not in fileinfo:
-            raise ValueError('missing \'y\' in contents in JSON settings file')
-
-        kind = fileinfo.get('type', 'file')
-        path = fileinfo['path']
-        name = fileinfo.get('name', os.path.basename(path.rstrip('/')))
-        if kind == 'file':
-            files.append((path, name))
-        elif kind == 'link':
-            symlinks[name] = path
-        elif kind == 'position':
-            pass
-        icon_locations[name] = (fileinfo['x'], fileinfo['y'])
-
-    settings['files'] = files
-    settings['symlinks'] = symlinks
-    settings['icon_locations'] = icon_locations
-
-def build_dmg(filename, volume_name, settings_file=None, settings={},
-              defines={}, lookForHiDPI=True):
-    options = {
-        # Default settings
-        'filename': filename,
-        'volume_name': volume_name,
-        'format': 'UDBZ',
-        'compression_level': None,
-        'size': None,
-        'files': [],
-        'symlinks': {},
-        'icon': None,
-        'badge_icon': None,
-        'background': None,
-        'show_status_bar': False,
-        'show_tab_view': False,
-        'show_toolbar': False,
-        'show_pathbar': False,
-        'show_sidebar': False,
-        'sidebar_width': 180,
-        'arrange_by': None,
-        'grid_offset': (0, 0),
-        'grid_spacing': 100.0,
-        'scroll_position': (0.0, 0.0),
-        'show_icon_preview': False,
-        'show_item_info': False,
-        'label_pos': 'bottom',
-        'text_size': 16.0,
-        'icon_size': 128.0,
-        'include_icon_view_settings': 'auto',
-        'include_list_view_settings': 'auto',
-        'list_icon_size': 16.0,
-        'list_text_size': 12.0,
-        'list_scroll_position': (0, 0),
-        'list_sort_by': 'name',
-        'list_use_relative_dates': True,
-        'list_calculate_all_sizes': False,
-        'list_columns': ('name', 'date-modified', 'size', 'kind', 'date-added'),
-        'list_column_widths': {
-            'name': 300,
-            'date-modified': 181,
-            'date-created': 181,
-            'date-added': 181,
-            'date-last-opened': 181,
-            'size': 97,
-            'kind': 115,
-            'label': 100,
-            'version': 75,
-            'comments': 300,
-            },
-        'list_column_sort_directions': {
-            'name': 'ascending',
-            'date-modified': 'descending',
-            'date-created': 'descending',
-            'date-added': 'descending',
-            'date-last-opened': 'descending',
-            'size': 'descending',
-            'kind': 'ascending',
-            'label': 'ascending',
-            'version': 'ascending',
-            'comments': 'ascending',
-            },
-        'window_rect': ((100, 100), (640, 280)),
-        'default_view': 'icon-view',
-        'icon_locations': {},
-        'license': None,
-        'defines': defines
-        }
-
-    # Execute the settings file
-    if settings_file:
-        # We now support JSON settings files using appdmg's format
-        if settings_file.endswith('.json'):
-            load_json(settings_file, options)
-        else:
-            load_settings(settings_file, options)
-
-    # Add any overrides
-    options.update(settings)
-
-    # Set up the finder data
-    bounds = options['window_rect']
-
-    bounds_string = '{{%s, %s}, {%s, %s}}' % (bounds[0][0],
-                                              bounds[0][1],
-                                              bounds[1][0],
-                                              bounds[1][1])
-    bwsp = {
-        'ShowStatusBar': options['show_status_bar'],
-        'WindowBounds': bounds_string.encode('utf-8'),
-        'ContainerShowSidebar': False,
-        'PreviewPaneVisibility': False,
-        'SidebarWidth': options['sidebar_width'],
-        'ShowTabView': options['show_tab_view'],
-        'ShowToolbar': options['show_toolbar'],
-        'ShowPathbar': options['show_pathbar'],
-        'ShowSidebar': options['show_sidebar']
-        }
-
-    arrange_options = {
-        'name': 'name',
-        'date-modified': 'dateModified',
-        'date-created': 'dateCreated',
-        'date-added': 'dateAdded',
-        'date-last-opened': 'dateLastOpened',
-        'size': 'size',
-        'kind': 'kind',
-        'label': 'label',
-        }
-
-    icvp = {
-        'viewOptionsVersion': 1,
-        'backgroundType': 0,
-        'backgroundColorRed': 1.0,
-        'backgroundColorGreen': 1.0,
-        'backgroundColorBlue': 1.0,
-        'gridOffsetX': float(options['grid_offset'][0]),
-        'gridOffsetY': float(options['grid_offset'][1]),
-        'gridSpacing': float(options['grid_spacing']),
-        'arrangeBy': str(arrange_options.get(options['arrange_by'], 'none')),
-        'showIconPreview': options['show_icon_preview'] == True,
-        'showItemInfo': options['show_item_info'] == True,
-        'labelOnBottom': options['label_pos'] == 'bottom',
-        'textSize': float(options['text_size']),
-        'iconSize': float(options['icon_size']),
-        'scrollPositionX': float(options['scroll_position'][0]),
-        'scrollPositionY': float(options['scroll_position'][1])
-        }
-
-    background = options['background']
-
-    columns = {
-        'name': 'name',
-        'date-modified': 'dateModified',
-        'date-created': 'dateCreated',
-        'date-added': 'dateAdded',
-        'date-last-opened': 'dateLastOpened',
-        'size': 'size',
-        'kind': 'kind',
-        'label': 'label',
-        'version': 'version',
-        'comments': 'comments'
-        }
-
-    default_widths = {
-        'name': 300,
-        'date-modified': 181,
-        'date-created': 181,
-        'date-added': 181,
-        'date-last-opened': 181,
-        'size': 97,
-        'kind': 115,
-        'label': 100,
-        'version': 75,
-        'comments': 300,
-        }
-
-    default_sort_directions = {
-        'name': 'ascending',
-        'date-modified': 'descending',
-        'date-created': 'descending',
-        'date-added': 'descending',
-        'date-last-opened': 'descending',
-        'size': 'descending',
-        'kind': 'ascending',
-        'label': 'ascending',
-        'version': 'ascending',
-        'comments': 'ascending',
-        }
-
-    lsvp = {
-        'viewOptionsVersion': 1,
-        'sortColumn': columns.get(options['list_sort_by'], 'name'),
-        'textSize': float(options['list_text_size']),
-        'iconSize': float(options['list_icon_size']),
-        'showIconPreview': options['show_icon_preview'],
-        'scrollPositionX': options['list_scroll_position'][0],
-        'scrollPositionY': options['list_scroll_position'][1],
-        'useRelativeDates': options['list_use_relative_dates'],
-        'calculateAllSizes': options['list_calculate_all_sizes'],
-        }
-
-    lsvp['columns'] = {}
-    cndx = {}
-
-    for n, column in enumerate(options['list_columns']):
-        cndx[column] = n
-        width = options['list_column_widths'].get(column,
-                                                   default_widths[column])
-        asc = 'ascending' == options['list_column_sort_directions'].get(column,
-                    default_sort_directions[column])
-
-        lsvp['columns'][columns[column]] = {
-            'index': n,
-            'width': width,
-            'identifier': columns[column],
-            'visible': True,
-            'ascending': asc
-            }
-
-    n = len(options['list_columns'])
-    for k in iterkeys(columns):
-        if cndx.get(k, None) is None:
-            cndx[k] = n
-            width = default_widths[k]
-            asc = 'ascending' == default_sort_directions[k]
-
-        lsvp['columns'][columns[column]] = {
-            'index': n,
-            'width': width,
-            'identifier': columns[column],
-            'visible': False,
-            'ascending': asc
-            }
-
-        n += 1
-
-    default_view = options['default_view']
-    views = {
-        'icon-view': b'icnv',
-        'column-view': b'clmv',
-        'list-view': b'Nlsv',
-        'coverflow': b'Flwv'
-        }
-
-    icvl = (b'type', views.get(default_view, 'icnv'))
-
-    include_icon_view_settings = default_view == 'icon-view' \
-        or options['include_icon_view_settings'] not in \
-        ('auto', 'no', 0, False, None)
-    include_list_view_settings = default_view in ('list-view', 'coverflow') \
-        or options['include_list_view_settings'] not in \
-        ('auto', 'no', 0, False, None)
-
-    filename = options['filename']
-    volume_name = options['volume_name']
-
-    # Construct a writeable image to start with
-    dirname, basename = os.path.split(os.path.realpath(filename))
-    if not basename.endswith('.dmg'):
-        basename += '.dmg'
-    writableFile = tempfile.NamedTemporaryFile(dir=dirname, prefix='.temp',
-                                               suffix=basename)
-
-    total_size = options['size']
-    if total_size == None:
-        # Start with a size of 128MB - this way we don't need to calculate the
-        # size of the background image, volume icon, and .DS_Store file (and
-        # 128 MB should be well sufficient for even the most outlandish image
-        # sizes, like an uncompressed 5K multi-resolution TIFF)
-        total_size = 128 * 1024 * 1024
-
-        def roundup(x, n):
-            return x if x % n == 0 else x + n - x % n
-
-        for path in options['files']:
-            if isinstance(path, tuple):
-                path = path[0]
-
-            if not os.path.islink(path) and os.path.isdir(path):
-                for dirpath, dirnames, filenames in os.walk(path):
-                    for f in filenames:
-                        fp = os.path.join(dirpath, f)
-                        total_size += roundup(os.lstat(fp).st_size, 4096)
-            else:
-                total_size += roundup(os.lstat(path).st_size, 4096)
-
-        for name,target in iteritems(options['symlinks']):
-            total_size += 4096
-
-        total_size = str(max(total_size / 1024, 1024)) + 'K'
-
-    ret, output = hdiutil('create',
-                          '-ov',
-                          '-volname', volume_name,
-                          '-fs', 'HFS+',
-                          '-fsargs', '-c c=64,a=16,e=16',
-                          '-size', total_size,
-                          writableFile.name)
-
-    if ret:
-        raise DMGError('Unable to create disk image')
-
-    ret, output = hdiutil('attach',
-                          '-nobrowse',
-                          '-owners', 'off',
-                          '-noidme',
-                          writableFile.name)
-
-    if ret:
-        raise DMGError('Unable to attach disk image')
-
-    try:
-        for info in output['system-entities']:
-            if info.get('mount-point', None):
-                device = info['dev-entry']
-                mount_point = info['mount-point']
-
-        icon = options['icon']
-        if badge:
-            badge_icon = options['badge_icon']
-        else:
-            badge_icon = None
-        icon_target_path = os.path.join(mount_point, '.VolumeIcon.icns')
-        if icon:
-            shutil.copyfile(icon, icon_target_path)
-        elif badge_icon:
-            badge.badge_disk_icon(badge_icon, icon_target_path)
-
-        if icon or badge_icon:
-            subprocess.call(['/usr/bin/SetFile', '-a', 'C', mount_point])
-
-        background_bmk = None
-
-        if not isinstance(background, (str, unicode)):
-            pass
-        elif colors.isAColor(background):
-            c = colors.parseColor(background).to_rgb()
-
-            icvp['backgroundType'] = 1
-            icvp['backgroundColorRed'] = float(c.r)
-            icvp['backgroundColorGreen'] = float(c.g)
-            icvp['backgroundColorBlue'] = float(c.b)
-        else:
-            if os.path.isfile(background):
-                # look to see if there are HiDPI resources available
-
-                if lookForHiDPI is True:
-                    name, extension = os.path.splitext(os.path.basename(background))
-                    orderedImages = [background]
-                    imageDirectory = os.path.dirname(background)
-                    if imageDirectory == '':
-                        imageDirectory = '.'
-                    for candidateName in os.listdir(imageDirectory):
-                        hasScale = re.match(
-                            '^(?P<name>.+)@(?P<scale>\d+)x(?P<extension>\.\w+)$',
-                            candidateName)
-                        if hasScale and name == hasScale.group('name') and \
-                            extension == hasScale.group('extension'):
-                                scale = int(hasScale.group('scale'))
-                                if len(orderedImages) < scale:
-                                    orderedImages += [None] * (scale - len(orderedImages))
-                                orderedImages[scale - 1] = os.path.join(imageDirectory, candidateName)
-
-                    if len(orderedImages) > 1:
-                        # compile the grouped tiff
-                        backgroundFile = tempfile.NamedTemporaryFile(suffix='.tiff')
-                        background = backgroundFile.name
-                        output = tempfile.TemporaryFile(mode='w+')
-                        try:
-                            subprocess.check_call(
-                                ['/usr/bin/tiffutil', '-cathidpicheck'] +
-                                filter(None, orderedImages) +
-                                ['-out', background], stdout=output, stderr=output)
-                        except Exception as e:
-                            output.seek(0)
-                            raise ValueError(
-                                'unable to compile combined HiDPI file "%s" got error: %s\noutput: %s'
-                                % (background, str(e), output.read()))
-
-                _, kind = os.path.splitext(background)
-                path_in_image = os.path.join(mount_point, '.background' + kind)
-                shutil.copyfile(background, path_in_image)
-            elif pkg_resources.resource_exists('dmgbuild', 'resources/' + background + '.tiff'):
-                tiffdata = pkg_resources.resource_string(
-                    'dmgbuild',
-                    'resources/' + background + '.tiff')
-                path_in_image = os.path.join(mount_point, '.background.tiff')
-
-                with open(path_in_image, 'wb') as f:
-                    f.write(tiffdata)
-            else:
-                raise ValueError('background file "%s" not found' % background)
-
-            alias = Alias.for_file(path_in_image)
-            background_bmk = Bookmark.for_file(path_in_image)
-
-            icvp['backgroundType'] = 2
-            icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
-
-        for f in options['files']:
-            if isinstance(f, tuple):
-                f_in_image = os.path.join(mount_point, f[1])
-                f = f[0]
-            else:
-                basename = os.path.basename(f.rstrip('/'))
-                f_in_image = os.path.join(mount_point, basename)
-
-            # use system ditto command to preserve code signing, etc.
-            subprocess.call(['/usr/bin/ditto', f, f_in_image])
-
-        for name,target in iteritems(options['symlinks']):
-            name_in_image = os.path.join(mount_point, name)
-            os.symlink(target, name_in_image)
-
-        userfn = options.get('create_hook', None)
-        if callable(userfn):
-            userfn(mount_point, options)
-
-        image_dsstore = os.path.join(mount_point, '.DS_Store')
-
-        with DSStore.open(image_dsstore, 'w+') as d:
-            d['.']['vSrn'] = ('long', 1)
-            d['.']['bwsp'] = bwsp
-            if include_icon_view_settings:
-                d['.']['icvp'] = icvp
-                if background_bmk:
-                    d['.']['pBBk'] = background_bmk
-            if include_list_view_settings:
-                d['.']['lsvp'] = lsvp
-            d['.']['icvl'] = icvl
-
-            for k,v in iteritems(options['icon_locations']):
-                d[k]['Iloc'] = v
-
-        # Delete .Trashes, if it gets created
-        shutil.rmtree(os.path.join(mount_point, '.Trashes'), True)
-    except:
-        # Always try to detach
-        hdiutil('detach', '-force', device, plist=False)
-        raise
-
-    ret, output = hdiutil('detach', device, plist=False)
-
-    if ret:
-        hdiutil('detach', '-force', device, plist=False)
-        raise DMGError('Unable to detach device cleanly')
-
-    # Shrink the output to the minimum possible size
-    ret, output = hdiutil('resize',
-                          '-quiet',
-                          '-sectors', 'min',
-                          writableFile.name,
-                          plist=False)
-
-    if ret:
-        raise DMGError('Unable to shrink')
-
-    key_prefix = {'UDZO': 'zlib', 'UDBZ': 'bzip2', 'ULFO': 'lzfse'}
-    compression_level = options['compression_level']
-    if options['format'] in key_prefix and compression_level:
-        compression_args = [
-            '-imagekey',
-            key_prefix[options['format']] + '-level=' + str(compression_level)
-        ]
-    else:
-        compression_args = []
-
-    ret, output = hdiutil('convert', writableFile.name,
-                          '-format', options['format'],
-                          '-ov',
-                          '-o', filename, *compression_args)
-
-    if ret:
-        raise DMGError('Unable to convert')
\ No newline at end of file
+  pass
+
+
+def build_dmg():
+  options = {
+    'icon': None,
+    'badge_icon': None,
+    'show_status_bar': False,
+    'show_tab_view': False,
+    'show_toolbar': False,
+    'show_pathbar': False,
+    'show_sidebar': False,
+    'sidebar_width': 180,
+    'arrange_by': None,
+    'grid_offset': (0, 0),
+    'grid_spacing': 100.0,
+    'scroll_position': (0.0, 0.0),
+    'show_icon_preview': False,
+    'show_item_info': False,
+    'label_pos': 'bottom',
+    'text_size': os.environ['iconTextSize'],
+    'icon_size': os.environ['iconSize'],
+    'include_icon_view_settings': 'auto',
+    'include_list_view_settings': 'auto',
+    'list_icon_size': 16.0,
+    'list_text_size': 12.0,
+    'list_scroll_position': (0, 0),
+    'list_sort_by': 'name',
+    'list_use_relative_dates': True,
+    'list_calculate_all_sizes': False,
+    'list_columns': ('name', 'date-modified', 'size', 'kind', 'date-added'),
+    'list_column_widths': {
+      'name': 300,
+      'date-modified': 181,
+      'date-created': 181,
+      'date-added': 181,
+      'date-last-opened': 181,
+      'size': 97,
+      'kind': 115,
+      'label': 100,
+      'version': 75,
+      'comments': 300,
+    },
+    'list_column_sort_directions': {
+      'name': 'ascending',
+      'date-modified': 'descending',
+      'date-created': 'descending',
+      'date-added': 'descending',
+      'date-last-opened': 'descending',
+      'size': 'descending',
+      'kind': 'ascending',
+      'label': 'ascending',
+      'version': 'ascending',
+      'comments': 'ascending',
+    },
+    'default_view': 'icon-view',
+  }
+
+  # Set up the finder data
+  bwsp = {
+    'ShowStatusBar': options['show_status_bar'],
+    'ContainerShowSidebar': False,
+    'PreviewPaneVisibility': False,
+    'SidebarWidth': options['sidebar_width'],
+    'ShowTabView': options['show_tab_view'],
+    'ShowToolbar': options['show_toolbar'],
+    'ShowPathbar': options['show_pathbar'],
+    'ShowSidebar': options['show_sidebar']
+  }
+
+  window_x = os.environ.get('windowX')
+  if window_x:
+    window_y = os.environ['windowY']
+    bwsp['WindowBounds'] = '{{%s, %s}, {%s, %s}}' % (window_x,
+                                                     window_y,
+                                                     os.environ['windowWidth'],
+                                                     os.environ['windowHeight'])
+
+  arrange_options = {
+    'name': 'name',
+    'date-modified': 'dateModified',
+    'date-created': 'dateCreated',
+    'date-added': 'dateAdded',
+    'date-last-opened': 'dateLastOpened',
+    'size': 'size',
+    'kind': 'kind',
+    'label': 'label',
+  }
+
+  icvp = {
+    'viewOptionsVersion': 1,
+    'backgroundType': 0,
+    'backgroundColorRed': 1.0,
+    'backgroundColorGreen': 1.0,
+    'backgroundColorBlue': 1.0,
+    'gridOffsetX': float(options['grid_offset'][0]),
+    'gridOffsetY': float(options['grid_offset'][1]),
+    'gridSpacing': float(options['grid_spacing']),
+    'arrangeBy': str(arrange_options.get(options['arrange_by'], 'none')),
+    'showIconPreview': options['show_icon_preview'] == True,
+    'showItemInfo': options['show_item_info'] == True,
+    'labelOnBottom': options['label_pos'] == 'bottom',
+    'textSize': float(options['text_size']),
+    'iconSize': float(options['icon_size']),
+    'scrollPositionX': float(options['scroll_position'][0]),
+    'scrollPositionY': float(options['scroll_position'][1])
+  }
+
+  columns = {
+    'name': 'name',
+    'date-modified': 'dateModified',
+    'date-created': 'dateCreated',
+    'date-added': 'dateAdded',
+    'date-last-opened': 'dateLastOpened',
+    'size': 'size',
+    'kind': 'kind',
+    'label': 'label',
+    'version': 'version',
+    'comments': 'comments'
+  }
+
+  default_widths = {
+    'name': 300,
+    'date-modified': 181,
+    'date-created': 181,
+    'date-added': 181,
+    'date-last-opened': 181,
+    'size': 97,
+    'kind': 115,
+    'label': 100,
+    'version': 75,
+    'comments': 300,
+  }
+
+  default_sort_directions = {
+    'name': 'ascending',
+    'date-modified': 'descending',
+    'date-created': 'descending',
+    'date-added': 'descending',
+    'date-last-opened': 'descending',
+    'size': 'descending',
+    'kind': 'ascending',
+    'label': 'ascending',
+    'version': 'ascending',
+    'comments': 'ascending',
+  }
+
+  lsvp = {
+    'viewOptionsVersion': 1,
+    'sortColumn': columns.get(options['list_sort_by'], 'name'),
+    'textSize': float(options['list_text_size']),
+    'iconSize': float(options['list_icon_size']),
+    'showIconPreview': options['show_icon_preview'],
+    'scrollPositionX': options['list_scroll_position'][0],
+    'scrollPositionY': options['list_scroll_position'][1],
+    'useRelativeDates': options['list_use_relative_dates'],
+    'calculateAllSizes': options['list_calculate_all_sizes'],
+  }
+
+  lsvp['columns'] = {}
+  cndx = {}
+
+  for n, column in enumerate(options['list_columns']):
+    cndx[column] = n
+    width = options['list_column_widths'].get(column, default_widths[column])
+    asc = 'ascending' == options['list_column_sort_directions'].get(column, default_sort_directions[column])
+
+    lsvp['columns'][columns[column]] = {
+      'index': n,
+      'width': width,
+      'identifier': columns[column],
+      'visible': True,
+      'ascending': asc
+    }
+
+  n = len(options['list_columns'])
+  for k in iterkeys(columns):
+    if cndx.get(k, None) is None:
+      cndx[k] = n
+      width = default_widths[k]
+      asc = 'ascending' == default_sort_directions[k]
+
+    lsvp['columns'][columns[column]] = {
+      'index': n,
+      'width': width,
+      'identifier': columns[column],
+      'visible': False,
+      'ascending': asc
+    }
+
+    n += 1
+
+  default_view = options['default_view']
+  views = {
+    'icon-view': b'icnv',
+    'column-view': b'clmv',
+    'list-view': b'Nlsv',
+    'coverflow': b'Flwv'
+  }
+
+  icvl = (b'type', views.get(default_view, 'icnv'))
+
+  include_icon_view_settings = default_view == 'icon-view' \
+                               or options['include_icon_view_settings'] not in \
+                               ('auto', 'no', 0, False, None)
+  include_list_view_settings = default_view in ('list-view', 'coverflow') \
+                               or options['include_list_view_settings'] not in \
+                               ('auto', 'no', 0, False, None)
+
+  try:
+    background_bmk = None
+
+    background_color = os.environ.get('backgroundColor')
+    background_file = os.environ.get('backgroundFile')
+
+    if background_color:
+      c = parseColor(background_color).to_rgb()
+
+      icvp['backgroundType'] = 1
+      icvp['backgroundColorRed'] = float(c.r)
+      icvp['backgroundColorGreen'] = float(c.g)
+      icvp['backgroundColorBlue'] = float(c.b)
+    elif background_file:
+      alias = Alias.for_file(background_file)
+      background_bmk = Bookmark.for_file(background_file)
+
+      icvp['backgroundType'] = 2
+      icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
+
+    image_dsstore = os.path.join(os.environ['volumePath'], '.DS_Store')
+
+    f =  "icon_locations = {\n" + os.environ['iconLocations'] + "\n}"
+    exec (f, options, options)
+
+    with DSStore.open(image_dsstore, 'w+') as d:
+      d['.']['vSrn'] = ('long', 1)
+      d['.']['bwsp'] = bwsp
+      if include_icon_view_settings:
+        d['.']['icvp'] = icvp
+        if background_bmk:
+          d['.']['pBBk'] = background_bmk
+      if include_list_view_settings:
+        d['.']['lsvp'] = lsvp
+      d['.']['icvl'] = icvl
+
+      d['.background']['Iloc'] = (2560, 170)
+      d['.DS_Store']['Iloc'] = (2610, 170)
+      d['.fseventsd']['Iloc'] = (2660, 170)
+      d['.Trashes']['Iloc'] = (2710, 170)
+      d['.VolumeIcon.icns']['Iloc'] = (2760, 170)
+
+      for k, v in iteritems(options['icon_locations']):
+        d[k]['Iloc'] = v
+  except:
+    raise
+
+build_dmg()
\ No newline at end of file
diff --git a/packages/dmg-builder/vendor/dmgbuild/resources.py b/packages/dmg-builder/vendor/dmgbuild/resources.py
deleted file mode 100644
index d2f58e64a4d..00000000000
--- a/packages/dmg-builder/vendor/dmgbuild/resources.py
+++ /dev/null
@@ -1,355 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import struct
-
-class Resource (object):
-    def __init__(self, res_type, res_id, res_name, data=None, res_attrs=0):
-        self.res_type = str(res_type)
-        self.res_id = res_id
-        if isinstance(res_name, basestring):
-            res_name = str(res_name)
-        self.res_name = res_name
-        self.res_attrs = res_attrs
-        if data is None:
-            self.data = None
-        self.data = str(data)
-
-        self.data_offset = None
-        self.name_offset = None
-
-    def __repr__(self):
-        return 'Resource(%r, %r, %r, data=%r, res_attrs=%r)' % (self.res_type,
-                                                                self.res_id,
-                                                                self.res_name,
-                                                                self.data,
-                                                                self.res_attrs)
-
-class TMPLResource (Resource):
-    def __init__(self, res_id, res_name, tmpl, res_attrs=0):
-        data = []
-        for name,typecode in tmpl:
-            data.append(struct.pack(b'B', len(name)))
-            data.append(str(name))
-            data.append(str(typecode))
-        super(TMPLResource, self).__init__(b'TMPL', res_id, res_name,
-                                           b''.join(data), res_attrs)
-
-class StringListResource (Resource):
-    def __init__(self, res_id, res_name, strings, res_attrs=0):
-        data = []
-        data.append(struct.pack(b'>H', len(strings)))
-        for s in strings:
-            data.append(struct.pack(b'B', len(s)))
-            data.append(str(s))
-        super(StringListResource, self).__init__(b'STR#', res_id, res_name,
-                                                 b''.join(data), res_attrs)
-
-class TextResource (Resource):
-    def __init__(self, res_id, res_name, string, res_attrs=0):
-        super(TextResource, self).__init__(b'TEXT', res_id, res_name,
-                                           str(string), res_attrs)
-
-class Style (object):
-    # Fonts
-    NewYork      = 2
-    Geneva       = 3
-    Monaco       = 4
-    Venice       = 5
-    London       = 6
-    Athens       = 7
-    SanFrancisco = 8
-    Toronto      = 9
-    Cairo        = 11
-    LosAngeles   = 12
-    Times        = 20
-    Helvetica    = 21
-    Courier      = 22
-    Symbol       = 23
-    Mobile       = 24
-
-    # Styles
-    Bold       = 0x0100
-    Italic     = 0x0200
-    Underline  = 0x0400
-    Outline    = 0x0800
-    Shadow     = 0x1000
-    Condense   = 0x2000
-    Expand     = 0x4000
-
-    def __init__(self, start_character, height, ascent, font_id, face,
-                 size, color):
-        self.start_character = start_character
-        self.height = height
-        self.ascent = ascent
-        self.font_id = font_id
-        self.face = face
-        self.size = size
-        self.color = color
-
-    def __repr__(self):
-        styles = []
-        if self.face & Style.Bold:
-            styles.append('Style.Bold')
-        if self.face & Style.Italic:
-            styles.append('Style.Italic')
-        if self.face & Style.Underline:
-            styles.append('Style.Underline')
-        if self.face & Style.Outline:
-            styles.append('Style.Outline')
-        if self.face & Style.Shadow:
-            styles.append('Style.Shadow')
-        if self.face & Style.Condense:
-            styles.append('Style.Condense')
-        if self.face & Style.Expand:
-            styles.append('Style.Expand')
-        if self.face & ~0x4f00:
-            styles.append('%#06x' % (self.face & ~0x4f00))
-        if styles:
-            styles = '|'.join(styles)
-        else:
-            styles = '0'
-
-        font_revmap = {
-             2: 'Style.NewYork',
-             3: 'Style.Geneva',
-             4: 'Style.Monaco',
-             5: 'Style.Venice',
-             6: 'Style.London',
-             7: 'Style.Athens',
-             8: 'Style.SanFrancisco',
-             9: 'Style.Toronto',
-            11: 'Style.Cairo',
-            12: 'Style.LosAngeles',
-            20: 'Style.Times',
-            21: 'Style.Helvetica',
-            22: 'Style.Courier',
-            23: 'Style.Symbol',
-            24: 'Style.Mobile'
-        }
-
-        font = font_revmap.get(self.font_id, '%s' % self.font_id)
-
-        return 'Style(%r, %r, %r, %s, %s, %r, %r)' % (
-            self.start_character,
-            self.height,
-            self.ascent,
-            font,
-            styles,
-            self.size,
-            self.color)
-
-class StyleResource (Resource):
-    def __init__(self, res_id, res_name, styles, res_attrs=0):
-        data = []
-        data.append(struct.pack(b'>H', len(styles)))
-        for style in styles:
-            data.append(struct.pack(b'>LHHHHHHHH',
-                                    style.start_character,
-                                    style.height,
-                                    style.ascent,
-                                    style.font_id,
-                                    style.face,
-                                    style.size,
-                                    style.color[0],
-                                    style.color[1],
-                                    style.color[2]))
-        super(StyleResource, self).__init__(b'styl', res_id, res_name,
-                                            b''.join(data), res_attrs)
-
-class ResourceFork (object):
-    def __init__(self, resources=None):
-        self.types = {}
-        self.attrs = 0
-        if resources is not None:
-            for res in resources:
-                self.add(res)
-
-    @classmethod
-    def from_data(clss, data):
-        if len(data) < 16:
-            raise ValueError('Bad resource data - data too short')
-
-        # Read the header
-        data_start, map_start, data_len, map_len = struct.unpack(b'>LLLL',
-                                                                 data[0:16])
-
-        if data_start + data_len > len(data):
-            raise ValueError('Bad resource data - data out of range')
-        if map_start + map_len > len(data):
-            raise ValueError('Bad resource data - map out of range')
-        if map_len < 30:
-            raise ValueError('Bad resource data - map too short')
-
-        # Read the map header
-        fork_attrs, type_offset, name_offset, max_type_ndx \
-            = struct.unpack(b'>HHHH', data[map_start + 22:map_start + 30])
-        num_types = max_type_ndx + 1
-
-        if type_offset + 8 * num_types > map_len:
-            raise ValueError('Bad resource data - type data outside map')
-
-        if name_offset > map_len:
-            raise ValueError('Bad resource data - names outside map')
-
-        type_offset += map_start
-        name_offset += map_start
-
-        result = ResourceFork()
-
-        # Now read the type list
-        for ntype in range(0, num_types):
-            type_pos = 2 + type_offset + 8 * ntype
-            res_type, max_item_ndx, ref_offset \
-                = struct.unpack(b'>4sHH', data[type_pos:type_pos+8])
-            num_items = max_item_ndx + 1
-
-            result.types[res_type] = []
-
-            ref_list_offset = type_offset + ref_offset
-            if ref_list_offset + 12 * num_items > map_start + map_len:
-                raise ValueError('Bad resource data - ref list outside map')
-
-            for nitem in range(0, num_items):
-                ref_elt = ref_list_offset + 12 * nitem
-                res_id, res_name_offset, data_offset \
-                    = struct.unpack(b'>hHL', data[ref_elt:ref_elt+8])
-
-                res_attrs = data_offset >> 24
-                data_offset &= 0xffffff
-
-                if data_offset >= data_len:
-                    raise ValueError('Bad resource data - item data out of range')
-
-                data_offset += data_start
-                res_len = struct.unpack(b'>L', data[data_offset:data_offset+4])[0]
-                if data_offset + res_len >= data_start + data_len:
-                    raise ValueError('Bad resource data - item data too large')
-
-                res_data = data[data_offset + 4:data_offset + res_len + 4]
-
-                if res_name_offset == 0xffff:
-                    res_name = None
-                else:
-                    res_name_offset += name_offset
-                    if res_name_offset >= map_start + map_len:
-                        raise ValueError('Bad resource data - name out of range')
-                    res_name_len = struct.unpack(b'B', data[res_name_offset])[0]
-                    res_name = data[res_name_offset + 1:res_name_offset + res_name_len + 1]
-
-                result.types[res_type].append(Resource(res_type, res_id,
-                                                       res_name,
-                                                       res_data, res_attrs))
-
-        return result
-
-    @classmethod
-    def from_file(clss, filename):
-        with open(filename + '/..namedfork/rsrc', 'rb') as f:
-            data = f.read()
-        return clss.from_data(data)
-
-    def to_data(self):
-        data = []
-        data_len = 0
-        names = []
-        names_len = 0
-        types_len = len(self.types) * 8
-        types_data = []
-        reflist_data = []
-        reflist_len = 0
-
-        for res_type, items in self.types.items():
-            types_data.append(struct.pack(b'>4sHH',
-                                          res_type,
-                                          len(items) - 1,
-                                          2 + types_len + reflist_len))
-            for item in items:
-                data_offset = data_len
-
-                if item.res_name is None:
-                    name_offset = 65535
-                else:
-                    name_offset = names_len
-                    n = str(item.res_name)
-                    names.append(struct.pack(b'B', len(n)) + n)
-                    names_len += 1 + len(n)
-
-                if item.data is None:
-                    data_len += 4
-                else:
-                    data_len += 4 + (len(item.data) + 3) & ~3
-
-                reflist_len += 12
-                reflist_data.append(struct.pack(b'>hHLL',
-                                                item.res_id,
-                                                name_offset,
-                                                (item.res_attrs << 24) \
-                                                | data_offset,
-                                                0))
-
-        # Header
-        data.append(struct.pack(b'>LLLL240s', 256, 256 + data_len, data_len,
-                                30 + types_len + reflist_len + names_len,
-                                b''))
-
-        # Resource data
-        for res_type, items in self.types.items():
-            for item in items:
-                if item.data is None:
-                    dlen = 0
-                else:
-                    dlen = len(item.data)
-                plen = (dlen + 3) & ~3
-                data.append(struct.pack(b'>L', dlen))
-                if item.data is not None:
-                    data.append(item.data)
-                if plen != dlen:
-                    data.append(b'\0' * (plen - dlen))
-
-        # Resource map header
-        data.append(struct.pack(b'>16sLHHHHH',
-                                b'', 0, 0,
-                                self.attrs, 28, 30 + types_len + reflist_len,
-                                len(self.types) - 1))
-
-        # Type list
-        data.append(b''.join(types_data))
-
-        # Reference lists
-        data.append(b''.join(reflist_data))
-
-        # Name list
-        data.append(b''.join(names))
-
-        return b''.join(data)
-
-    def write_to_file(self, filename):
-        with open(filename + '/..namedfork/rsrc', 'wb') as f:
-            f.write(self.to_data())
-
-    def __len__(self):
-        return len(self.types)
-
-    def __getitem__(self, key):
-        return self.types[key]
-
-    def __iter__(self):
-        for res_type, items in self.types.items():
-            for item in items:
-                yield item
-
-    def __repr__(self):
-        output = []
-        for item in self:
-            output.append(repr(item))
-        return 'ResourceFork([%s])' % ', '.join(output)
-
-    def add(self, res):
-        if res.res_type in self.types:
-            self.types[res.res_type].append(res)
-        else:
-            self.types[res.res_type] = [res]
-
-    def remove(self, res):
-        self.types[res.res_type].remove(res)
diff --git a/packages/dmg-builder/vendor/ds_store/store.py b/packages/dmg-builder/vendor/ds_store/store.py
index b6f805b24c1..93f02e04fba 100644
--- a/packages/dmg-builder/vendor/ds_store/store.py
+++ b/packages/dmg-builder/vendor/ds_store/store.py
@@ -1146,7 +1146,7 @@ def delete(self, filename, code):
 
     # Find implementation
     def _find(self, node, filename_lc, code=None):
-        if not isinstance(code, bytes):
+        if code is not None and not isinstance(code, bytes):
             code = code.encode('latin_1')
         with self._get_block(node) as block:
             next_node, count = block.read(b'>II')
diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
index e58bff1686e..7343604859f 100644
--- a/packages/electron-builder/package.json
+++ b/packages/electron-builder/package.json
@@ -51,7 +51,7 @@
     "builder-util": "0.0.0-semantic-release",
     "fs-extra": "^8.1.0",
     "is-ci": "^2.0.0",
-    "read-config-file": "4.0.1",
+    "read-config-file": "5.0.0",
     "sanitize-filename": "^1.6.1",
     "update-notifier": "^3.0.1",
     "yargs": "^13.3.0",
diff --git a/test/fixtures/test-app-one/index.js b/test/fixtures/test-app-one/index.js
index 4f7c0c82e7d..63280cc3705 100644
--- a/test/fixtures/test-app-one/index.js
+++ b/test/fixtures/test-app-one/index.js
@@ -4,11 +4,6 @@ const { app, ipcMain, BrowserWindow, Menu, Tray } = require("electron")
 const fs = require("fs")
 const path = require("path")
 
-if (handleSquirrelEvent()) {
-  // squirrel event handled and app will exit in 1000ms, so don't do anything else
-  return;
-}
-
 function handleSquirrelEvent() {
   if (process.argv.length === 1) {
     return false;
@@ -107,31 +102,40 @@ function createWindow () {
   });
 }
 
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-app.on('ready', createWindow);
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On MacOS it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit();
+function main() {
+  if (handleSquirrelEvent()) {
+    // squirrel event handled and app will exit in 1000ms, so don't do anything else
+    return;
   }
-});
 
-app.on("activate", function () {
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
+  // This method will be called when Electron has finished
+  // initialization and is ready to create browser windows.
+  app.on('ready', createWindow);
 
-ipcMain.on("saveAppData", () => {
-  try {
-    // electron doesn't escape / in the product name
-    fs.writeFileSync(path.join(app.getPath("appData"), "Test App ßW", "testFile"), "test")
-  }
-  catch (e) {
-    mainWindow.webContents.executeJavaScript(`console.log(\`userData: ${e}\`)`)
-  }
-})
\ No newline at end of file
+  // Quit when all windows are closed.
+  app.on('window-all-closed', function () {
+    // On MacOS it is common for applications and their menu bar
+    // to stay active until the user quits explicitly with Cmd + Q
+    if (process.platform !== 'darwin') {
+      app.quit();
+    }
+  });
+
+  app.on("activate", function () {
+    if (mainWindow === null) {
+      createWindow()
+    }
+  })
+
+  ipcMain.on("saveAppData", () => {
+    try {
+      // electron doesn't escape / in the product name
+      fs.writeFileSync(path.join(app.getPath("appData"), "Test App ßW", "testFile"), "test")
+    }
+    catch (e) {
+      mainWindow.webContents.executeJavaScript(`console.log(\`userData: ${e}\`)`)
+    }
+  })
+}
+
+main()
\ No newline at end of file
diff --git a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js
index c3f858036c9..c7e706aa9db 100644
--- a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js
+++ b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js
@@ -4,73 +4,6 @@ const { app, ipcMain, BrowserWindow, Menu, Tray } = require("electron")
 const fs = require("fs")
 const path = require("path")
 
-// this should be placed at top of main.js to handle setup events quickly
-if (handleSquirrelEvent()) {
-  // squirrel event handled and app will exit in 1000ms, so don't do anything else
-  return;
-}
-
-function handleSquirrelEvent() {
-  if (process.argv.length === 1) {
-    return false;
-  }
-
-  const ChildProcess = require('child_process');
-
-  const appFolder = path.resolve(process.execPath, '..');
-  const rootAtomFolder = path.resolve(appFolder, '..');
-  const updateDotExe = path.resolve(path.join(rootAtomFolder, 'Update.exe'));
-  const exeName = path.basename(process.execPath);
-
-  const spawn = function(command, args) {
-    let spawnedProcess, error;
-
-    try {
-      spawnedProcess = ChildProcess.spawn(command, args, {detached: true});
-    } catch (error) {}
-
-    return spawnedProcess;
-  };
-
-  const spawnUpdate = function(args) {
-    return spawn(updateDotExe, args);
-  };
-
-  const squirrelEvent = process.argv[1];
-  switch (squirrelEvent) {
-    case '--squirrel-install':
-    case '--squirrel-updated':
-      // Optionally do things such as:
-      // - Add your .exe to the PATH
-      // - Write to the registry for things like file associations and
-      //   explorer context menus
-
-      // Install desktop and start menu shortcuts
-      spawnUpdate(['--createShortcut', exeName]);
-
-      setTimeout(app.quit, 1000);
-      return true;
-
-    case '--squirrel-uninstall':
-      // Undo anything you did in the --squirrel-install and
-      // --squirrel-updated handlers
-
-      // Remove desktop and start menu shortcuts
-      spawnUpdate(['--removeShortcut', exeName]);
-
-      setTimeout(app.quit, 1000);
-      return true;
-
-    case '--squirrel-obsolete':
-      // This is called on the outgoing version of your app before
-      // we update to the new version - it's the opposite of
-      // --squirrel-updated
-
-      app.quit();
-      return true;
-  }
-}
-
 // Module to control application life.
 // Module to create native browser window.
 
diff --git a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js
index c3f858036c9..c7e706aa9db 100644
--- a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js
+++ b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js
@@ -4,73 +4,6 @@ const { app, ipcMain, BrowserWindow, Menu, Tray } = require("electron")
 const fs = require("fs")
 const path = require("path")
 
-// this should be placed at top of main.js to handle setup events quickly
-if (handleSquirrelEvent()) {
-  // squirrel event handled and app will exit in 1000ms, so don't do anything else
-  return;
-}
-
-function handleSquirrelEvent() {
-  if (process.argv.length === 1) {
-    return false;
-  }
-
-  const ChildProcess = require('child_process');
-
-  const appFolder = path.resolve(process.execPath, '..');
-  const rootAtomFolder = path.resolve(appFolder, '..');
-  const updateDotExe = path.resolve(path.join(rootAtomFolder, 'Update.exe'));
-  const exeName = path.basename(process.execPath);
-
-  const spawn = function(command, args) {
-    let spawnedProcess, error;
-
-    try {
-      spawnedProcess = ChildProcess.spawn(command, args, {detached: true});
-    } catch (error) {}
-
-    return spawnedProcess;
-  };
-
-  const spawnUpdate = function(args) {
-    return spawn(updateDotExe, args);
-  };
-
-  const squirrelEvent = process.argv[1];
-  switch (squirrelEvent) {
-    case '--squirrel-install':
-    case '--squirrel-updated':
-      // Optionally do things such as:
-      // - Add your .exe to the PATH
-      // - Write to the registry for things like file associations and
-      //   explorer context menus
-
-      // Install desktop and start menu shortcuts
-      spawnUpdate(['--createShortcut', exeName]);
-
-      setTimeout(app.quit, 1000);
-      return true;
-
-    case '--squirrel-uninstall':
-      // Undo anything you did in the --squirrel-install and
-      // --squirrel-updated handlers
-
-      // Remove desktop and start menu shortcuts
-      spawnUpdate(['--removeShortcut', exeName]);
-
-      setTimeout(app.quit, 1000);
-      return true;
-
-    case '--squirrel-obsolete':
-      // This is called on the outgoing version of your app before
-      // we update to the new version - it's the opposite of
-      // --squirrel-updated
-
-      app.quit();
-      return true;
-  }
-}
-
 // Module to control application life.
 // Module to create native browser window.
 
diff --git a/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js b/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js
index c3f858036c9..c7e706aa9db 100644
--- a/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js
+++ b/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js
@@ -4,73 +4,6 @@ const { app, ipcMain, BrowserWindow, Menu, Tray } = require("electron")
 const fs = require("fs")
 const path = require("path")
 
-// this should be placed at top of main.js to handle setup events quickly
-if (handleSquirrelEvent()) {
-  // squirrel event handled and app will exit in 1000ms, so don't do anything else
-  return;
-}
-
-function handleSquirrelEvent() {
-  if (process.argv.length === 1) {
-    return false;
-  }
-
-  const ChildProcess = require('child_process');
-
-  const appFolder = path.resolve(process.execPath, '..');
-  const rootAtomFolder = path.resolve(appFolder, '..');
-  const updateDotExe = path.resolve(path.join(rootAtomFolder, 'Update.exe'));
-  const exeName = path.basename(process.execPath);
-
-  const spawn = function(command, args) {
-    let spawnedProcess, error;
-
-    try {
-      spawnedProcess = ChildProcess.spawn(command, args, {detached: true});
-    } catch (error) {}
-
-    return spawnedProcess;
-  };
-
-  const spawnUpdate = function(args) {
-    return spawn(updateDotExe, args);
-  };
-
-  const squirrelEvent = process.argv[1];
-  switch (squirrelEvent) {
-    case '--squirrel-install':
-    case '--squirrel-updated':
-      // Optionally do things such as:
-      // - Add your .exe to the PATH
-      // - Write to the registry for things like file associations and
-      //   explorer context menus
-
-      // Install desktop and start menu shortcuts
-      spawnUpdate(['--createShortcut', exeName]);
-
-      setTimeout(app.quit, 1000);
-      return true;
-
-    case '--squirrel-uninstall':
-      // Undo anything you did in the --squirrel-install and
-      // --squirrel-updated handlers
-
-      // Remove desktop and start menu shortcuts
-      spawnUpdate(['--removeShortcut', exeName]);
-
-      setTimeout(app.quit, 1000);
-      return true;
-
-    case '--squirrel-obsolete':
-      // This is called on the outgoing version of your app before
-      // we update to the new version - it's the opposite of
-      // --squirrel-updated
-
-      app.quit();
-      return true;
-  }
-}
-
 // Module to control application life.
 // Module to create native browser window.
 
diff --git a/test/out/__snapshots__/BuildTest.js.snap b/test/out/__snapshots__/BuildTest.js.snap
index 8f6b8c36362..6052315e62e 100644
--- a/test/out/__snapshots__/BuildTest.js.snap
+++ b/test/out/__snapshots__/BuildTest.js.snap
@@ -239,7 +239,7 @@ Object {
       "size": 841,
     },
     "index.js": Object {
-      "size": 4098,
+      "size": 4184,
     },
     "node_modules": Object {
       "files": Object {
@@ -1783,7 +1783,7 @@ Object {
       "size": 841,
     },
     "index.js": Object {
-      "size": 4098,
+      "size": 4184,
     },
     "node_modules": Object {
       "files": Object {
diff --git a/test/out/__snapshots__/configurationValidationTest.js.snap b/test/out/__snapshots__/configurationValidationTest.js.snap
index c151e2f9093..c6b84f7c55e 100644
--- a/test/out/__snapshots__/configurationValidationTest.js.snap
+++ b/test/out/__snapshots__/configurationValidationTest.js.snap
@@ -17,4 +17,23 @@ Object {
 }
 `;
 
-exports[`validation 1`] = `"ERR_CONFIG_INVALID"`;
+exports[`validation 1`] = `
+"Invalid configuration object. electron-builder 0.0.0-semantic-release has been initialised using a configuration object that does not match the API schema.
+ - configuration has an unknown property 'foo'. These properties are valid:
+   object { $schema?, afterAllArtifactBuild?, afterPack?, afterSign?, apk?, appId?, appImage?, appx?, artifactBuildCompleted?, artifactBuildStarted?, artifactName?, asar?, asarUnpack?, beforeBuild?, buildDependenciesFromSource?, buildVersion?, compression?, copyright?, cscKeyPassword?, cscLink?, deb?, detectUpdateChannel?, directories?, dmg?, electronCompile?, electronDist?, electronDownload?, electronUpdaterCompatibility?, electronVersion?, extends?, extraFiles?, extraMetadata?, extraResources?, fileAssociations?, files?, forceCodeSigning?, framework?, freebsd?, generateUpdatesFilesForAllChannels?, icon?, includePdb?, launchUiVersion?, linux?, mac?, mas?, msi?, muonVersion?, nodeGypRebuild?, nodeVersion?, npmArgs?, npmRebuild?, npmSkipBuildFromSource?, nsis?, nsisWeb?, onNodeModuleFile?, p5p?, pacman?, pkg?, portable?, productName?, protocols?, protonNodeVersion?, publish?, readonly?, releaseInfo?, remoteBuild?, removePackageScripts?, rpm?, snap?, squirrelWindows?, target?, win? }
+   -> Configuration Options
+     How to fix:
+     1. Open https://www.electron.build/configuration/configuration
+     2. Search the option name on the page (or type in into Search to find across the docs).
+       * Not found? The option was deprecated or not exists (check spelling).
+       * Found? Check that the option in the appropriate place. e.g. \\"title\\" only in the \\"dmg\\", not in the root.
+
+ - configuration.mac has an unknown property 'foo'. These properties are valid:
+   object { appId?, artifactName?, asar?, asarUnpack?, binaries?, bundleShortVersion?, bundleVersion?, category?, compression?, cscInstallerKeyPassword?, cscInstallerLink?, cscKeyPassword?, cscLink?, darkModeSupport?, hardenedRuntime?, gatekeeperAssess?, detectUpdateChannel?, electronLanguages?, electronUpdaterCompatibility?, entitlements?, entitlementsInherit?, extendInfo?, extraDistFiles?, extraFiles?, extraResources?, fileAssociations?, files?, forceCodeSigning?, generateUpdatesFilesForAllChannels?, helperBundleId?, icon?, identity?, minimumSystemVersion?, protocols?, provisioningProfile?, publish?, releaseInfo?, requirements?, target?, type? }
+     How to fix:
+     1. Open https://www.electron.build/configuration/mac
+     2. Search the option name on the page (or type in into Search to find across the docs).
+       * Not found? The option was deprecated or not exists (check spelling).
+       * Found? Check that the option in the appropriate place. e.g. \\"title\\" only in the \\"dmg\\", not in the root.
+"
+`;
diff --git a/test/out/__snapshots__/globTest.js.snap b/test/out/__snapshots__/globTest.js.snap
index 94f9e82974e..64799a8e6c0 100644
--- a/test/out/__snapshots__/globTest.js.snap
+++ b/test/out/__snapshots__/globTest.js.snap
@@ -98,7 +98,7 @@ Object {
 
 exports[`outside link 2`] = `
 Object {
-  "offset": "5195",
+  "offset": "5281",
   "size": 4,
 }
 `;
@@ -197,13 +197,13 @@ Object {
         "package.json": Object {
           "files": Object {
             "readme.md": Object {
-              "offset": "5277",
+              "offset": "5363",
               "size": 32,
             },
           },
         },
         "readme.md": Object {
-          "offset": "5199",
+          "offset": "5285",
           "size": 78,
         },
       },
@@ -236,7 +236,7 @@ Object {
                 "dir-3": Object {
                   "files": Object {
                     "file-in-asar": Object {
-                      "offset": "5197",
+                      "offset": "5283",
                       "size": 2,
                     },
                   },
@@ -250,7 +250,7 @@ Object {
           "unpacked": true,
         },
         "must-be-not-unpacked": Object {
-          "offset": "5195",
+          "offset": "5281",
           "size": 2,
         },
       },
@@ -261,10 +261,10 @@ Object {
     },
     "index.js": Object {
       "offset": "841",
-      "size": 4098,
+      "size": 4184,
     },
     "package.json": Object {
-      "offset": "4939",
+      "offset": "5025",
       "size": 256,
     },
   },
diff --git a/test/out/__snapshots__/protonTest.js.snap b/test/out/__snapshots__/protonTest.js.snap
index 46db83b8651..97e5474914f 100644
--- a/test/out/__snapshots__/protonTest.js.snap
+++ b/test/out/__snapshots__/protonTest.js.snap
@@ -5,7 +5,8 @@ Object {
   "linux": Array [
     Object {
       "arch": "x64",
-      "file": "notepad-1.0.0.AppImage",
+      "file": "Test App ßW-1.1.0.AppImage",
+      "safeArtifactName": "TestApp-1.1.0-x86_64.AppImage",
       "updateInfo": Object {
         "blockMapSize": "@blockMapSize",
         "sha512": "@sha512",
@@ -21,14 +22,16 @@ Object {
   "mac": Array [
     Object {
       "arch": "x64",
-      "file": "notepad-1.0.0.dmg",
+      "file": "Test App ßW-1.1.0.dmg",
+      "safeArtifactName": "TestApp-1.1.0.dmg",
       "updateInfo": Object {
         "sha512": "@sha512",
         "size": "@size",
       },
     },
     Object {
-      "file": "notepad-1.0.0.dmg.blockmap",
+      "file": "Test App ßW-1.1.0.dmg.blockmap",
+      "safeArtifactName": "TestApp-1.1.0.dmg.blockmap",
       "updateInfo": Object {
         "sha512": "@sha512",
         "size": "@size",
@@ -40,12 +43,13 @@ Object {
 
 exports[`mac 2`] = `
 Object {
-  "CFBundleDisplayName": "notepad",
-  "CFBundleExecutable": "notepad",
-  "CFBundleIconFile": "notepad.icns",
-  "CFBundleIdentifier": "com.proton-native.notepad",
-  "CFBundleName": "notepad",
-  "CFBundleShortVersionString": "1.0.0",
+  "CFBundleDisplayName": "Test App ßW",
+  "CFBundleExecutable": "Test App ßW",
+  "CFBundleIconFile": "Test App ßW.icns",
+  "CFBundleIdentifier": "org.electron-builder.testApp",
+  "CFBundleName": "Test App ßW",
+  "CFBundleShortVersionString": "1.1.0",
+  "LSApplicationCategoryType": "your.app.category.type",
   "NSHighResolutionCapable": true,
 }
 `;
@@ -55,16 +59,16 @@ Object {
   "win": Array [
     Object {
       "arch": "x64",
-      "file": "notepad Setup 1.0.0.exe",
-      "safeArtifactName": "notepad-Setup-1.0.0.exe",
+      "file": "Test App ßW Setup 1.1.0.exe",
+      "safeArtifactName": "TestApp-Setup-1.1.0.exe",
       "updateInfo": Object {
         "sha512": "@sha512",
         "size": "@size",
       },
     },
     Object {
-      "file": "notepad Setup 1.0.0.exe.blockmap",
-      "safeArtifactName": "notepad-Setup-1.0.0.exe.blockmap",
+      "file": "Test App ßW Setup 1.1.0.exe.blockmap",
+      "safeArtifactName": "TestApp-Setup-1.1.0.exe.blockmap",
       "updateInfo": Object {
         "sha512": "@sha512",
         "size": "@size",
@@ -79,16 +83,16 @@ Object {
   "win": Array [
     Object {
       "arch": "ia32",
-      "file": "notepad Setup 1.0.0.exe",
-      "safeArtifactName": "notepad-Setup-1.0.0.exe",
+      "file": "Test App ßW Setup 1.1.0.exe",
+      "safeArtifactName": "TestApp-Setup-1.1.0.exe",
       "updateInfo": Object {
         "sha512": "@sha512",
         "size": "@size",
       },
     },
     Object {
-      "file": "notepad Setup 1.0.0.exe.blockmap",
-      "safeArtifactName": "notepad-Setup-1.0.0.exe.blockmap",
+      "file": "Test App ßW Setup 1.1.0.exe.blockmap",
+      "safeArtifactName": "TestApp-Setup-1.1.0.exe.blockmap",
       "updateInfo": Object {
         "sha512": "@sha512",
         "size": "@size",
diff --git a/test/out/mac/__snapshots__/dmgTest.js.snap b/test/out/mac/__snapshots__/dmgTest.js.snap
index 131c4713223..0346c5fb0e0 100644
--- a/test/out/mac/__snapshots__/dmgTest.js.snap
+++ b/test/out/mac/__snapshots__/dmgTest.js.snap
@@ -1,5 +1,73 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`background color 1`] = `
+Object {
+  "backgroundColor": "orange",
+  "contents": Array [
+    Object {
+      "x": 130,
+      "y": 220,
+    },
+    Object {
+      "path": "/Applications",
+      "type": "link",
+      "x": 410,
+      "y": 220,
+    },
+  ],
+  "format": "UDRO",
+  "writeUpdateInfo": false,
+}
+`;
+
+exports[`background color 2`] = `
+Object {
+  "mac": Array [
+    Object {
+      "arch": "x64",
+      "file": "BackgroundColor-1.1.0.dmg",
+    },
+  ],
+}
+`;
+
+exports[`background color 3`] = `
+Object {
+  "CFBundleDisplayName": "BackgroundColor",
+  "CFBundleExecutable": "BackgroundColor",
+  "CFBundleIconFile": "BackgroundColor.icns",
+  "CFBundleIdentifier": "org.electron-builder.testApp",
+  "CFBundleInfoDictionaryVersion": "6.0",
+  "CFBundleName": "BackgroundColor",
+  "CFBundlePackageType": "APPL",
+  "CFBundleShortVersionString": "1.1.0",
+  "LSApplicationCategoryType": "your.app.category.type",
+  "NSAppTransportSecurity": Object {
+    "NSAllowsLocalNetworking": true,
+    "NSExceptionDomains": Object {
+      "127.0.0.1": Object {
+        "NSIncludesSubdomains": false,
+        "NSTemporaryExceptionAllowsInsecureHTTPLoads": true,
+        "NSTemporaryExceptionAllowsInsecureHTTPSLoads": false,
+        "NSTemporaryExceptionMinimumTLSVersion": "1.0",
+        "NSTemporaryExceptionRequiresForwardSecrecy": false,
+      },
+      "localhost": Object {
+        "NSIncludesSubdomains": false,
+        "NSTemporaryExceptionAllowsInsecureHTTPLoads": true,
+        "NSTemporaryExceptionAllowsInsecureHTTPSLoads": false,
+        "NSTemporaryExceptionMinimumTLSVersion": "1.0",
+        "NSTemporaryExceptionRequiresForwardSecrecy": false,
+      },
+    },
+  },
+  "NSHighResolutionCapable": true,
+  "NSMainNibFile": "MainMenu",
+  "NSPrincipalClass": "AtomApplication",
+  "NSSupportsAutomaticGraphicsSwitching": true,
+}
+`;
+
 exports[`bundleShortVersion 1`] = `
 Object {
   "mac": Array [
diff --git a/test/out/mac/__snapshots__/macArchiveTest.js.snap b/test/out/mac/__snapshots__/macArchiveTest.js.snap
index aba21fa2b5b..a44f54dc8f4 100644
--- a/test/out/mac/__snapshots__/macArchiveTest.js.snap
+++ b/test/out/mac/__snapshots__/macArchiveTest.js.snap
@@ -103,7 +103,25 @@ Object {
 }
 `;
 
-exports[`invalid target 1`] = `"ERR_CONFIG_INVALID"`;
+exports[`invalid target 1`] = `
+"Invalid configuration object. electron-builder 0.0.0-semantic-release has been initialised using a configuration object that does not match the API schema.
+ - configuration.mac should be one of these:
+   object { appId?, artifactName?, asar?, asarUnpack?, binaries?, bundleShortVersion?, bundleVersion?, category?, compression?, cscInstallerKeyPassword?, cscInstallerLink?, cscKeyPassword?, cscLink?, darkModeSupport?, hardenedRuntime?, gatekeeperAssess?, detectUpdateChannel?, electronLanguages?, electronUpdaterCompatibility?, entitlements?, entitlementsInherit?, extendInfo?, extraDistFiles?, extraFiles?, extraResources?, fileAssociations?, files?, forceCodeSigning?, generateUpdatesFilesForAllChannels?, helperBundleId?, icon?, identity?, minimumSystemVersion?, protocols?, provisioningProfile?, publish?, releaseInfo?, requirements?, target?, type? } | null
+   -> Options related to how build macOS targets.
+   Details:
+    * configuration.mac.target[0] should be an object:
+      object { target, arch? }
+    * configuration.mac.target[0] should be one of these:
+      \\"7z\\" | \\"default\\" | \\"dir\\" | \\"dmg\\" | \\"mas\\" | \\"mas-dev\\" | \\"pkg\\" | \\"tar.bz2\\" | \\"tar.gz\\" | \\"tar.lz\\" | \\"tar.xz\\" | \\"zip\\"
+    * configuration.mac.target[0] should be one of these:
+      object { target, arch? } | \\"7z\\" | \\"default\\" | \\"dir\\" | \\"dmg\\" | \\"mas\\" | \\"mas-dev\\" | \\"pkg\\" | \\"tar.bz2\\" | \\"tar.gz\\" | \\"tar.lz\\" | \\"tar.xz\\" | \\"zip\\"
+     How to fix:
+     1. Open https://www.electron.build/configuration/mac
+     2. Search the option name on the page (or type in into Search to find across the docs).
+       * Not found? The option was deprecated or not exists (check spelling).
+       * Found? Check that the option in the appropriate place. e.g. \\"title\\" only in the \\"dmg\\", not in the root.
+"
+`;
 
 exports[`only zip 1`] = `
 Object {
diff --git a/test/src/mac/dmgTest.ts b/test/src/mac/dmgTest.ts
index 25e81a31c1e..cb12ea12d0b 100644
--- a/test/src/mac/dmgTest.ts
+++ b/test/src/mac/dmgTest.ts
@@ -31,6 +31,28 @@ test.ifMac("no build directory", app({
   projectDirCreated: projectDir => remove(path.join(projectDir, "build")),
 }))
 
+test.ifMac("background color", app({
+  targets: Platform.MAC.createTarget("dmg"),
+  config: {
+    // dmg can mount only one volume name, so, to test in parallel, we set different product name
+    productName: "BackgroundColor",
+    publish: null,
+    dmg: {
+      backgroundColor: "orange",
+      // speed-up test
+      writeUpdateInfo: false,
+    },
+  },
+  effectiveOptionComputed: async it => {
+    if (!("volumePath" in it)) {
+      return false
+    }
+    delete it.specification.icon
+    expect(it.specification).toMatchSnapshot()
+    return false
+  },
+}))
+
 test.ifMac("custom background - new way", () => {
   const customBackground = "customBackground.png"
   return assertPack("test-app-one", {
@@ -43,6 +65,8 @@ test.ifMac("custom background - new way", () => {
       dmg: {
         background: customBackground,
         icon: "foo.icns",
+        // speed-up test
+        writeUpdateInfo: false,
       },
     },
     effectiveOptionComputed: async it => {
diff --git a/test/src/protonTest.ts b/test/src/protonTest.ts
index 4cc20591256..cfbdb6e2163 100644
--- a/test/src/protonTest.ts
+++ b/test/src/protonTest.ts
@@ -15,27 +15,27 @@ const checkOptions: AssertPackOptions = {
 test.ifAll.ifMac("mac", app({
   targets: Platform.MAC.createTarget(),
   config: {
-    protonNodeVersion: "current",
+    framework: "proton",
   },
 }, checkOptions))
 
 test.ifAll.ifLinuxOrDevMac("linux", app({
   targets: Platform.LINUX.createTarget("appimage"),
   config: {
-    protonNodeVersion: "current",
+    framework: "proton",
   },
 }, checkOptions))
 
 test.ifAll.ifDevOrWinCi("win", app({
   targets: Platform.WINDOWS.createTarget("nsis"),
   config: {
-    protonNodeVersion: "current",
+    framework: "proton",
   },
 }, checkOptions))
 
 test.ifAll.ifDevOrWinCi("win ia32", app({
   targets: Platform.WINDOWS.createTarget("nsis", Arch.ia32),
   config: {
-    protonNodeVersion: "current",
+    framework: "proton",
   },
 }, checkOptions))
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index b660328c30d..3903115c154 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1326,12 +1326,12 @@ acorn@^6.0.1:
   resolved "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3"
   integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==
 
-ajv-keywords@^3.4.1:
+ajv-keywords@^3.1.0:
   version "3.4.1"
   resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.10.1, ajv@^6.5.5:
+ajv@^6.1.0, ajv@^6.5.5:
   version "6.10.2"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
   integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
@@ -1390,10 +1390,10 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-builder-bin@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.4.0.tgz#620d7f941dad157206c267bb0b437fee43889b33"
-  integrity sha512-ZyQqfFnyjAmXep29PmuMIu2KvGlfHiziz2/I38zOFe5kqnkMqeNNn/qmnwD6wdCKKeHqBuZtoWQnft8q0YyLpw==
+app-builder-bin@3.4.1:
+  version "3.4.1"
+  resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.4.1.tgz#81a9268b8ec2fedd1e787052cbfd7ed3f497ae30"
+  integrity sha512-zyNWkkzxTtojn+kg0h9lr3IywicYfocEbJi35YkaVUsP1W5HkbIr+Ld1PoEuUJVrErNQAcLrv3KaXNL5BJLwwQ==
 
 aproba@^1.0.3:
   version "1.2.0"
@@ -1967,11 +1967,6 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
-color-convert@~0.5.0:
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
-  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
-
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
@@ -4111,9 +4106,9 @@ lodash.union@^4.6.0:
   integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
 
 lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14:
-  version "4.17.14"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
-  integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
+  version "4.17.15"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
 loose-envify@^1.0.0:
   version "1.4.0"
@@ -4731,13 +4726,6 @@ pako@^1.0.10:
   resolved "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
   integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
-parse-color@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz#7b748b95a83f03f16a94f535e52d7f3d94658619"
-  integrity sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=
-  dependencies:
-    color-convert "~0.5.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -4945,13 +4933,11 @@ react-is@^16.8.4:
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
-read-config-file@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/read-config-file/-/read-config-file-4.0.1.tgz#ece5f6b1a5e6a46d0d93fdd0339f2f60ab892776"
-  integrity sha512-5caED3uo2IAZMPcbh/9hx/O29s2430RLxtnFDdzxpH/epEpawOrQnGBHueotIXUrGPPIgdNQN+S/CIp2WmiSfw==
+read-config-file@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/read-config-file/-/read-config-file-5.0.0.tgz#1487c983fae9c1b672d3acda5cac899a2d451f02"
+  integrity sha512-jIKUu+C84bfnKxyJ5j30CxCqgXWYjZLXuVE/NYlMEpeni+dhESgAeZOZd0JZbg1xTkMmnCdxksDoarkOyfEsOg==
   dependencies:
-    ajv "^6.10.1"
-    ajv-keywords "^3.4.1"
     dotenv "^8.0.0"
     dotenv-expand "^5.1.0"
     fs-extra "^8.1.0"
@@ -5302,6 +5288,14 @@ sax@^1.2.4:
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
+schema-utils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.0.1.tgz#1eec2e059556af841b7f3a83b61af13d7a3f9196"
+  integrity sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"