Skip to content

Commit 46c1046

Browse files
committed
Moved code signature step to after the framework build step is complete, and don't hardcode the codesign identity
1 parent e01f9d9 commit 46c1046

File tree

2 files changed

+7
-62
lines changed

2 files changed

+7
-62
lines changed

Xcode/SDL_net.xcodeproj/project.pbxproj

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
BE48FF6007AFA9A800BB41DA /* Frameworks */,
194194
BE48FF6107AFA9A800BB41DA /* Rez */,
195195
AAF0666114D4748600475C7D /* Convert SDL includes to SDL Framework includes */,
196-
AA5C3FDF17A8CB8000D6C8A1 /* Sign Frameworks */,
197196
);
198197
buildRules = (
199198
);
@@ -248,7 +247,7 @@
248247
0867D690FE84028FC02AAC07 /* Project object */ = {
249248
isa = PBXProject;
250249
attributes = {
251-
LastUpgradeCheck = 0420;
250+
LastUpgradeCheck = 0630;
252251
};
253252
buildConfigurationList = 00F072090992C7C800D99510 /* Build configuration list for PBXProject "SDL_net" */;
254253
compatibilityVersion = "Xcode 3.2";
@@ -297,20 +296,6 @@
297296
/* End PBXRezBuildPhase section */
298297

299298
/* Begin PBXShellScriptBuildPhase section */
300-
AA5C3FDF17A8CB8000D6C8A1 /* Sign Frameworks */ = {
301-
isa = PBXShellScriptBuildPhase;
302-
buildActionMask = 2147483647;
303-
files = (
304-
);
305-
inputPaths = (
306-
);
307-
name = "Sign Frameworks";
308-
outputPaths = (
309-
);
310-
runOnlyForDeploymentPostprocessing = 0;
311-
shellPath = /bin/sh;
312-
shellScript = "if [ \"$USER\" = \"slouken\" ]; then\n CODE_SIGN_IDENTITY=\"Mac Developer: Sam Lantinga (84TP7N5TA4)\" pkg-support/codesign-frameworks.sh || exit 1\nfi";
313-
};
314299
AAF0666114D4748600475C7D /* Convert SDL includes to SDL Framework includes */ = {
315300
isa = PBXShellScriptBuildPhase;
316301
buildActionMask = 2147483647;
@@ -332,7 +317,7 @@
332317
);
333318
runOnlyForDeploymentPostprocessing = 0;
334319
shellPath = /bin/sh;
335-
shellScript = "# clean up the framework, remove headers, extra files\nPRODUCT_NAME=SDL2_net\nmkdir -p build/dmg-tmp\nxcrun CpMac -r $TARGET_BUILD_DIR/$PRODUCT_NAME.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname $PRODUCT_NAME -srcfolder build/dmg-tmp build/$PRODUCT_NAME.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
320+
shellScript = "PRODUCT_NAME=SDL2_net\n\n# Sign framework\nif [ \"$SDL_CODESIGN_IDENTITY\" != \"\" ]; then\n codesign --force --deep --sign \"$SDL_CODESIGN_IDENTITY\" $TARGET_BUILD_DIR/$PRODUCT_NAME.framework/Versions/A\nfi\n\n# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nxcrun CpMac -r $TARGET_BUILD_DIR/$PRODUCT_NAME.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname $PRODUCT_NAME -srcfolder build/dmg-tmp build/$PRODUCT_NAME.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
336321
};
337322
/* End PBXShellScriptBuildPhase section */
338323

@@ -373,6 +358,7 @@
373358
00F071FE0992C7C800D99510 /* Debug */ = {
374359
isa = XCBuildConfiguration;
375360
buildSettings = {
361+
COMBINE_HIDPI_IMAGES = YES;
376362
DYLIB_COMPATIBILITY_VERSION = 1;
377363
DYLIB_CURRENT_VERSION = 1;
378364
FRAMEWORK_VERSION = A;
@@ -385,6 +371,7 @@
385371
00F071FF0992C7C800D99510 /* Release */ = {
386372
isa = XCBuildConfiguration;
387373
buildSettings = {
374+
COMBINE_HIDPI_IMAGES = YES;
388375
DYLIB_COMPATIBILITY_VERSION = 1;
389376
DYLIB_CURRENT_VERSION = 1;
390377
FRAMEWORK_VERSION = A;
@@ -397,6 +384,7 @@
397384
00F072020992C7C800D99510 /* Debug */ = {
398385
isa = XCBuildConfiguration;
399386
buildSettings = {
387+
COMBINE_HIDPI_IMAGES = YES;
400388
DYLIB_COMPATIBILITY_VERSION = 1;
401389
DYLIB_CURRENT_VERSION = 1;
402390
LIBRARY_STYLE = STATIC;
@@ -411,6 +399,7 @@
411399
00F072030992C7C800D99510 /* Release */ = {
412400
isa = XCBuildConfiguration;
413401
buildSettings = {
402+
COMBINE_HIDPI_IMAGES = YES;
414403
DYLIB_COMPATIBILITY_VERSION = 1;
415404
DYLIB_CURRENT_VERSION = 1;
416405
LIBRARY_STYLE = STATIC;
@@ -464,7 +453,6 @@
464453
00F0720A0992C7C800D99510 /* Debug */ = {
465454
isa = XCBuildConfiguration;
466455
buildSettings = {
467-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
468456
FRAMEWORK_SEARCH_PATHS = (
469457
"$(HOME)/Library/Frameworks",
470458
/Library/Frameworks,
@@ -476,6 +464,7 @@
476464
/Library/Frameworks/SDL.framework/Headers,
477465
);
478466
MACOSX_DEPLOYMENT_TARGET = 10.5;
467+
ONLY_ACTIVE_ARCH = YES;
479468
PRODUCT_NAME = SDL2_net;
480469
SDKROOT = macosx;
481470
USER_HEADER_SEARCH_PATHS = "$(HOME)/Library/Frameworks/SDL2.framework/Headers /Library/Frameworks/SDL2.framework/Headers";
@@ -485,7 +474,6 @@
485474
00F0720B0992C7C800D99510 /* Release */ = {
486475
isa = XCBuildConfiguration;
487476
buildSettings = {
488-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
489477
DEPLOYMENT_POSTPROCESSING = YES;
490478
FRAMEWORK_SEARCH_PATHS = (
491479
"$(HOME)/Library/Frameworks",

Xcode/pkg-support/codesign-frameworks.sh

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)