diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2018-05-09 12:44:20 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2018-05-09 12:44:20 +0800 |
| commit | ea84028d95c1869dc9fa795b46ba50e94c45bc20 (patch) | |
| tree | 67dc6b2bae2ed29026010206672a8a69126468f1 | |
| parent | c9ecb32024d856b91bc8a8c21c51548595b79be1 (diff) | |
| download | dexon-mcl-ea84028d95c1869dc9fa795b46ba50e94c45bc20.tar.gz dexon-mcl-ea84028d95c1869dc9fa795b46ba50e94c45bc20.tar.zst dexon-mcl-ea84028d95c1869dc9fa795b46ba50e94c45bc20.zip | |
mv java to ffi/java
| -rw-r--r-- | ffi/java/Bn256Test.java (renamed from java/Bn256Test.java) | 0 | ||||
| -rw-r--r-- | ffi/java/ElgamalTest.java (renamed from java/ElgamalTest.java) | 0 | ||||
| -rw-r--r-- | ffi/java/Makefile (renamed from java/Makefile) | 15 | ||||
| -rw-r--r-- | ffi/java/bn256.i (renamed from java/bn256.i) | 0 | ||||
| -rw-r--r-- | ffi/java/bn256_impl.hpp (renamed from java/bn256_impl.hpp) | 0 | ||||
| -rw-r--r-- | ffi/java/bn256_wrap.cxx (renamed from java/bn256_wrap.cxx) | 0 | ||||
| -rw-r--r-- | ffi/java/elgamal.i (renamed from java/elgamal.i) | 0 | ||||
| -rw-r--r-- | ffi/java/elgamal_impl.hpp (renamed from java/elgamal_impl.hpp) | 0 | ||||
| -rw-r--r-- | ffi/java/java.md (renamed from java/java.md) | 0 | ||||
| -rw-r--r-- | ffi/java/make_wrap.bat (renamed from java/make_wrap.bat) | 0 | ||||
| -rw-r--r-- | ffi/java/run-bn256.bat (renamed from java/run-bn256.bat) | 0 | ||||
| -rw-r--r-- | ffi/java/run-elgamal.bat (renamed from java/run-elgamal.bat) | 0 | ||||
| -rw-r--r-- | ffi/java/set-java-path.bat (renamed from java/set-java-path.bat) | 0 |
13 files changed, 8 insertions, 7 deletions
diff --git a/java/Bn256Test.java b/ffi/java/Bn256Test.java index b1f9f6f..b1f9f6f 100644 --- a/java/Bn256Test.java +++ b/ffi/java/Bn256Test.java diff --git a/java/ElgamalTest.java b/ffi/java/ElgamalTest.java index 0cf49e1..0cf49e1 100644 --- a/java/ElgamalTest.java +++ b/ffi/java/ElgamalTest.java diff --git a/java/Makefile b/ffi/java/Makefile index f7b01f3..d69c043 100644 --- a/java/Makefile +++ b/ffi/java/Makefile @@ -1,4 +1,5 @@ -include ../common.mk +TOP_DIR=../.. +include $(TOP_DIR)/common.mk ifeq ($(UNAME_S),Darwin) JAVA_INC=-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/ else @@ -7,15 +8,15 @@ else CFLAGS+=-z noexecstack LDFLAGS+=-lrt endif -CFLAGS+=$(JAVA_INC) $(JAVA_INC)/linux -I ../include -I ../../xbyak -I ../../cybozulib/include -Wno-strict-aliasing -MCL_LIB=../lib/libmcl.a +CFLAGS+=$(JAVA_INC) $(JAVA_INC)/linux -I $(TOP_DIR)/include -I $(TOP_DIR)/../xbyak -I $(TOP_DIR)/../cybozulib/include -Wno-strict-aliasing +MCL_LIB=$(TOP_DIR)/lib/libmcl.a PACKAGE_NAME=com.herumi.mcl PACKAGE_DIR=$(subst .,/,$(PACKAGE_NAME)) -ELGAMAL_LIB=../bin/libmcl_elgamal.$(LIB_SUF) -BN256_LIB=../bin/libmcl_bn256.$(LIB_SUF) -JAVA_EXE=cd ../bin && LD_LIBRARY_PATH=./:$(LD_LIBRARY_PATH) java -classpath ../java +ELGAMAL_LIB=$(TOP_DIR)/bin/libmcl_elgamal.$(LIB_SUF) +BN256_LIB=$(TOP_DIR)/bin/libmcl_bn256.$(LIB_SUF) +JAVA_EXE=cd $(TOP_DIR)/bin && LD_LIBRARY_PATH=./:$(LD_LIBRARY_PATH) java -classpath ../ffi/java all: $(ELGAMAL_LIB) elgamal_wrap.cxx: elgamal.i elgamal_impl.hpp @@ -27,7 +28,7 @@ bn256_wrap.cxx: bn256.i bn256_impl.hpp swig -java -package $(PACKAGE_NAME) -outdir $(PACKAGE_DIR) -c++ -Wall bn256.i $(MCL_LIB): - make -C .. + make -C $(TOP_DIR) $(ELGAMAL_LIB): elgamal_wrap.cxx $(MCL_LIB) $(PRE)$(CXX) $< -o $@ $(CFLAGS) $(LDFLAGS) $(MCL_LIB) -shared diff --git a/java/bn256.i b/ffi/java/bn256.i index 94a8edb..94a8edb 100644 --- a/java/bn256.i +++ b/ffi/java/bn256.i diff --git a/java/bn256_impl.hpp b/ffi/java/bn256_impl.hpp index c4caaf3..c4caaf3 100644 --- a/java/bn256_impl.hpp +++ b/ffi/java/bn256_impl.hpp diff --git a/java/bn256_wrap.cxx b/ffi/java/bn256_wrap.cxx index 8b6a796..8b6a796 100644 --- a/java/bn256_wrap.cxx +++ b/ffi/java/bn256_wrap.cxx diff --git a/java/elgamal.i b/ffi/java/elgamal.i index 4107231..4107231 100644 --- a/java/elgamal.i +++ b/ffi/java/elgamal.i diff --git a/java/elgamal_impl.hpp b/ffi/java/elgamal_impl.hpp index dbf2ba6..dbf2ba6 100644 --- a/java/elgamal_impl.hpp +++ b/ffi/java/elgamal_impl.hpp diff --git a/java/java.md b/ffi/java/java.md index 3fe8613..3fe8613 100644 --- a/java/java.md +++ b/ffi/java/java.md diff --git a/java/make_wrap.bat b/ffi/java/make_wrap.bat index 8198b8a..8198b8a 100644 --- a/java/make_wrap.bat +++ b/ffi/java/make_wrap.bat diff --git a/java/run-bn256.bat b/ffi/java/run-bn256.bat index 19018c1..19018c1 100644 --- a/java/run-bn256.bat +++ b/ffi/java/run-bn256.bat diff --git a/java/run-elgamal.bat b/ffi/java/run-elgamal.bat index 0b57938..0b57938 100644 --- a/java/run-elgamal.bat +++ b/ffi/java/run-elgamal.bat diff --git a/java/set-java-path.bat b/ffi/java/set-java-path.bat index c66f818..c66f818 100644 --- a/java/set-java-path.bat +++ b/ffi/java/set-java-path.bat |