upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Build directory-based binary for macOS to avoid Gatekeeper delays

Browse source 
backport of #5302.
This commit is contained in:
Thomas Waldmann 2020-09-25 02:51:32 +02:00
parent 89755d83a5
commit 734b1a7b80
2 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Vagrantfile vendored
View file

@ -60,23 +60,15 @@ def packages_darwin
# install all the (security and other) updates
sudo softwareupdate --ignore iTunesX
sudo softwareupdate --ignore iTunes
sudo softwareupdate --ignore Safari
sudo softwareupdate --ignore "Install macOS High Sierra"
sudo softwareupdate --install --all
# get osxfuse 3.x release code from github:
curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.10.4/osxfuse-3.10.4.dmg >osxfuse.dmg
MOUNTDIR=$(echo `hdiutil mount osxfuse.dmg | tail -1 | awk '{$1="" ; print $0}'` | xargs -0 echo) \
&& sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for macOS 3.10.4.pkg" -target /
sudo chown -R vagrant /usr/local # brew must be able to create stuff here
which brew || ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
which brew || CI=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
brew update > /dev/null
brew install pkg-config || brew upgrade pkg-config
brew install readline || brew upgrade readline
brew install openssl@1.1 || brew upgrade openssl@1.1
brew install zstd || brew upgrade zstd
brew install lz4 || brew upgrade lz4
brew install xz || brew upgrade xz # required for python lzma module
brew install fakeroot || brew upgrade fakeroot
brew install git || brew upgrade git
brew install pkg-config readline openssl@1.1 zstd lz4 xz fakeroot git
brew tap homebrew/cask
brew cask install osxfuse
brew upgrade # upgrade everything
echo 'export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig' >> ~vagrant/.bash_profile
EOF
end
@ -307,6 +299,7 @@ def build_binary_with_pyinstaller(boxname)
cd borg
pyinstaller --clean --distpath=/vagrant/borg scripts/borg.exe.spec
echo 'export PATH="/vagrant/borg:$PATH"' >> ~/.bash_profile
cd .. && tar -czvf borg.tgz borg-dir
EOF
end
@ -481,8 +474,9 @@ Vagrant.configure(2) do |config|
b.vm.box = "macos-sierra"
b.vm.provider :virtualbox do |v|
v.memory = 2048 + $wmem
v.customize ['modifyvm', :id, '--ostype', 'MacOS1012_64']
v.customize ['modifyvm', :id, '--ostype', 'MacOS_64']
v.customize ['modifyvm', :id, '--paravirtprovider', 'default']
v.customize ['modifyvm', :id, '--nested-hw-virt', 'on']
# Adjust CPU settings according to
# https://github.com/geerlingguy/macos-virtualbox-vm
v.customize ['modifyvm', :id, '--cpuidset',

33
scripts/borg.exe.spec
View file

@ -41,15 +41,24 @@ exe = EXE(pyz,
upx=True,
console=True )
if False:
# Enable this block to build a directory-based binary instead of
# a packed single file. This allows to easily look at all included
# files (e.g. without having to strace or halt the built binary
# and introspect /tmp).
coll = COLLECT(exe,
a.binaries,
a.zipfiles,
a.datas,
strip=False,
upx=True,
name='borg-dir')
# Build a directory-based binary in addition to a packed
# single file. This allows one to easily look at all included
# files (e.g. without having to strace or halt the built binary
# and introspect /tmp). Also avoids unpacking all libs when
# running the app, which is better for app signing on various OS.
slim_exe = EXE(pyz,
a.scripts,
exclude_binaries=True,
name='borg.exe',
debug=False,
strip=False,
upx=False,
console=True)
coll = COLLECT(slim_exe,
a.binaries,
a.zipfiles,
a.datas,
strip=False,
upx=False,
name='borg-dir')