Skip to content

Commit

Permalink
- Added shared ClassInfo
Browse files Browse the repository at this point in the history
- ComparableWith interface support for FPTree2
- Removed java docs
- Added configuration properties file
  • Loading branch information
parasa-vamsi committed Oct 20, 2017
1 parent 65da6d6 commit b982f5e
Show file tree
Hide file tree
Showing 266 changed files with 877 additions and 96,049 deletions.
10 changes: 6 additions & 4 deletions Makefile
Expand Up @@ -19,14 +19,15 @@
# Boston, MA 02110-1301, USA.

CC = g++
JAVAC = javac
JAVAC = javac
JAVA = java
JAVADOC = $(JAVA_HOME)/bin/javadoc

JNI_INCLUDES = $(JAVA_HOME)/include $(JAVA_HOME)/include/linux

CFLAGS = -O3 -DNDEBUG -fPIC
JAVAFLAGS = -Xlint:unchecked -XDenableSunApiLintControl -proc:none
NO_PROC = -proc:none
JAVAFLAGS = -Xlint:unchecked -XDenableSunApiLintControl $(NO_PROC)
LINK_FLAGS = -fPIC -O3 -DNDEBUG -shared -lpmem -lpmemobj -Wl,-rpath,/usr/local/lib:/usr/local/lib64

CPP_SOURCE_DIR = src/main/cpp
Expand All @@ -41,7 +42,7 @@ CPP_BUILD_DIR = $(TARGET_DIR)/cppbuild
CLASSES_DIR = $(TARGET_DIR)/classes
TEST_CLASSES_DIR = $(TARGET_DIR)/test_classes

BASE_CLASSPATH = $(CLASSES_DIR):lib
BASE_CLASSPATH = $(CLASSES_DIR):lib:lib/ST-4.0.8.jar:

ALL_CPP_SOURCES = $(wildcard $(CPP_SOURCE_DIR)/*.cpp)
ALL_JAVA_SOURCES = $(wildcard $(JAVA_SOURCE_DIR)/$(PACKAGE_NAME)/*.java) $(wildcard $(JAVA_SOURCE_DIR)/$(XPACKAGE_NAME)/*.java) $(wildcard $(JAVA_SOURCE_DIR)/$(PACKAGE_NAME)/*/*.java)
Expand All @@ -61,7 +62,8 @@ cpp: $(LIBRARIES)
java: classes

examples: sources
$(foreach example_dir,$(ALL_EXAMPLE_DIRS), $(JAVAC) $(JAVAFLAGS) -cp $(BASE_CLASSPATH):$(example_dir) $(example_dir)/*.java;)
# $(foreach example_dir,$(ALL_EXAMPLE_DIRS), $(JAVAC) $(JAVAFLAGS) -cp $(BASE_CLASSPATH):$(example_dir) $(example_dir)/*.java;)
$(foreach example_dir,$(ALL_EXAMPLE_DIRS), $(JAVAC) $(JAVAFLAGS) -cp $(BASE_CLASSPATH) $(example_dir)/*.java;)

docs:
rm -rf doc
Expand Down
12 changes: 12 additions & 0 deletions config.properties
@@ -0,0 +1,12 @@
# HOW-TO
# Two parameters MUST be specified:
# - path: path to persistent memory pool; this could be one of the following:
# - path to a file acting as the memory pool, possibly in a PMEM-aware file system; e.g. /mnt/mem/persistent_heap
# - path to a device DAX, e.g. /dev/dax0.0
# - path to a fused poolset configuration file, e.g. ~/pcj/myobjpool.set
# - size: size of the memory pool; this could be one of the following:
# - if using a file-based memory pool: set to any desired pool size not exceeding the size of the device the file is on
# - if using a device DAX or fused poolset: MUST set to 0; the whole device(s) will be used; any other value will result in an error

path=/mnt/mem/persistent_heap
size=2147483648
198 changes: 0 additions & 198 deletions doc/allclasses-frame.html

This file was deleted.

198 changes: 0 additions & 198 deletions doc/allclasses-noframe.html

This file was deleted.

322 changes: 0 additions & 322 deletions doc/constant-values.html

This file was deleted.

0 comments on commit b982f5e

Please sign in to comment.