Skip to content

Fixed the build so it works in development and release modes. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
E-B-Smith merged 1 commit into from
Feb 20, 2019
Merged

Fixed the build so it works in development and release modes. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ xcuserdata/
## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

# CocoaPods
#
Expand Down
Binary file added Products/XcodeGitHub.app.dSYM.zip
View file
Open in desktop
Binary file not shown.
Binary file modified Products/XcodeGitHub.app.zip
View file
Open in desktop
Binary file not shown.
Binary file modified Products/XcodeGitHub.framework.zip
View file
Open in desktop
Binary file not shown.
Binary file modified Products/xcode-github
View file
Open in desktop
Binary file not shown.
Binary file added Products/xcode-github.dSYM.zip
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions XcodeGitHub.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SYMROOT = Build;
};
name = Debug;
};
Expand Down Expand Up @@ -343,14 +344,14 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SYMROOT = Build;
};
name = Release;
};
4DDAA4E0216ABF40002F3F8E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
EXECUTABLE_PREFIX = lib;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -359,7 +360,6 @@
isa = XCBuildConfiguration;
buildSettings = {
CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
EXECUTABLE_PREFIX = lib;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion XcodeGitHub.xcodeproj/xcshareddata/xcschemes/XcodeGitHub.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "#!/bin/bash&#10;&quot;${SOURCE_ROOT}&quot;/&quot;${PRODUCT_NAME}&quot;/make-static-lib.sh&#10;"
scriptText = "#!/bin/bash&#10;mkdir &quot;${SOURCE_ROOT}&quot;/Build&#10;log_file=&quot;${SOURCE_ROOT}&quot;/Build/make-static-lib.log&#10;exec &gt; &quot;$log_file&quot; 2&gt;&amp;1&#10;&quot;${SOURCE_ROOT}&quot;/&quot;${PRODUCT_NAME}&quot;/make-static-lib.sh&#10;"
shellToInvoke = "/bin/bash">
<EnvironmentBuildable>
<BuildableReference
Expand Down
15 changes: 9 additions & 6 deletions XcodeGitHub/make-static-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ set -euo pipefail
# Created by Edward Smith on 10/7/18.
# Copyright © 2018 Branch. All rights reserved.

echo "Building: ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework"

cd "${PROJECT_DIR}"
/bin/rm -Rf "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework"

# Headers:
Expand Down Expand Up @@ -42,10 +45,10 @@ set -euo pipefail
"Versions/Current/${PRODUCT_NAME}" \
"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"

## Copy to Products directory:
#/usr/bin/ditto \
# "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework" \
# "${SOURCE_ROOT}/Products/${PRODUCT_NAME}.framework"
# Copy to Products directory:
/usr/bin/ditto \
"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework" \
"${SOURCE_ROOT}/Build/${PRODUCT_NAME}.framework"

echo "Result:"
echo "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework"
echo " Result: ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework"
echo " Ditto: ${SOURCE_ROOT}/Build/${PRODUCT_NAME}.framework"
1 change: 1 addition & 0 deletions build-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function build_project() {
-configuration Release \
-quiet clean build \
CONFIGURATION_BUILD_DIR="$build_products_directory"
# Show the codesigning:
codesign -dv --verbose=4 "$build_products_directory"/"$executable"
echo ""
}
Expand Down
32 changes: 13 additions & 19 deletions xcode-github-app.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
2BB6F4D321F9E3FF001E8693 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BB6F4D121F9E3FF001E8693 /* Credits.rtf */; };
2BE8B585221D2C9E006D8B3D /* libXcodeGitHub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DC9E5C9216DCD6700F1F4EE /* libXcodeGitHub.a */; };
4D12BA0D20A252CE00E5B1DB /* XGALogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D12BA0B20A252CE00E5B1DB /* XGALogViewController.m */; };
4D12BA0E20A252CE00E5B1DB /* XGALogViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4D12BA0C20A252CE00E5B1DB /* XGALogViewController.xib */; };
4D5CC05E2090CAB60042E98B /* BNCKeyChain.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D5CC05D2090CAB60042E98B /* BNCKeyChain.m */; };
Expand All @@ -25,7 +26,6 @@
4D8352D120A516A200184259 /* XGAPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4D8352CF20A516A200184259 /* XGAPreferencesViewController.xib */; };
4DAA4666214CBEFF007A39EB /* XGAAddServerPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DAA4664214CBEFF007A39EB /* XGAAddServerPanel.m */; };
4DAA4667214CBEFF007A39EB /* XGAAddServerPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4DAA4665214CBEFF007A39EB /* XGAAddServerPanel.xib */; };
4DD6B69C219B972300A38210 /* libXcodeGitHub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DC9E5C9216DCD6700F1F4EE /* libXcodeGitHub.a */; };
4DED4891209BDFCC008DE877 /* BNCGeometry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DED4890209BDFCC008DE877 /* BNCGeometry.m */; };
4DEE32E42162EB20006BD06C /* XGAStatusViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE32E32162EB20006BD06C /* XGAStatusViewItem.m */; };
4DF0F58E208F923E0015D1F7 /* BNCThreads.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF0F588208F923E0015D1F7 /* BNCThreads.m */; };
Expand All @@ -35,18 +35,18 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
4DC9E5C8216DCD6700F1F4EE /* PBXContainerItemProxy */ = {
2BE8B583221D2C96006D8B3D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4DC9E5C4216DCD6700F1F4EE /* XcodeGitHub.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4DDAA4D6216ABF40002F3F8E;
proxyType = 1;
remoteGlobalIDString = 4DDAA4D5216ABF40002F3F8E;
remoteInfo = XcodeGitHub;
};
4DD6B69D219B973700A38210 /* PBXContainerItemProxy */ = {
4DC9E5C8216DCD6700F1F4EE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4DC9E5C4216DCD6700F1F4EE /* XcodeGitHub.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4DDAA4D5216ABF40002F3F8E;
proxyType = 2;
remoteGlobalIDString = 4DDAA4D6216ABF40002F3F8E;
remoteInfo = XcodeGitHub;
};
/* End PBXContainerItemProxy section */
Expand Down Expand Up @@ -105,7 +105,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4DD6B69C219B972300A38210 /* libXcodeGitHub.a in Frameworks */,
2BE8B585221D2C9E006D8B3D /* libXcodeGitHub.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -227,7 +227,7 @@
buildRules = (
);
dependencies = (
4DD6B69E219B973700A38210 /* PBXTargetDependency */,
2BE8B584221D2C96006D8B3D /* PBXTargetDependency */,
);
name = "xcode-github-app";
productName = XcodeGitHub;
Expand Down Expand Up @@ -337,10 +337,10 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
4DD6B69E219B973700A38210 /* PBXTargetDependency */ = {
2BE8B584221D2C96006D8B3D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = XcodeGitHub;
targetProxy = 4DD6B69D219B973700A38210 /* PBXContainerItemProxy */;
targetProxy = 2BE8B583221D2C96006D8B3D /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

Expand Down Expand Up @@ -400,6 +400,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Build";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -458,6 +459,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Build";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -482,10 +484,6 @@
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = WRWLR8VRUH;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Build/**",
);
INFOPLIST_FILE = "$(SRCROOT)/xcode-github-app/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.xcode-github-app";
Expand All @@ -504,10 +502,6 @@
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = WRWLR8VRUH;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Build/**",
);
INFOPLIST_FILE = "$(SRCROOT)/xcode-github-app/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.xcode-github-app";
Expand Down
5 changes: 5 additions & 0 deletions xcode-github-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
4 changes: 2 additions & 2 deletions xcode-github-cli.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
DEVELOPMENT_TEAM = WRWLR8VRUH;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Products",
"$(PROJECT_DIR)/Build",
);
INFOPLIST_FILE = "$(SRCROOT)/xcode-github-cli/Info.plist";
LIBRARY_SEARCH_PATHS = (
Expand All @@ -267,7 +267,7 @@
DEVELOPMENT_TEAM = WRWLR8VRUH;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Products",
"$(PROJECT_DIR)/Build",
);
INFOPLIST_FILE = "$(SRCROOT)/xcode-github-cli/Info.plist";
LIBRARY_SEARCH_PATHS = (
Expand Down