github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CircleCI for macOS (#184)

Browse source
This commit is contained in:
Zbigniew Rębacz 2024-01-06 12:41:18 +01:00 • committed by GitHub
parent 3be824bcfd
commit 109c34d0c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.circleci/config.yml
View file

@ -1,9 +1,9 @@
version: 2.1 version: 2.1
jobs: jobs:
build: build-linux:
docker: docker:
- image: cimg/base:2023.12 - image: cimg/base:2024.01
resource_class: large resource_class: large
environment: environment:
NUMBER_OF_CPUS: 4 NUMBER_OF_CPUS: 4
@ -11,5 +11,25 @@ jobs:
- checkout - checkout
- run: sudo apt-get update - run: sudo apt-get update
- run: sudo apt-get install g++ clang git make libgtk-3-dev libnotify-dev libbz2-dev libssl-dev xdotool - run: sudo apt-get install g++ clang git make libgtk-3-dev libnotify-dev libbz2-dev libssl-dev xdotool
- run: ./configure
- run: make -f Makefile -j ${NUMBER_OF_CPUS} - run: make -f Makefile -j ${NUMBER_OF_CPUS}
- run: make -f umkMakefile.in -j ${NUMBER_OF_CPUS} - run: make -f umkMakefile -j ${NUMBER_OF_CPUS}
build-mac:
macos:
xcode: 15.1.0
environment:
NUMBER_OF_CPUS: 4
steps:
- checkout
- run: ./configure
- run: make -f umkMakefile -j ${NUMBER_OF_CPUS}
- run: ./umk ./uppsrc ide CLANG -brs ./theide
workflows:
build-linux:
jobs:
- build-linux
build-mac:
jobs:
- build-mac

2
configure_makefile
View file

@ -59,6 +59,7 @@ fi
if [[ "$uname" == 'Darwin' ]]; then if [[ "$uname" == 'Darwin' ]]; then
echo Configuring $1 for MacOS echo Configuring $1 for MacOS
sed -i.bak 's/-DflagPOSIX -DflagLINUX/-DflagPOSIX -DflagBSD -DflagOSX/' $1
sed -i.bak 's/-Wl,--gc-sections $(LINKOPTIONS)/$(LINKOPTIONS)/' $1 sed -i.bak 's/-Wl,--gc-sections $(LINKOPTIONS)/$(LINKOPTIONS)/' $1
sed -i.bak 's/\`pkg-config --cflags .*\`/ /' $1 sed -i.bak 's/\`pkg-config --cflags .*\`/ /' $1
sed -i.bak 's/\`pkg-config --libs .*\`/ /' $1 sed -i.bak 's/\`pkg-config --libs .*\`/ /' $1
@ -67,6 +68,5 @@ if [[ "$uname" == 'Darwin' ]]; then
sed -i.bak 's/-Wl,-s/ /' $1 sed -i.bak 's/-Wl,-s/ /' $1
sed -i.bak 's/-Wl,--start-group/ /' $1 sed -i.bak 's/-Wl,--start-group/ /' $1
sed -i.bak 's/-Wl,--end-group/ /' $1 sed -i.bak 's/-Wl,--end-group/ /' $1
sed -i.bak 's/-DflagLINUX/-DflagBSD -DflagOSX/' umkMakefile
sed -i.bak 's/$(LIBPATH) -Wl,-O,2 $(LDFLAGS)/$(LIBPATH) $(LDFLAGS)/' $1 sed -i.bak 's/$(LIBPATH) -Wl,-O,2 $(LDFLAGS)/$(LIBPATH) $(LDFLAGS)/' $1
fi fi

4
uppsrc/ide/Builders/Install.cpp
View file

@ -160,8 +160,8 @@ void CreateBuildMethods()
bm.Replace(var, h); bm.Replace(var, h);
}; };
Path("$INCLUDE$", "/opt/local/include;/usr/include;/opt/homebrew/include;/opt/homebrew/opt/openssl/include"); Path("$INCLUDE$", "/opt/local/include;/usr/include;/usr/local/include;/opt/homebrew/include;/opt/homebrew/opt/openssl/include");
Path("$LIB$", "/opt/local/lib;/usr/lib;/opt/homebrew/lib;/opt/homebrew/opt/openssl/lib"); Path("$LIB$", "/opt/local/lib;/usr/lib;/usr/local/lib;/opt/homebrew/lib;/opt/homebrew/opt/openssl/lib");
String common; String common;
#ifdef CPU_ARM #ifdef CPU_ARM