Skip to content

Commit

Permalink
use 10.15 for macos build in CI
Browse files Browse the repository at this point in the history
* update create dmg and build on 10.15

* add openssl in bundle

* change xcode version

* build without OSX15
  • Loading branch information
Michael Bonani authored Dec 13, 2021
1 parent e320951 commit 811346b
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 830 deletions.
1 change: 1 addition & 0 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ brew 'ccache'
brew 'python3'
brew 'imagemagick'
brew 'p7zip'
brew 'create-dmg'
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
# vim: ts=4:sw=4:noexpandtab

if(APPLE AND NOT IOS)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum osx version")
if(OSX15)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum osx version")
else()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum osx version")
endif()
endif()

cmake_policy(SET CMP0071 NEW)
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/webview_native.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.12
import QtWebView 1.1
import QtWebView 1.12
import QtQuick.Window 2.12
Window {
id: window
Expand Down
5 changes: 4 additions & 1 deletion aseba/thymio-device-manager/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
set(CMAKE_CXX_STANDARD 17)
if(APPLE)
set(OPENSSL_USE_STATIC_LIBS TRUE)
endif()
find_package(OpenSSL REQUIRED)

add_library(thymio-device-manager-lib STATIC
Expand Down Expand Up @@ -131,7 +134,7 @@ target_link_libraries(thymio-device-manager-lib PUBLIC
if(APPLE)
find_library(CoreFoundation CoreFoundation)
find_library(IOKit IOKit)
target_link_libraries(thymio-device-manager-lib PUBLIC ${CoreFoundation} ${IOKit})
target_link_libraries(thymio-device-manager-lib PUBLIC ${CoreFoundation} ${IOKit} ${OpenSSL})
endif()

if(WIN32)
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ jobs:

- job: BuildOnOsX
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
steps:
- task: NodeTool@0
inputs:
Expand Down Expand Up @@ -315,8 +315,8 @@ jobs:
displayName: 'Clone submodules'
- script: |
sudo xcode-select -s /Applications/Xcode_11.3.1.app/Contents/Developer
(mkdir build && cd build && cmake .. -GNinja -DBoost_DEBUG=OFF -DOPENSSL_LIBRARIES=/usr/local/Cellar/[email protected]/1.0.2t/lib -DOPENSSL_INCLUDE_DIR=/usr/local/Cellar/[email protected]/1.0.2t/include -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DQt5Core_DIR="`pwd`/../Qt/5.15.2/clang_64/lib/cmake/Qt5Core" -DCMAKE_PREFIX_PATH="`pwd`/../Qt/5.15.2/clang_64/" && ninja)
sudo xcode-select -s /Applications/Xcode_11.4.1.app/Contents/Developer
(mkdir build && cd build && cmake .. -GNinja -DBoost_DEBUG=OFF -DOPENSSL_ROOT_DIR=/usr/local/Cellar/[email protected]/1.0.2t/ -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DQt5Core_DIR="`pwd`/../Qt/5.15.2/clang_64/lib/cmake/Qt5Core" -DCMAKE_PREFIX_PATH="`pwd`/../Qt/5.15.2/clang_64/" && ninja)
displayName: 'Build with cmake'
- script: |
Expand Down
4 changes: 2 additions & 2 deletions osx/createbundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@ sign --options=runtime $(realpath "$MAIN_DIR/thymio-launcher")

if [ -n "$DMG" ]; then
test -f "$1" && rm "$DMG"
"$DIR/dmg/create-dmg" \
create-dmg \
--volname "Thymio Suite" \
--volicon "$DIR/../menu/osx/launcher.icns" \
--background "$DIR/background.png" \
--window-pos 200 120 \
--window-size 620 470 \
--window-size 640 480 \
--icon-size 100 \
--icon "ThymioSuite.app" 100 300 \
--hide-extension "ThymioSuite.app" \
Expand Down
4 changes: 0 additions & 4 deletions osx/dmg/.gitignore

This file was deleted.

21 changes: 0 additions & 21 deletions osx/dmg/LICENSE

This file was deleted.

95 changes: 0 additions & 95 deletions osx/dmg/README.md

This file was deleted.

26 changes: 0 additions & 26 deletions osx/dmg/builder/create-dmg.builder

This file was deleted.

Loading

0 comments on commit 811346b

Please sign in to comment.