Skip to content

Commit 6e63135

Browse files
hovoerehovoere
committed
Merged with latest master
2 parents 97201f8 + 004906f commit 6e63135

291 files changed

Lines changed: 2196 additions & 2243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.JNI-h-file-generation.launch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</listAttribute>
66
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
77
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\Program Files\Java\jdk1.7.0\bin\javah.exe"/>
8-
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc:/tightdb-core/target/classes} com.tightdb.Group com.tightdb.Table com.tightdb.TableView com.tightdb.TableQuery com.tightdb.internal.Util com.tightdb.SharedGroup com.tightdb.SubtableSchema com.tightdb.Version"/>
9-
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/tightdb-core/target/classes}"/>
8+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc:/realm-core/target/classes} io.realm.Group io.realm.Table io.realm.TableView io.realm.TableQuery io.realm.internal.Util io.realm.SharedGroup io.realm.SubtableSchema io.realm.Version"/>
9+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/realm-core/target/classes}"/>
1010
</launchConfiguration>

‎.gitignore‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ tightdb_jni*.exp
88
/examples/*/generated/*
99
/examples/*/generated-sources/*
1010
/examples/*/lib
11-
1211
*.tightdb
12+
*.realm
1313
.metadata/*
1414

1515
*.sdf
@@ -63,7 +63,7 @@ _ReSharper*/
6363
/doc/ref/html
6464

6565
# sh build.sh config
66-
/tightdb_jni/config.mk
66+
/realm_jni/config.mk
6767

6868
# sh build.sh build
6969
/lib
@@ -81,13 +81,13 @@ _ReSharper*/
8181

8282
*.lock
8383

84-
/tightdb-java-test/testng.xml
84+
/realm-java-test/testng.xml
8585

8686
*.prefs
8787

8888
# Ref doc generated classes
8989

90-
/doc/ref/examples/generated/com/tightdb/refdoc/*.java
90+
/doc/ref/examples/generated/io/realm/refdoc/*.java
9191

9292
# generated json output in ref doc json example
9393

@@ -105,6 +105,8 @@ _ReSharper*/
105105

106106
# generated lib files
107107
/java/share/java/*.jar
108-
/tightdb_jni/src/*.dylib
109108

110109
RealmAndroid/lib/libs/tightdb-android-0.10.0.jar
110+
/realm_jni/src/*.dylib
111+
112+
realm-java-test/*.realm

‎build-replication.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ cd "$TIGHTDB_JAVA_HOME/tightdb-example/src/main/java" || exit 1
1919
find com/ -type f -name '*.class' -delete || exit 1
2020
export CLASSPATH="$TIGHTDB_JAVA_HOME/src/main/java/tightdb.jar:."
2121
javac com/tightdb/example/ReplicationExample.java com/tightdb/example/generated/*.java || exit 1
22-
java -Djava.library.path="$TIGHTDB_JAVA_HOME/tightdb_jni/src" com.tightdb.example.ReplicationExample --database-file /tmp/replication.tightdb || exit 1
22+
java -Djava.library.path="$TIGHTDB_JAVA_HOME/tightdb_jni/src" io.realm.example.ReplicationExample --database-file /tmp/replication.tightdb || exit 1

0 commit comments

Comments
 (0)