Skip to content

Commit 8547bda

Browse files
committed
Remove OpenFoundation dependency
1 parent d4f467d commit 8547bda

File tree

4 files changed

+18
-35
lines changed

4 files changed

+18
-35
lines changed

AG/Sources/Headers/AGBase.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444
#include <CoreFoundation/CoreFoundation.h>
4545
#include <TargetConditionals.h>
46-
#define TARGET_OS_DARWIN TARGET_OS_MAC
4746
#define AG_OPTIONS CF_OPTIONS
4847
#define AG_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
4948
#define AG_EXTERN_C_END CF_EXTERN_C_END

Package.resolved

-14
This file was deleted.

Package.swift

+14-7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ let openGraphCompatibilityTestTarget = Target.testTarget(
2222
exclude: ["README.md"]
2323
)
2424

25+
let swiftBinPath = Context.environment["_"] ?? ""
26+
let swiftBinURL = URL(fileURLWithPath: swiftBinPath)
27+
let SDKPath = swiftBinURL.deletingLastPathComponent().deletingLastPathComponent().path
28+
let includePath = SDKPath.appending("/lib/swift_static")
29+
2530
let package = Package(
2631
name: "OpenGraph",
2732
platforms: [
@@ -36,19 +41,21 @@ let package = Package(
3641
.library(name: "OpenGraphShims", targets: ["OpenGraphShims"]),
3742
.library(name: "OpenGraph", targets: ["OpenGraph"]),
3843
],
39-
dependencies: [
40-
.package(url: "https://github.com/OpenSwiftUIProject/OpenFoundation", from: "0.0.2"),
41-
],
4244
targets: [
4345
// FIXME: Merge into one target
4446
// OpenGraph is a C++ & Swift mix target.
4547
// The SwiftPM support for such usage is still in progress.
4648
.target(
4749
name: "_OpenGraph",
48-
dependencies: [
49-
.product(name: "OpenFoundation", package: "OpenFoundation"),
50+
cSettings: [
51+
clangEnumFixSetting,
52+
.unsafeFlags(["-I", includePath]),
53+
.define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1"),
5054
],
51-
cSettings: [clangEnumFixSetting]
55+
cxxSettings: [
56+
.unsafeFlags(["-I", "/home/kyle/.swiftbox/toolchain/swift-5.9.2/usr/lib/swift_static"]),
57+
.define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1"),
58+
]
5259
),
5360
.target(
5461
name: "OpenGraph",
@@ -63,7 +70,7 @@ let package = Package(
6370
)
6471

6572
func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool {
66-
guard let value = ProcessInfo.processInfo.environment[key] else {
73+
guard let value = Context.environment[key] else {
6774
return defaultValue
6875
}
6976
if value == "1" {

Sources/_OpenGraph/include/OGBase.hpp

+4-13
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@
4141

4242
#define OG_SWIFT_STRUCT __attribute__((swift_wrapper(struct)))
4343

44-
#ifdef __APPLE__
4544
#include <CoreFoundation/CoreFoundation.h>
45+
#ifdef __APPLE__
4646
#include <TargetConditionals.h>
47-
#define TARGET_OS_DARWIN TARGET_OS_MAC
47+
#else
48+
#include <CoreFoundation/TargetConditionals.h>
49+
#endif
4850
#define OG_OPTIONS CF_OPTIONS
4951
#define OG_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
5052
#define OG_EXTERN_C_END CF_EXTERN_C_END
@@ -53,15 +55,4 @@
5355
#define OG_EXPORT CF_EXPORT
5456
#define OG_REFINED_FOR_SWIFT CF_REFINED_FOR_SWIFT
5557
#define OG_SWIFT_NAME CF_SWIFT_NAME
56-
#else
57-
#include <OpenFoundation/OpenFoundation.h>
58-
#define OG_OPTIONS OF_OPTIONS
59-
#define OG_EXTERN_C_BEGIN OF_EXTERN_C_BEGIN
60-
#define OG_EXTERN_C_END OF_EXTERN_C_END
61-
#define OG_ASSUME_NONNULL_BEGIN OF_ASSUME_NONNULL_BEGIN
62-
#define OG_ASSUME_NONNULL_END OF_ASSUME_NONNULL_END
63-
#define OG_EXPORT OF_EXPORT
64-
#define OG_REFINED_FOR_SWIFT OF_REFINED_FOR_SWIFT
65-
#define OG_SWIFT_NAME OF_SWIFT_NAME
66-
#endif /* __APPLE__ */
6758
#endif /* OGBase_h */

0 commit comments

Comments
 (0)