Skip to content

Commit cb93a91

Browse files
kspangsegekspangsege
committed
Various fixes relating to the build system
1 parent 6842530 commit cb93a91

8 files changed

Lines changed: 557 additions & 396 deletions

File tree

‎.gitignore‎

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
*~
2-
*.bat
3-
*.orig
4-
tightdb_jni??d*.dll
5-
tightdb_jni*.exp
6-
7-
/examples/*/*/generated/*
8-
/examples/*/generated/*
9-
/examples/*/generated-sources/*
10-
/examples/*/lib
11-
12-
*.tightdb
13-
.metadata/*
14-
15-
*.sdf
16-
*.opensdf
17-
*.ipch
18-
/bin
19-
20-
.classpath
21-
.project
22-
.factorypath
23-
target
24-
25-
*/.classpath
26-
*/.project
27-
*/.factorypath
28-
29-
#ignore thumbnails created by windows
30-
Thumbs.db
31-
#Ignore files build by Visual Studio
32-
*.obj
33-
*.exe
34-
*.pdb
35-
*.user
36-
*.aps
37-
*.pch
38-
*.vspscc
39-
*_i.c
40-
*_p.c
41-
*.ncb
42-
*.suo
43-
*.tlb
44-
*.tlh
45-
*.bak
46-
*.cache
47-
*.ilk
48-
*.log
49-
[Bb]in
50-
[Dd]ebug*/
51-
*.lib
52-
*.sbr
53-
obj/
54-
[Rr]elease*/
55-
_ReSharper*/
56-
[Tt]est[Rr]esult*
57-
*/target
58-
.settings/*
59-
*/.settings/*
60-
*/test-output
61-
62-
# ref-doc
63-
/doc/ref/html
64-
65-
# sh build.sh config
66-
/config
67-
68-
# sh build.sh build
69-
/lib
70-
71-
# sh build.sh test
72-
/test_output
73-
74-
.DS_Store
75-
76-
.idea
77-
*.iml
78-
79-
*.lock
80-
81-
tightdb-java-test/testng.xml
82-
83-
*.prefs
84-
85-
# Ref doc generated classes
86-
87-
doc/ref/examples/generated/com/tightdb/refdoc/*.java
88-
89-
# generated json output in ref doc json example
90-
91-
doc/ref/examples/fromServlet
92-
93-
94-
# debian packaging
95-
/debian/tightdb-java
96-
/debian/tightdb-java-dev
97-
/debian/.mh
1+
*~
2+
*.bat
3+
*.orig
4+
tightdb_jni??d*.dll
5+
tightdb_jni*.exp
6+
7+
/examples/*/*/generated/*
8+
/examples/*/generated/*
9+
/examples/*/generated-sources/*
10+
/examples/*/lib
11+
12+
*.tightdb
13+
.metadata/*
14+
15+
*.sdf
16+
*.opensdf
17+
*.ipch
18+
/bin
19+
20+
.classpath
21+
.project
22+
.factorypath
23+
target
24+
25+
*/.classpath
26+
*/.project
27+
*/.factorypath
28+
29+
#ignore thumbnails created by windows
30+
Thumbs.db
31+
#Ignore files build by Visual Studio
32+
*.obj
33+
*.exe
34+
*.pdb
35+
*.user
36+
*.aps
37+
*.pch
38+
*.vspscc
39+
*_i.c
40+
*_p.c
41+
*.ncb
42+
*.suo
43+
*.tlb
44+
*.tlh
45+
*.bak
46+
*.cache
47+
*.ilk
48+
*.log
49+
[Bb]in
50+
[Dd]ebug*/
51+
*.lib
52+
*.sbr
53+
obj/
54+
[Rr]elease*/
55+
_ReSharper*/
56+
[Tt]est[Rr]esult*
57+
*/target
58+
.settings/*
59+
*/.settings/*
60+
*/test-output
61+
62+
# ref-doc
63+
/doc/ref/html
64+
65+
# sh build.sh config
66+
/tightdb_jni/config-dyn.mk
67+
68+
# sh build.sh build
69+
/lib
70+
71+
# sh build.sh test
72+
/test_output
73+
74+
.DS_Store
75+
76+
.idea
77+
*.iml
78+
79+
*.lock
80+
81+
tightdb-java-test/testng.xml
82+
83+
*.prefs
84+
85+
# Ref doc generated classes
86+
87+
doc/ref/examples/generated/com/tightdb/refdoc/*.java
88+
89+
# generated json output in ref doc json example
90+
91+
doc/ref/examples/fromServlet
92+
93+
94+
# debian packaging
95+
/debian/tightdb-java
96+
/debian/tightdb-java-dev
97+
/debian/.mh
9898

9999

100100
# generated json output in ref doc json example

‎README.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,15 @@ example:
186186

187187
JAVA_HOME=/opt/jdk-1.7 sh build.sh config
188188

189+
By default, the configuration step uses `which tightdb-config` to
190+
locate the installation of the TightDB core library. If this is not
191+
appropriate, because you have multiple versions of the TightDB core
192+
library installed, or `tightdb-config` is not available in your
193+
`PATH`, set the environment variable `TIGHTDB_CONFIG` before calling
194+
`sh build.sh config`. For example:
195+
196+
TIGHTDB_CONFIG=/opt/tightdb-v0.1.2/bin/tightdb-config build.sh config
197+
189198
To use a nondefault compiler, or a compiler in a nondefault location,
190199
set the environment variable `CC` before calling `sh build.sh build`,
191200
as in the following example:
@@ -195,8 +204,8 @@ as in the following example:
195204
There are also a number of environment variables that serve to enable
196205
or disable special features during building:
197206

198-
Set `TIGHTDB_ENABLE_MEM_USAGE` to a nonempty value to enable
199-
reporting of memory usage.
207+
Set `TIGHTDB_ENABLE_MEM_USAGE` to a nonempty value during the build
208+
step to enable reporting of memory usage.
200209

201210

202211
Setting up a project

0 commit comments

Comments
 (0)