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.

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

Test app framework #26

Closed
wants to merge 2 commits into from
Closed

Test app framework #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
544bfc6
.gitignore updated
Feb 24, 2014
02926b5
Updated iPhone test app to use tightdb.framework
Feb 24, 2014
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ examples/tutorial

# sh build.sh ios-framework
/Tightdb.framework
tightdb-ios.zip
tightdb-ios.zip
tutorial/iPhoneMiniTutorial/Tightdb.framework/Headers/*
tutorial/iPhoneMiniTutorial/Tightdb.framework/Tightdb

44 changes: 32 additions & 12 deletions test-iphone/TightDbExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
410B4DCA156E0C8F0048E4C8 /* Performance.m in Sources */ = {isa = PBXBuildFile; fileRef = 410B4DC9156E0C8F0048E4C8 /* Performance.m */; };
410B4DCE156E10430048E4C8 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 410B4DCD156E10430048E4C8 /* Utils.m */; };
410B4DD3156E59A30048E4C8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 410B4DD2156E59A30048E4C8 /* libsqlite3.dylib */; };
4D302E8018BB8A370086A628 /* Tightdb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D302E7F18BB8A370086A628 /* Tightdb.framework */; };
4D302E8218BB8A3E0086A628 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D302E8118BB8A3E0086A628 /* libstdc++.dylib */; };
4D49F55818A912CD0071DDC1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4D49F55718A912CD0071DDC1 /* [email protected] */; };
E9D58B4F1541A375009150B1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9D58B4E1541A375009150B1 /* UIKit.framework */; };
E9D58B511541A375009150B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9D58B501541A375009150B1 /* Foundation.framework */; };
Expand All @@ -28,6 +30,8 @@
410B4DCC156E10430048E4C8 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
410B4DCD156E10430048E4C8 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
410B4DD2156E59A30048E4C8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
4D302E7F18BB8A370086A628 /* Tightdb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Tightdb.framework; sourceTree = "<group>"; };
4D302E8118BB8A3E0086A628 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; };
4D49F55718A912CD0071DDC1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
E9D58B4A1541A375009150B1 /* TightDbExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TightDbExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
E9D58B4E1541A375009150B1 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
Expand All @@ -50,8 +54,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4D302E8218BB8A3E0086A628 /* libstdc++.dylib in Frameworks */,
410B4DD3156E59A30048E4C8 /* libsqlite3.dylib in Frameworks */,
E9D58B4F1541A375009150B1 /* UIKit.framework in Frameworks */,
4D302E8018BB8A370086A628 /* Tightdb.framework in Frameworks */,
E9D58B511541A375009150B1 /* Foundation.framework in Frameworks */,
E9D58B531541A375009150B1 /* CoreGraphics.framework in Frameworks */,
);
Expand Down Expand Up @@ -82,6 +88,8 @@
E9D58B4D1541A375009150B1 /* Frameworks */ = {
isa = PBXGroup;
children = (
4D302E8118BB8A3E0086A628 /* libstdc++.dylib */,
4D302E7F18BB8A370086A628 /* Tightdb.framework */,
E9D58B4E1541A375009150B1 /* UIKit.framework */,
E9D58B501541A375009150B1 /* Foundation.framework */,
E9D58B521541A375009150B1 /* CoreGraphics.framework */,
Expand Down Expand Up @@ -267,33 +275,45 @@
E9D58B6C1541A375009150B1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"/Users/mk/git/git/tightdb_objc/test-iphone",
);
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "TightDbExample/TightDbExample-Prefix.pch";
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../iphone-lib/include\"";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "TightDbExample/TightDbExample-Info.plist";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../iphone-lib\"";
OTHER_LDFLAGS = (
"-lc++",
"-ltightdb-objc-ios-dbg",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
VALID_ARCHS = "arm64 armv7";
WRAPPER_EXTENSION = app;
};
name = Debug;
};
E9D58B6D1541A375009150B1 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"/Users/mk/git/git/tightdb_objc/test-iphone",
);
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "TightDbExample/TightDbExample-Prefix.pch";
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../iphone-lib/include\"";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "TightDbExample/TightDbExample-Info.plist";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../iphone-lib\"";
OTHER_LDFLAGS = (
"-lc++",
"-ltightdb-objc-ios",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
VALID_ARCHS = "arm64 armv7";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
5 changes: 2 additions & 3 deletions test-iphone/TightDbExample/Performance.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
//

#import <sqlite3.h>
#import <tightdb/objc/tightdb.h>
#import <tightdb/objc/group.h>
#import <tightdb/objc/group_shared.h>
#import <Tightdb/Tightdb.h>
#import <Tightdb/group_shared.h>

#import "Performance.h"
#import "Utils.h"
Expand Down
5 changes: 2 additions & 3 deletions test-iphone/TightDbExample/ViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
// TightDbExample
//

#import <tightdb/objc/group.h>
#import <tightdb/objc/table.h>
#import <tightdb/objc/tightdb.h>
#import <Tightdb/Tightdb.h>
#import <Tightdb/group_shared.h>

#import "ViewController.h"
#import "Utils.h"
Expand Down
Loading