Skip to content

Commit 99d089b

Browse files
committed
add testbed support (first step) + typo fix
1 parent cbcd821 commit 99d089b

File tree

6 files changed

+29
-5
lines changed

6 files changed

+29
-5
lines changed

configure

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,10 @@ fi
469469
if test -z "$CPP"; then
470470
case "$host" in
471471
aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
472-
aarch64-apple-ios*-macabi) CXX=arm64-apple-ios-macabi-clang++ ;;
472+
aarch64-apple-ios*-macabi) CPP=arm64-apple-ios-macabi-cpp ;;
473473
aarch64-apple-ios*) CPP=arm64-apple-ios-cpp ;;
474474
x86_64-apple-ios*-simulator) CPP=x86_64-apple-ios-simulator-cpp ;;
475-
x86_64-apple-ios*-macabi) CXX=x86_64-apple-ios-macabi-clang++ ;;
475+
x86_64-apple-ios*-macabi) CPP=x86_64-apple-ios-macabi-cpp ;;
476476

477477
aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
478478
aarch64-apple-tvos*) CPP=arm64-apple-tvos-cpp ;;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
This directory is intentionally empty.
2+
3+
It should be used as a target for `--enable-framework` when compiling an iOS simulator
4+
build for testing purposes (either x86_64 or ARM64).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
This directory is intentionally empty.
22

3-
It should be used as a target for `--enable-framework` when compiling an iOS simulator
3+
It should be used as a target for `--enable-framework` when compiling a Mac Catalyst
44
build for testing purposes (either x86_64 or ARM64).

iOS/testbed/iOSTestbed.xcodeproj/project.pbxproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iOSTestbed-Info.plist"; sourceTree = "<group>"; };
7171
608619532CB77BA900F46182 /* app_packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree = "<group>"; };
7272
608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
73+
EE9C3BAA2DB9D24900156EF4 /* iOSTestbed.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iOSTestbed.entitlements; sourceTree = "<group>"; };
7374
/* End PBXFileReference section */
7475

7576
/* Begin PBXFrameworksBuildPhase section */
@@ -115,6 +116,7 @@
115116
607A66142B0EFA380010BFC8 /* iOSTestbed */ = {
116117
isa = PBXGroup;
117118
children = (
119+
EE9C3BAA2DB9D24900156EF4 /* iOSTestbed.entitlements */,
118120
608619552CB7819B00F46182 /* app */,
119121
608619532CB77BA900F46182 /* app_packages */,
120122
607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */,
@@ -449,6 +451,7 @@
449451
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
450452
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
451453
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
454+
CODE_SIGN_ENTITLEMENTS = iOSTestbed/iOSTestbed.entitlements;
452455
CODE_SIGN_STYLE = Automatic;
453456
CURRENT_PROJECT_VERSION = 1;
454457
DEVELOPMENT_TEAM = "";
@@ -468,6 +471,9 @@
468471
MARKETING_VERSION = 3.13.0a1;
469472
PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbed;
470473
PRODUCT_NAME = "$(TARGET_NAME)";
474+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
475+
SUPPORTS_MACCATALYST = YES;
476+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
471477
SWIFT_EMIT_LOC_STRINGS = YES;
472478
TARGETED_DEVICE_FAMILY = "1,2";
473479
};
@@ -479,6 +485,7 @@
479485
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
480486
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
481487
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
488+
CODE_SIGN_ENTITLEMENTS = iOSTestbed/iOSTestbed.entitlements;
482489
CODE_SIGN_STYLE = Automatic;
483490
CURRENT_PROJECT_VERSION = 1;
484491
DEVELOPMENT_TEAM = "";
@@ -499,6 +506,9 @@
499506
MARKETING_VERSION = 3.13.0a1;
500507
PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbed;
501508
PRODUCT_NAME = "$(TARGET_NAME)";
509+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
510+
SUPPORTS_MACCATALYST = YES;
511+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
502512
SWIFT_EMIT_LOC_STRINGS = YES;
503513
TARGETED_DEVICE_FAMILY = "1,2";
504514
};
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.app-sandbox</key>
6+
<true/>
7+
<key>com.apple.security.network.client</key>
8+
<true/>
9+
</dict>
10+
</plist>

0 commit comments

Comments
 (0)