status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for correctly locating GCDWebServer headers 

This issue appeared when doing a fully clean build since we no longer use the GCDWebServers framework.
This commit is contained in:
Scott Kyle 2015-12-08 16:58:29 -08:00
parent 1231a45780
commit cf687ffca0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RealmJS.xcodeproj/project.pbxproj
View File

@ -892,10 +892,10 @@
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/tests/react-test-app/node_modules/react-native/React/Base",
"$(SRCROOT)/vendor", "$(SRCROOT)/vendor",
"$(SRCROOT)/vendor/GCDWebServer",
"$(SRCROOT)/tests/react-test-app/node_modules/react-native/React/Base",
"$(SRCROOT)/examples/ReactExample/node_modules/react-native/React/Base", "$(SRCROOT)/examples/ReactExample/node_modules/react-native/React/Base",
"$(SRCROOT)/tests/ReactTests/node_modules/react-native/React/Base",
); );
INFOPLIST_FILE = src/ios/Info.plist; INFOPLIST_FILE = src/ios/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@ -926,10 +926,10 @@
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/tests/react-test-app/node_modules/react-native/React/Base",
"$(SRCROOT)/vendor", "$(SRCROOT)/vendor",
"$(SRCROOT)/vendor/GCDWebServer",
"$(SRCROOT)/tests/react-test-app/node_modules/react-native/React/Base",
"$(SRCROOT)/examples/ReactExample/node_modules/react-native/React/Base", "$(SRCROOT)/examples/ReactExample/node_modules/react-native/React/Base",
"$(SRCROOT)/tests/ReactTests/node_modules/react-native/React/Base",
); );
INFOPLIST_FILE = src/ios/Info.plist; INFOPLIST_FILE = src/ios/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@ -959,10 +959,10 @@
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/tests/react-test-app/node_modules/react-native/React/Base",
"$(SRCROOT)/vendor", "$(SRCROOT)/vendor",
"$(SRCROOT)/vendor/GCDWebServer",
"$(SRCROOT)/tests/react-test-app/node_modules/react-native/React/Base",
"$(SRCROOT)/examples/ReactExample/node_modules/react-native/React/Base", "$(SRCROOT)/examples/ReactExample/node_modules/react-native/React/Base",
"$(SRCROOT)/tests/ReactTests/node_modules/react-native/React/Base",
); );
INFOPLIST_FILE = src/ios/Info.plist; INFOPLIST_FILE = src/ios/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@ -1394,6 +1394,7 @@
F63FF2B91C1241E500B3B8E0 /* Release */, F63FF2B91C1241E500B3B8E0 /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
}; };
F63FF2F51C16405D00B3B8E0 /* Build configuration list for PBXNativeTarget "GCDWebServers" */ = { F63FF2F51C16405D00B3B8E0 /* Build configuration list for PBXNativeTarget "GCDWebServers" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
@ -1403,6 +1404,7 @@
F63FF2F81C16405D00B3B8E0 /* Release */, F63FF2F81C16405D00B3B8E0 /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };

5
react-native/RealmReact.mm
View File

@ -47,7 +47,10 @@ JSGlobalContextRef RealmReactGetJSGlobalContextForExecutor(id executor, bool cre
#import "shared_realm.hpp" #import "shared_realm.hpp"
#if DEBUG #if DEBUG
#import <GCDWebServers/GCDWebServers.h> #import <GCDWebServer/Core/GCDWebServer.h>
#import <GCDWebServer/Requests/GCDWebServerDataRequest.h>
#import <GCDWebServer/Responses/GCDWebServerDataResponse.h>
#import <GCDWebServer/Responses/GCDWebServerErrorResponse.h>
#import <RealmJS/rpc.hpp> #import <RealmJS/rpc.hpp>
@interface RealmReact () { @interface RealmReact () {