Pull doc updates

.dir-locals.el

@@ -0,0 +1,4 @@
+;; Project specific Emacs settings
+((nil . ((c-basic-offset . 4)
+ (tab-width . 4)
+ (indent-tabs-mode . t))))

.gitignore

@@ -3,12 +3,59 @@
 *.vcproj.*.user
 *.d
 *.o
+*.so
 *.a
 *.swp
+*.gcno
+*.gcda
+*~
 cscope.*
 tags
-tightdb-tests
-TestUnitTest++
+
+/cover_html
+/gcovr.xml
+/test/UnitTest++/TestUnitTest++
+/test/tightdb-tests
+/test/tightdb-tests-debug
+/test/tightdb-tests-cover
+/test/subtables*.tdb
+/test/subtables.tightdb
+/test/table_test.tbl
+/test/test-tightdb/test-tightdb
+/test/test-tightdb/test-tightdb-debug
+/test/test-sqlite3/test-sqlite3
+/test/test-stl/test-stl
 
 /test/benchmark/x64
-/test/benchmark
+/test/benchmark
+
+#ignore thumbnails created by windows
+Thumbs.db
+#Ignore files build by Visual Studio
+*.obj
+*.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.ilk
+*.log
+[Bb]in
+[Dd]ebug*/
+*.lib
+*.sbr
+obj/
+ipch/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
+Static library*/
+*.opensdf
+*.sdf

Makefile

@@ -1,68 +1,65 @@
 # Note:
 # $@ The name of the target file (the one before the colon)
-# $< The name of the first (or only) prerequisite file 
+# $< The name of the first (or only) prerequisite file
 # (the first one after the colon)
 # $^ The names of all the prerequisite files (space separated)
 # $* The stem (the bit which matches the % wildcard in the rule definition.
 #
 
-# Compiler and flags
-# CXXFLAGS = -Wall -Weffc++ -std=c++0x
- CXXFLAGS = -Wall -std=c++0x
-#CXXFLAGS = -std=c++0x
-CXXLIBS = -L./src
-CXXINC = -I./src
-CXX = g++
-CXXCMD = $(CXX) $(CXXFLAGS) $(CXXINC) 
+SUBDIRS = src
 
-# Files
-#LIB_SHARED = libtightdb.so.1
-LIB_SHARED = libtightdb.a
-#LIB_STATIC = libtightdb.a
 
-SOURCES = $(wildcard src/*.cpp)
-OBJECTS = $(SOURCES:.cpp=.o)
-OBJ_SHARED = $(SOURCES:.cpp=.so)
+all: $(SUBDIRS)
+.PHONY: all
 
-# Targets
-all: static
-all: shared
+install: SUBDIRS_MODE = install
+install: all
+.PHONY: install
 
-static: CXXFLAGS += -DNDEBUG -O3
-static: $(LIB_STATIC)
- @echo "Created static library: $(LIB_STATIC)" 
-# @rm -f $(OBJECTS)
+debug: SUBDIRS_MODE = debug
+debug: all
+.PHONY: debug
 
-shared: CXXFLAGS += -DNDEBUG -O3
-shared: $(LIB_SHARED)
- @echo "Created shared library: $(LIB_SHARED)"
-# @rm -f $(OBJ_SHARED)
+cover: SUBDIRS_MODE = cover
+cover: all
+.PHONY: cover
 
-test: all
- @(cd test && make)
- @(cd test && ./run_tests.sh)
+clean: SUBDIRS_MODE = clean
+clean: $(SUBDIRS) clean/test
+clean/test:
+ @$(MAKE) -C test clean
+.PHONY: clean clean/test
 
-debug: CXXFLAGS += -DDEBUG -g3 -ggdb
-debug: all
- @(cd test && make debug)
 
-clean:
- @rm -f core *.o *.so *.1 *.a
- @rm -f core src/*.o src/*.so src/*.1 src/*.a
- @(cd test && make clean)
+test: debug
+ @$(MAKE) -C test test
+.PHONY: test
+
+memtest: debug
+ @$(MAKE) -C test memtest
+.PHONY: test
 
-# Compiling
-%.o: %.cpp
- @$(CXXCMD) -o $@ -c $<
+benchmark: all
+ @$(MAKE) -C test benchmark
+.PHONY: benchmark
 
-%.so: %.cpp
- @$(CXXCMD) -fPIC -fno-strict-aliasing -o $@ -c $<
+lcov: cover
+ @$(MAKE) -C test cover
+ find -name '*.gcda' -delete
+ cd test && ./tightdb-tests-cover --no-error-exit-staus
+ lcov --capture --directory . --output-file /tmp/tightdb.lcov
+ lcov --extract /tmp/tightdb.lcov '$(abspath .)/src/*' --output-file /tmp/tightdb-clean.lcov
+ rm -fr cover_html
+ genhtml --prefix $(abspath .) --output-directory cover_html /tmp/tightdb-clean.lcov
+.PHONY: lcov
 
-# Archive static object
-$(LIB_STATIC): $(OBJECTS)
- @ar crs $(LIB_STATIC) $^
+gcovr: cover
+ @$(MAKE) -C test cover
+ find -name '*.gcda' -delete
+ cd test && ./tightdb-tests-cover --no-error-exit-staus
+ gcovr -r src -x >gcovr.xml
+.PHONY: gcovr
 
-# Linking
-$(LIB_SHARED): $(OBJ_SHARED)
-# @$(CXXCMD) -shared -fPIC -rdynamic -Wl,-export-dynamic,-soname,$@ $^ -o $@
- @$(CXXCMD) -shared -fPIC -rdynamic -Wl,-export-dynamic $^ -o $@
+$(SUBDIRS):
+ @$(MAKE) -C $@ $(SUBDIRS_MODE)
+.PHONY: $(SUBDIRS)

TightDB.sln

@@ -35,6 +35,10 @@ Global
  Debug|x64 = Debug|x64
  Release|Win32 = Release|Win32
  Release|x64 = Release|x64
+ Static lib, debug|Win32 = Static lib, debug|Win32
+ Static lib, debug|x64 = Static lib, debug|x64
+ Static lib, release|Win32 = Static lib, release|Win32
+ Static lib, release|x64 = Static lib, release|x64
  EndGlobalSection
  GlobalSection(ProjectConfigurationPlatforms) = postSolution
  {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -45,6 +49,14 @@ Global
  {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Release|Win32.Build.0 = Release|Win32
  {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Release|x64.ActiveCfg = Release|x64
  {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Release|x64.Build.0 = Release|x64
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {C18EDDC1-166A-49C4-B483-11458F48CF8E}.Static lib, release|x64.Build.0 = Static library, release|x64
  {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Debug|Win32.ActiveCfg = Debug|Win32
  {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Debug|Win32.Build.0 = Debug|Win32
  {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Debug|x64.ActiveCfg = Debug|x64
@@ -53,6 +65,14 @@ Global
  {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Release|Win32.Build.0 = Release|Win32
  {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Release|x64.ActiveCfg = Release|x64
  {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Release|x64.Build.0 = Release|x64
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Static lib, release|x64.Build.0 = Static library, release|x64
  {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Debug|Win32.ActiveCfg = Debug|Win32
  {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Debug|Win32.Build.0 = Debug|Win32
  {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Debug|x64.ActiveCfg = Debug|x64
@@ -61,6 +81,14 @@ Global
  {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Release|Win32.Build.0 = Release|Win32
  {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Release|x64.ActiveCfg = Release|x64
  {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Release|x64.Build.0 = Release|x64
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {6DF07480-ECC6-4116-860A-818B9D2BA7B3}.Static lib, release|x64.Build.0 = Static library, release|x64
  {9C49632F-A4C9-471E-B643-42472DBF13B9}.Debug|Win32.ActiveCfg = Debug|Win32
  {9C49632F-A4C9-471E-B643-42472DBF13B9}.Debug|Win32.Build.0 = Debug|Win32
  {9C49632F-A4C9-471E-B643-42472DBF13B9}.Debug|x64.ActiveCfg = Debug|x64
@@ -69,6 +97,14 @@ Global
  {9C49632F-A4C9-471E-B643-42472DBF13B9}.Release|Win32.Build.0 = Release|Win32
  {9C49632F-A4C9-471E-B643-42472DBF13B9}.Release|x64.ActiveCfg = Release|x64
  {9C49632F-A4C9-471E-B643-42472DBF13B9}.Release|x64.Build.0 = Release|x64
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {9C49632F-A4C9-471E-B643-42472DBF13B9}.Static lib, release|x64.Build.0 = Static library, release|x64
  {C485A179-016D-4A21-AA14-1970BA070154}.Debug|Win32.ActiveCfg = Debug|Win32
  {C485A179-016D-4A21-AA14-1970BA070154}.Debug|Win32.Build.0 = Debug|Win32
  {C485A179-016D-4A21-AA14-1970BA070154}.Debug|x64.ActiveCfg = Debug|x64
@@ -77,6 +113,14 @@ Global
  {C485A179-016D-4A21-AA14-1970BA070154}.Release|Win32.Build.0 = Release|Win32
  {C485A179-016D-4A21-AA14-1970BA070154}.Release|x64.ActiveCfg = Release|x64
  {C485A179-016D-4A21-AA14-1970BA070154}.Release|x64.Build.0 = Release|x64
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {C485A179-016D-4A21-AA14-1970BA070154}.Static lib, release|x64.Build.0 = Static library, release|x64
  {54618B78-8356-44A7-8860-18A455509A86}.Debug|Win32.ActiveCfg = Debug|Win32
  {54618B78-8356-44A7-8860-18A455509A86}.Debug|Win32.Build.0 = Debug|Win32
  {54618B78-8356-44A7-8860-18A455509A86}.Debug|x64.ActiveCfg = Debug|x64
@@ -85,6 +129,14 @@ Global
  {54618B78-8356-44A7-8860-18A455509A86}.Release|Win32.Build.0 = Release|Win32
  {54618B78-8356-44A7-8860-18A455509A86}.Release|x64.ActiveCfg = Release|x64
  {54618B78-8356-44A7-8860-18A455509A86}.Release|x64.Build.0 = Release|x64
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {54618B78-8356-44A7-8860-18A455509A86}.Static lib, release|x64.Build.0 = Static library, release|x64
  {64D11991-F0F0-470D-B230-48410066090E}.Debug|Win32.ActiveCfg = Debug|Win32
  {64D11991-F0F0-470D-B230-48410066090E}.Debug|Win32.Build.0 = Debug|Win32
  {64D11991-F0F0-470D-B230-48410066090E}.Debug|x64.ActiveCfg = Debug|x64
@@ -93,6 +145,14 @@ Global
  {64D11991-F0F0-470D-B230-48410066090E}.Release|Win32.Build.0 = Release|Win32
  {64D11991-F0F0-470D-B230-48410066090E}.Release|x64.ActiveCfg = Release|x64
  {64D11991-F0F0-470D-B230-48410066090E}.Release|x64.Build.0 = Release|x64
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {64D11991-F0F0-470D-B230-48410066090E}.Static lib, release|x64.Build.0 = Static library, release|x64
  {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Debug|Win32.ActiveCfg = Debug|Win32
  {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Debug|Win32.Build.0 = Debug|Win32
  {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Debug|x64.ActiveCfg = Debug|x64
@@ -101,6 +161,14 @@ Global
  {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Release|Win32.Build.0 = Release|Win32
  {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Release|x64.ActiveCfg = Release|x64
  {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Release|x64.Build.0 = Release|x64
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, debug|Win32.ActiveCfg = Static library, debug|Win32
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, debug|Win32.Build.0 = Static library, debug|Win32
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, debug|x64.ActiveCfg = Static library, debug|x64
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, debug|x64.Build.0 = Static library, debug|x64
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, release|Win32.ActiveCfg = Static library, release|Win32
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, release|Win32.Build.0 = Static library, release|Win32
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, release|x64.ActiveCfg = Static library, release|x64
+ {69AAE70E-B352-433B-B6E9-1AEEC438B49C}.Static lib, release|x64.Build.0 = Static library, release|x64
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE