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

Commit

Permalink
ejdb-java migration
Browse files Browse the repository at this point in the history
  • Loading branch information
adamansky committed Sep 13, 2013
1 parent 5cbde36 commit f65408f
Show file tree
Hide file tree
Showing 9 changed files with 2,086 additions and 188 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.codelite/
Makefile
*.log
*.status
autom4te.cache/
*.so
*.so.*
/target
/build
.clang
compilation.db
build.properties
7 changes: 3 additions & 4 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ PACKAGE = @PACKAGE_NAME@
VERSION = @PACKAGE_VERSION@
LIBVER = @MYLIBVER@
LIBREV = @MYLIBREV@
FORMATVER = @MYFORMATVER@

# Targets
LIBRARYFILES = @MYLIBRARYFILES@
Expand All @@ -19,6 +18,7 @@ LIBRARYFILES = @MYLIBRARYFILES@
# Install destinations
prefix = @prefix@
exec_prefix = @exec_prefix@
INCLUDEDIR = @includedir@
LIBDIR = ${exec_prefix}/lib
DESTDIR =

Expand All @@ -38,7 +38,7 @@ LIBS = @LIBS@
# Actions
#================================================================

all: $(LIBRARYFILES) jejdb tests
all: $(LIBRARYFILES) jejdb
@printf '\n'
@printf '#================================================================\n'
@printf '# Ready to install.\n'
Expand All @@ -47,7 +47,7 @@ all: $(LIBRARYFILES) jejdb tests
compile-native : $(LIBRARYFILES)

jejdb:
ant build
ant build.and.test

tests:
ant build.and.test
Expand Down Expand Up @@ -84,6 +84,5 @@ libjejdb.so.$(LIBVER).$(LIBREV).0 :
libjejdb.so.$(LIBVER) : libjejdb.so.$(LIBVER).$(LIBREV).0
ln -f -s libjejdb.so.$(LIBVER).$(LIBREV).0 $@


libjejdb.so : libjejdb.so.$(LIBVER).$(LIBREV).0
ln -f -s libjejdb.so.$(LIBVER).$(LIBREV).0 $@
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ Installation
**(A) Installing directly from sources**

```
git clone https://github.com/Softmotions/ejdb.git
cd ./jejdb
./configure --prefix=<installation prefix> && make && make tests
git clone https://github.com/Softmotions/ejdb-java.git
cd ./ejdb-java
./configure --with-jdk=<path to JDK> --prefix=<installation prefix>
make
sudo make install
```

Expand Down
2 changes: 1 addition & 1 deletion build.properties → build.properties.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distr.version=1.0.1
distr.version=@PACKAGE_VERSION@
distr.name=jejdb-${distr.version}

distr.base=${basedir}/target
Expand Down
Loading

0 comments on commit f65408f

Please sign in to comment.