Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 6 additions & 20 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -186,22 +186,6 @@ if !compatibilityTestCondition {
let ignoreAvailability = envEnable("OPENSWIFTUI_IGNORE_AVAILABILITY", default: !isSPIDocGenerationBuild && !compatibilityTestCondition)
sharedSwiftSettings.append(contentsOf: [SwiftSetting].availabilityMacroSettings(ignoreAvailability: ignoreAvailability))

// MARK: - CoreGraphicsShims Target

let coreGraphicsShimsTarget = Target.target(
name: "CoreGraphicsShims",
swiftSettings: sharedSwiftSettings
)
let coreGraphicsShimsTestTarget = Target.testTarget(
name: "CoreGraphicsShimsTests",
dependencies: [
"CoreGraphicsShims",
.product(name: "Numerics", package: "swift-numerics"),
],
exclude: ["README.md"],
swiftSettings: sharedSwiftSettings
)

// MARK: - OpenSwiftUISPI Target

let openSwiftUISPITarget = Target.target(
Expand Down Expand Up @@ -236,7 +220,8 @@ let openSwiftUICoreTarget = Target.target(
name: "OpenSwiftUICore",
dependencies: [
"OpenSwiftUI_SPI",
"CoreGraphicsShims",
.product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"),
.product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"),
.product(name: "OpenGraphShims", package: "OpenGraph"),
.product(name: "OpenBoxShims", package: "OpenBox"),
] + (swiftUIRenderCondition && symbolLocatorCondition ? ["OpenSwiftUISymbolDualTestsSupport"] : []),
Expand Down Expand Up @@ -276,7 +261,8 @@ let openSwiftUITarget = Target.target(
dependencies: [
"OpenSwiftUICore",
"COpenSwiftUI",
"CoreGraphicsShims",
.product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"),
.product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"),
.product(name: "OpenGraphShims", package: "OpenGraph"),
.product(name: "OpenBoxShims", package: "OpenBox"),
],
Expand Down Expand Up @@ -421,7 +407,6 @@ let package = Package(
.package(url: "https://github.com/apple/swift-numerics", from: "1.0.3"),
],
targets: [
coreGraphicsShimsTarget,
openSwiftUISPITarget,
openSwiftUICoreTarget,
cOpenSwiftUITarget,
Expand All @@ -438,7 +423,6 @@ if renderGTKCondition {

if !compatibilityTestCondition {
package.targets += [
coreGraphicsShimsTestTarget,
openSwiftUISPITestTarget,
openSwiftUICoreTestTarget,
openSwiftUITestTarget,
Expand Down Expand Up @@ -555,6 +539,7 @@ if linkCoreUI {

if useLocalDeps {
var dependencies: [Package.Dependency] = [
.package(path: "../OpenCoreGraphics"),
.package(path: "../OpenGraph"),
.package(path: "../OpenBox"),
]
Expand All @@ -564,6 +549,7 @@ if useLocalDeps {
package.dependencies += dependencies
} else {
var dependencies: [Package.Dependency] = [
.package(url: "https://github.com/OpenSwiftUIProject/OpenCoreGraphics", branch: "main"),
// FIXME: on Linux platform: OG contains unsafe build flags which prevents us using version dependency
.package(url: "https://github.com/OpenSwiftUIProject/OpenGraph", branch: "main"),
.package(url: "https://github.com/OpenSwiftUIProject/OpenBox", branch: "main"),
Expand Down
1 change: 1 addition & 0 deletions Scripts/CI/darwin_setup_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ filepath() {
REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))"
cd $REPO_ROOT

Scripts/CI/opencoregraphics_setup.sh
Scripts/CI/og_setup.sh
Scripts/CI/ob_setup.sh
Scripts/CI/framework_setup.sh
27 changes: 27 additions & 0 deletions Scripts/CI/opencoregraphics_setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash

# A `realpath` alternative using the default C implementation.
filepath() {
[[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
}

REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))"

clone_checkout_opencoregraphics() {
cd $REPO_ROOT
revision=$(Scripts/CI/get_revision.sh opencoregraphics)
cd ..
if [ ! -d OpenCoreGraphics ]; then
gh repo clone OpenSwiftUIProject/OpenCoreGraphics
cd OpenCoreGraphics
else
echo "OpenCoreGraphics already exists, skipping clone."
cd OpenCoreGraphics
git fetch --all --quiet
git stash --quiet || true
git reset --hard --quiet origin/main
fi
git checkout --quiet $revision
}

clone_checkout_opencoregraphics
Loading