Skip to content

Commit

Permalink
Moved code signature step to after the framework build step is comple…
Browse files Browse the repository at this point in the history 
…te, and don't hardcode the codesign identity
  • Loading branch information
@slouken
slouken committed Apr 27, 2015
1 parent 7cfbde3 commit c555dba
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 62 deletions.
26 changes: 7 additions & 19 deletions Xcode/SDL_image.xcodeproj/project.pbxproj
View file
Expand Up @@ -256,7 +256,6 @@
AA9EE77214B27810008773C0 /* Copy Frameworks */,
AA9EE77314B2782A008773C0 /* Create Frameworks symlink */,
AA9EE77414B27854008773C0 /* Convert SDL includes to SDL Framework includes */,
AA5C3FDD17A8C97A00D6C8A1 /* Sign Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -311,7 +310,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0630;
};
buildConfigurationList = 00B7E3B6097EB73D00826121 /* Build configuration list for PBXProject "SDL_image" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -363,20 +362,6 @@
/* End PBXRezBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
AA5C3FDD17A8C97A00D6C8A1 /* Sign Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Sign Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ \"$USER\" = \"slouken\" ]; then\n CODE_SIGN_IDENTITY=\"Mac Developer: Sam Lantinga (84TP7N5TA4)\" pkg-support/codesign-frameworks.sh || exit 1\nfi";
};
AA9EE77314B2782A008773C0 /* Create Frameworks symlink */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -412,7 +397,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# clean up the framework, remove headers, extra files\nPRODUCT_NAME=SDL2_image\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";
shellScript = "PRODUCT_NAME=SDL2_image\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";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -477,7 +462,6 @@
007288110F0DA5BA00C302A9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED)",
"$(HOME)/Library/Frameworks",
Expand Down Expand Up @@ -507,6 +491,7 @@
);
HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks/webp.framework/Headers\"";
MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = SDL2_image;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED) $(HOME)/Library/Frameworks/SDL2.framework/Headers /Library/Frameworks/SDL2.framework/Headers";
Expand All @@ -516,6 +501,7 @@
007288120F0DA5BA00C302A9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -537,6 +523,7 @@
007288130F0DA5BA00C302A9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = "";
Expand Down Expand Up @@ -595,7 +582,6 @@
007288150F0DA5C400C302A9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEPLOYMENT_POSTPROCESSING = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED)",
Expand Down Expand Up @@ -637,6 +623,7 @@
007288160F0DA5C400C302A9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -658,6 +645,7 @@
007288170F0DA5C400C302A9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = "";
Expand Down
43 changes: 0 additions & 43 deletions Xcode/pkg-support/codesign-frameworks.sh
View file

This file was deleted.

0 comments on commit c555dba

Please sign in to comment.