diff --git a/doc/gitian-building.md b/doc/gitian-building.md --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -67,10 +67,10 @@ ```bash cd bitcoin-abc/contrib/gitian-builder -curl -LO https://storage.googleapis.com/f4936e83b2dcbca742be51fb9692b153/MacOSX10.11.sdk.tar.gz -echo "4732b52b5ebe300c8c91cbeed6d19d59c1ff9c56c7a1dd6cfa518b9c2c72abde MacOSX10.11.sdk.tar.gz" | sha256sum -c +curl -LO https://storage.googleapis.com/27cd7b2a42a430926cc621acdc3bda72a8ed2b0efc080e3/MacOSX10.14.sdk.tar.gz +echo "2322086a96349db832abbcadea493b79db843553a2e604163238d99fa058a286 MacOSX10.14.sdk.tar.gz" | sha256sum -c mkdir -p inputs -mv MacOSX10.11.sdk.tar.gz inputs +mv MacOSX10.14.sdk.tar.gz inputs ``` Alternatively, you can skip the macOS build by adding `--os=lw` below. diff --git a/doc/gitian-building/gitian-building-mac-os-sdk.md b/doc/gitian-building/gitian-building-mac-os-sdk.md --- a/doc/gitian-building/gitian-building-mac-os-sdk.md +++ b/doc/gitian-building/gitian-building-mac-os-sdk.md @@ -1,54 +1,27 @@ Gitian building Mac OS SDK ========================== -On the host machine, register for a free Apple [developer account](https://developer.apple.com/register/), then download the SDK [here](https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_7.3.1/Xcode_7.3.1.dmg). +On the host machine, register for a free Apple [developer account](https://developer.apple.com/register/), then download the SDK [here](https://download.developer.apple.com/Developer_Tools/Xcode_10.2.1/Xcode_10.2.1.xip). -MacOS host ----------- - -Using Mac OS X, you can mount the dmg, and then extract the SDK with: -``` - $ hdiutil attach Xcode_7.3.1.dmg - $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.11.sdk.tar.gz MacOSX10.11.sdk -``` - -Clean up the files you don't need: - -```sh -diskutil unmount /Volumes/Xcode -rm Xcode_7.3.1.dmg -``` - -Non-MacOS host: +Extract the SDK --------------- -Alternatively, you can use 7zip and SleuthKit to extract the files one by one. -The script [extract-osx-sdk.sh](https://github.com/Bitcoin-ABC/bitcoin-abc/blob/master/contrib/macdeploy/extract-osx-sdk.sh) automates this. First ensure -the dmg file is in the current directory, and then run the script. - -You may wish to delete the intermediate 5.hfs file and MacOSX10.11.sdk (the directory) when -you've confirmed the extraction succeeded. - -```bash -apt-get install p7zip-full sleuthkit -contrib/macdeploy/extract-osx-sdk.sh -rm -rf 5.hfs MacOSX10.11.sdk -``` +Follow [these instructions](../../contrib/macdeploy/README.md#SDK-Extraction) to extract the SDK archive from the download. Copy SDK to Gitian VM: ---------------------- Copy it to the Gitian VM and clean up, e.g.: ```bash -scp MacOSX10.11.sdk.tar.gz gitian: -rm MacOSX10.11.sdk.tar.gz +scp MacOSX10.14.sdk.tar.gz gitian: +rm MacOSX10.14.sdk.tar.gz ``` Login to the VM and: ```bash mkdir -p gitian-builder/inputs -mv MacOSX10.11.sdk.tar.gz gitian-builder/inputs +mv MacOSX10.14.sdk.tar.gz gitian-builder/inputs ``` Troubleshooting