Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #90 from lukaszstolarczuk/merge-stable-1.0-into-ma…
Browse files Browse the repository at this point in the history
…ster

Merge changes from stable-1.0 into master
  • Loading branch information
igchor authored Sep 9, 2020
2 parents bd03a2e + 2a13335 commit e04ca43
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Java API is documented with javadocs and can be found as html here:

* [pmemkv](https://github.com/pmem/pmemkv) - native key/value library
* pmemkv source package (libpmemkv-devel, pmemkv-devel)
* Java 8 or higher
* Java 8
* gcc-c++ compiler
* [Apache Maven](https://maven.apache.org) - build system

Expand Down Expand Up @@ -49,18 +49,20 @@ mvn install
```

If dependencies (pmemkv, libpmemobj-cpp, pmdk, etc.) are installed in non-standard
location it may be also necessary to set it in LD_LIBRARY_PATH, e.g.:
location(s) it may be also necessary to set up:
**CPLUS_INCLUDE_PATH** and **LIBRARY_PATH** for compiling and linking JNI code (gcc env. variables),
**LD_LIBRARY_PATH** for examples/tests execution.

```sh
LD_LIBRARY_PATH=path_to_your_libs mvn install
CPLUS_INCLUDE_PATH=<path_to_includes> LIBRARY_PATH=<path_to_libs> LD_LIBRARY_PATH=<path_to_libs> mvn install
```

## Testing

This library includes a set of automated tests that exercise all functionality.

```sh
LD_LIBRARY_PATH=path_to_your_libs mvn test
LD_LIBRARY_PATH=<path_to_libs> mvn test
```

## Examples
Expand All @@ -75,7 +77,7 @@ To execute them, run e.g.:
```sh
cd examples
javac -cp ../src/main/target/*.jar StringExample.java
PMEM_IS_PMEM_FORCE=1 java -ea -Xms1G -cp .:`find ../src/main/target -name *.jar` -Djava.library.path=../src/main/cpp/target StringExample
LD_LIBRARY_PATH=<path_to_libs> PMEM_IS_PMEM_FORCE=1 java -ea -Xms1G -cp .:`find ../src/main/target -name *.jar` -Djava.library.path=../src/main/cpp/target StringExample
```

## Documentation
Expand Down
7 changes: 0 additions & 7 deletions src/main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,6 @@
</build>

<dependencies>
<dependency>
<groupId>io.pmem</groupId>
<artifactId>libpmemkv-jni</artifactId>
<version>1.0.0</version>
<scope>runtime</scope>
<type>so</type>
</dependency>
<dependency>
<groupId>com.mscharhag.oleaster</groupId>
<artifactId>oleaster-matcher</artifactId>
Expand Down

0 comments on commit e04ca43

Please sign in to comment.