status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: fetch macOS Homebrew bottles from GitHub Packages instead of bintray 

bintray (for open source) is shutting down permanently on May 1:

https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/

At this time downloading from GitHub Packages requires specifying a username
and personal acccess token, but it seems they don't have to be valid. For
example, in the changes to the Makefile I specified `_:_` as the username and
token.

Also, change the minimum macOS version from 10.13 to 10.14 since Homebrew
bottles are no longer built for 10.13 (High Sierra):

https://github.com/Homebrew/discussions/discussions/1264#discussioncomment-601544

Closes #1851
This commit is contained in:
Michael Bradley, Jr 2021-04-13 14:03:19 -05:00 committed by Iuri Matias
parent e7571bd2a4
commit 0832cef36b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -67,12 +67,12 @@ endif
ifeq ($(detected_OS),Darwin) ifeq ($(detected_OS),Darwin)
BOTTLES_TARGET := bottles-macos BOTTLES_TARGET := bottles-macos
CFLAGS := -mmacosx-version-min=10.13 CFLAGS := -mmacosx-version-min=10.14
export CFLAGS export CFLAGS
CGO_CFLAGS := -mmacosx-version-min=10.13 CGO_CFLAGS := -mmacosx-version-min=10.14
export CGO_CFLAGS export CGO_CFLAGS
LIBSTATUS_EXT := dylib LIBSTATUS_EXT := dylib
MACOSX_DEPLOYMENT_TARGET := 10.13 MACOSX_DEPLOYMENT_TARGET := 10.14
export MACOSX_DEPLOYMENT_TARGET export MACOSX_DEPLOYMENT_TARGET
PKG_TARGET := pkg-macos PKG_TARGET := pkg-macos
RUN_TARGET := run-macos RUN_TARGET := run-macos
@ -118,9 +118,9 @@ $(BOTTLE_OPENSSL):
rm -rf bottles/Downloads/openssl* bottles/openssl* rm -rf bottles/Downloads/openssl* bottles/openssl*
mkdir -p bottles/Downloads mkdir -p bottles/Downloads
cd bottles/Downloads && \ cd bottles/Downloads && \
wget -O openssl.tar.gz "https://bintray.com/homebrew/bottles/download_file?file_path=openssl%401.1-1.1.1g.high_sierra.bottle.tar.gz" && \ curl -L -o openssl.tar.gz -u _:_ $$(brew info --json=v1 openssl | jq -r '.[0].bottle.stable.files.mojave.url') && \
tar xzf openssl* && \ tar xzf openssl.tar.gz && \
mv openssl@1.1/1.1.1g ../openssl mv openssl*/* ../openssl
BOTTLE_PCRE := bottles/pcre/INSTALL_RECEIPT.json BOTTLE_PCRE := bottles/pcre/INSTALL_RECEIPT.json
@ -128,9 +128,9 @@ $(BOTTLE_PCRE):
rm -rf bottles/Downloads/pcre* bottles/pcre* rm -rf bottles/Downloads/pcre* bottles/pcre*
mkdir -p bottles/Downloads mkdir -p bottles/Downloads
cd bottles/Downloads && \ cd bottles/Downloads && \
wget -O pcre.tar.gz "https://bintray.com/homebrew/bottles/download_file?file_path=pcre-8.44.high_sierra.bottle.tar.gz" && \ curl -L -o pcre.tar.gz -u _:_ $$(brew info --json=v1 pcre | jq -r '.[0].bottle.stable.files.mojave.url') && \
tar xzf pcre* && \ tar xzf pcre.tar.gz && \
mv pcre/8.44 ../pcre mv pcre*/* ../pcre
bottles-macos: | $(BOTTLE_OPENSSL) $(BOTTLE_PCRE) bottles-macos: | $(BOTTLE_OPENSSL) $(BOTTLE_PCRE)
rm -rf bottles/Downloads rm -rf bottles/Downloads

4
config.nims
View File

@ -22,8 +22,8 @@ if defined(macosx):
switch("passL", "bottles/pcre/lib/libpcre.a") switch("passL", "bottles/pcre/lib/libpcre.a")
# https://code.videolan.org/videolan/VLCKit/-/issues/232 # https://code.videolan.org/videolan/VLCKit/-/issues/232
switch("passL", "-Wl,-no_compact_unwind") switch("passL", "-Wl,-no_compact_unwind")
# set the minimum supported macOS version to 10.13 # set the minimum supported macOS version to 10.14
switch("passC", "-mmacosx-version-min=10.13") switch("passC", "-mmacosx-version-min=10.14")
elif defined(windows): elif defined(windows):
--app:gui --app:gui
--tlsEmulation:off --tlsEmulation:off