Skip to content
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.

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

update submodules and small fixes to build without errors #261

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

azhang
Copy link

@azhang azhang commented Jan 29, 2019

  • I wasn't able to find any references to basicDomain so I commented it out.
  • merge error included in commit
  • updated submodule commit hashes
  • thrid-party/libjpeg-turbo/jconfig.h the version line gave me an error so I made it a string
  • update readme to include appVersion

Manual changes necessary to make it fully buildable:
update Sparkle submodule to use overtake's commit, or use master branch and apply this change:

~/s/T/s/Sparkle git:master ❯❯❯ git diff                                                                                                                                                                                                                                 ✱
diff --git a/Sparkle.xcodeproj/project.pbxproj b/Sparkle.xcodeproj/project.pbxproj
index 2175a81e..435394a3 100644
--- a/Sparkle.xcodeproj/project.pbxproj
+++ b/Sparkle.xcodeproj/project.pbxproj
@@ -2832,6 +2832,7 @@
                        baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
                        buildSettings = {
                                CLANG_ENABLE_MODULES = YES;
+                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)AppStore";
                                DEFINES_MODULE = YES;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
                                SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -2844,6 +2845,7 @@
                        baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
                        buildSettings = {
                                CLANG_ENABLE_MODULES = YES;
+                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/DebugHockeyApp";
                                DEFINES_MODULE = YES;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
                                SWIFT_VERSION = 3.0;

NOTE: CFBundleVersion needs to be updated to the actual bundle version and the basicDomain needs to be fixed.

@CLAassistant
Copy link

CLAassistant commented Jan 29, 2019

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants