Skip to content

Commit

Permalink
Merge pull request #15 from Tightdb/master
Browse files Browse the repository at this point in the history
v.0.1.5
  • Loading branch information
bmunkholm committed Dec 19, 2013
2 parents a22166b + 86158a8 commit f92d036
Show file tree
Hide file tree
Showing 9 changed files with 338 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@ table_test.tightdb
/doc/ref/html/*.css

# XCode
xcuserdata
xcuserdata/
project.xcworkspace


# sh build.sh build-iphone
/iphone-lib/include
/iphone-lib/libtightdb-objc-ios.a
/iphone-lib/libtightdb-objc-ios-dbg.a

# for running the example tutorial
examples/tutorial.d
examples/tutorial.o
examples/tutorial
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
SUBDIRS = src
PASSIVE_SUBDIRS = examples

include src/generic.mk

Expand Down
5 changes: 5 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,11 @@ EOF
OBJC_DISABLE_GC=YES gdb --args "$XCODE_HOME/Tools/otest" "$TEMP_DIR/unit-tests-dbg.octest"
;;

"test-examples")
require_config || exit 1
$MAKE test -C "examples" || exit 1
;;

"install-report")
has_installed=0
install_libdir="$(get_config_param "INSTALL_LIBDIR")"
Expand Down
10 changes: 10 additions & 0 deletions examples/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
TEST_PROGRAMS = tutorial

tutorial_SOURCES = \
tutorial.m

tutorial_CFLAGS = -Wno-comment -fobjc-arc -fobjc-abi-version=2
tutorial_LDFLAGS = -fobjc-link-runtime
tutorial_LIBS = ../src/tightdb/objc/libtightdb-objc.a

include ../src/generic.mk
12 changes: 12 additions & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Running the tutorial
====================


Tutorial
========
Within this folder you find an Xcode project named TightdbTutorial.xcodeproj.
The project includes tutorial.m.
This file contains the source code for the tutorial.
To run the tutorial, press Run

See our website for more documentation.
255 changes: 255 additions & 0 deletions examples/TightdbTutorial.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
4D1271FB1833C1970099B36C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1271FA1833C1970099B36C /* CoreFoundation.framework */; };
4D1272091833C21A0099B36C /* tutorial.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1272081833C21A0099B36C /* tutorial.m */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
4D1271F51833C1970099B36C /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
4D1271F71833C1970099B36C /* TightdbTutorial */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TightdbTutorial; sourceTree = BUILT_PRODUCTS_DIR; };
4D1271FA1833C1970099B36C /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
4D1272081833C21A0099B36C /* tutorial.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = tutorial.m; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
4D1271F41833C1970099B36C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4D1271FB1833C1970099B36C /* CoreFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
4D1271EE1833C1970099B36C = {
isa = PBXGroup;
children = (
4D1271FC1833C1970099B36C /* TightdbTutorial */,
4D1271F91833C1970099B36C /* Frameworks */,
4D1271F81833C1970099B36C /* Products */,
);
sourceTree = "<group>";
};
4D1271F81833C1970099B36C /* Products */ = {
isa = PBXGroup;
children = (
4D1271F71833C1970099B36C /* TightdbTutorial */,
);
name = Products;
sourceTree = "<group>";
};
4D1271F91833C1970099B36C /* Frameworks */ = {
isa = PBXGroup;
children = (
4D1271FA1833C1970099B36C /* CoreFoundation.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
4D1271FC1833C1970099B36C /* TightdbTutorial */ = {
isa = PBXGroup;
children = (
4D1272081833C21A0099B36C /* tutorial.m */,
);
path = TightdbTutorial;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
4D1271F61833C1970099B36C /* TightdbTutorial */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4D1272031833C1970099B36C /* Build configuration list for PBXNativeTarget "TightdbTutorial" */;
buildPhases = (
4D1271F31833C1970099B36C /* Sources */,
4D1271F41833C1970099B36C /* Frameworks */,
4D1271F51833C1970099B36C /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = TightdbTutorial;
productName = TightdbTutorial;
productReference = 4D1271F71833C1970099B36C /* TightdbTutorial */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
4D1271EF1833C1970099B36C /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Morten Kjaer";
};
buildConfigurationList = 4D1271F21833C1970099B36C /* Build configuration list for PBXProject "TightdbTutorial" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = 4D1271EE1833C1970099B36C;
productRefGroup = 4D1271F81833C1970099B36C /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
4D1271F61833C1970099B36C /* TightdbTutorial */,
);
};
/* End PBXProject section */

/* Begin PBXSourcesBuildPhase section */
4D1271F31833C1970099B36C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4D1272091833C21A0099B36C /* tutorial.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
4D1272011833C1970099B36C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
/usr/local/include,
);
"LIBRARY_SEARCH_PATHS[arch=*]" = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = YES;
"OTHER_LDFLAGS[arch=*]" = "-ltightdb-objc-dbg";
SDKROOT = macosx;
};
name = Debug;
};
4D1272021833C1970099B36C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
/usr/local/include,
);
"LIBRARY_SEARCH_PATHS[arch=*]" = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.9;
"OTHER_LDFLAGS[arch=*]" = "-ltightdb-objc";
SDKROOT = macosx;
};
name = Release;
};
4D1272041833C1970099B36C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
4D1272051833C1970099B36C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
4D1271F21833C1970099B36C /* Build configuration list for PBXProject "TightdbTutorial" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4D1272011833C1970099B36C /* Debug */,
4D1272021833C1970099B36C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4D1272031833C1970099B36C /* Build configuration list for PBXNativeTarget "TightdbTutorial" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4D1272041833C1970099B36C /* Debug */,
4D1272051833C1970099B36C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 4D1271EF1833C1970099B36C /* Project object */;
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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>
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>BA9034C6-9085-4A5B-8405-02FAC158A34E</string>
<key>IDESourceControlProjectName</key>
<string>TightdbTutorial</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>C0873F68-B47E-4CEE-9BC6-974A9D9ABEB2</key>
<string>https://github.com/mekjaer/tightdb_objc.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>examples/TightdbTutorial/TightdbTutorial.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>C0873F68-B47E-4CEE-9BC6-974A9D9ABEB2</key>
<string>../../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/mekjaer/tightdb_objc.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>C0873F68-B47E-4CEE-9BC6-974A9D9ABEB2</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>C0873F68-B47E-4CEE-9BC6-974A9D9ABEB2</string>
<key>IDESourceControlWCCName</key>
<string>tightdb_objc</string>
</dict>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion examples/tutorial.m
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ void sharedGroupFunc() {
// @@EndExample@@
}

int main()
int main(int argc, const char * argv[])
{
@autoreleasepool {
tableFunc();
Expand Down

0 comments on commit f92d036

Please sign in to comment.