-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
JNI support with CI workflow #9
Merged
+1,626
−529
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
df244b4
Update bitcoin-core to latest version (commit 694ce8fb2d1fd8a3d641d7c…
tgrospic f00ab0a
Remove obsolete files
tgrospic 88b7754
Add initial files for JNI support
tgrospic b91a1e1
Compile script for linux and macos with JNI enabled
tgrospic 54a9679
Add CI workflows, fix for macos JDK path
tgrospic 62b6c12
Add bors bot config
tgrospic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,241 @@ | ||
.PHONY: clean-precomp precomp | ||
|
||
ACLOCAL_AMFLAGS = -I build-aux/m4 | ||
|
||
# AM_CFLAGS will be automatically prepended to CFLAGS by Automake when compiling some foo | ||
# which does not have an explicit foo_CFLAGS variable set. | ||
AM_CFLAGS = $(SECP_CFLAGS) | ||
|
||
lib_LTLIBRARIES = libsecp256k1.la | ||
if USE_JNI | ||
JNI_LIB = libsecp256k1_jni.la | ||
noinst_LTLIBRARIES = $(JNI_LIB) | ||
else | ||
JNI_LIB = | ||
noinst_LTLIBRARIES = | ||
endif | ||
|
||
include_HEADERS = include/secp256k1.h | ||
include_HEADERS += include/secp256k1_preallocated.h | ||
noinst_HEADERS = | ||
noinst_HEADERS += src/scalar.h | ||
noinst_HEADERS += src/scalar_4x64.h | ||
noinst_HEADERS += src/scalar_8x32.h | ||
noinst_HEADERS += src/scalar_low.h | ||
noinst_HEADERS += src/scalar_impl.h | ||
noinst_HEADERS += src/scalar_4x64_impl.h | ||
noinst_HEADERS += src/scalar_8x32_impl.h | ||
noinst_HEADERS += src/scalar_low_impl.h | ||
noinst_HEADERS += src/group.h | ||
noinst_HEADERS += src/group_impl.h | ||
noinst_HEADERS += src/ecdsa.h | ||
noinst_HEADERS += src/ecdsa_impl.h | ||
noinst_HEADERS += src/eckey.h | ||
noinst_HEADERS += src/eckey_impl.h | ||
noinst_HEADERS += src/ecmult.h | ||
noinst_HEADERS += src/ecmult_impl.h | ||
noinst_HEADERS += src/ecmult_compute_table.h | ||
noinst_HEADERS += src/ecmult_compute_table_impl.h | ||
noinst_HEADERS += src/ecmult_const.h | ||
noinst_HEADERS += src/ecmult_const_impl.h | ||
noinst_HEADERS += src/ecmult_gen.h | ||
noinst_HEADERS += src/ecmult_gen_impl.h | ||
noinst_HEADERS += src/ecmult_gen_compute_table.h | ||
noinst_HEADERS += src/ecmult_gen_compute_table_impl.h | ||
noinst_HEADERS += src/field_10x26.h | ||
noinst_HEADERS += src/field_10x26_impl.h | ||
noinst_HEADERS += src/field_5x52.h | ||
noinst_HEADERS += src/field_5x52_impl.h | ||
noinst_HEADERS += src/field_5x52_int128_impl.h | ||
noinst_HEADERS += src/field_5x52_asm_impl.h | ||
noinst_HEADERS += src/modinv32.h | ||
noinst_HEADERS += src/modinv32_impl.h | ||
noinst_HEADERS += src/modinv64.h | ||
noinst_HEADERS += src/modinv64_impl.h | ||
noinst_HEADERS += src/precomputed_ecmult.h | ||
noinst_HEADERS += src/precomputed_ecmult_gen.h | ||
noinst_HEADERS += src/assumptions.h | ||
noinst_HEADERS += src/java/org_bitcoin_NativeSecp256k1.h | ||
noinst_HEADERS += src/java/org_bitcoin_Secp256k1Context.h | ||
noinst_HEADERS += src/util.h | ||
noinst_HEADERS += src/scratch.h | ||
noinst_HEADERS += src/scratch_impl.h | ||
noinst_HEADERS += src/selftest.h | ||
noinst_HEADERS += src/testrand.h | ||
noinst_HEADERS += src/testrand_impl.h | ||
noinst_HEADERS += src/hash.h | ||
noinst_HEADERS += src/hash_impl.h | ||
noinst_HEADERS += src/field.h | ||
noinst_HEADERS += src/field_impl.h | ||
noinst_HEADERS += src/bench.h | ||
noinst_HEADERS += contrib/lax_der_parsing.h | ||
noinst_HEADERS += contrib/lax_der_parsing.c | ||
noinst_HEADERS += contrib/lax_der_privatekey_parsing.h | ||
noinst_HEADERS += contrib/lax_der_privatekey_parsing.c | ||
noinst_HEADERS += examples/random.h | ||
|
||
PRECOMPUTED_LIB = libsecp256k1_precomputed.la | ||
noinst_LTLIBRARIES += $(PRECOMPUTED_LIB) | ||
libsecp256k1_precomputed_la_SOURCES = src/precomputed_ecmult.c src/precomputed_ecmult_gen.c | ||
libsecp256k1_precomputed_la_CPPFLAGS = $(SECP_INCLUDES) | ||
|
||
if USE_EXTERNAL_ASM | ||
COMMON_LIB = libsecp256k1_common.la | ||
else | ||
COMMON_LIB = | ||
endif | ||
noinst_LTLIBRARIES += $(COMMON_LIB) | ||
|
||
pkgconfigdir = $(libdir)/pkgconfig | ||
pkgconfig_DATA = libsecp256k1.pc | ||
|
||
if USE_EXTERNAL_ASM | ||
if USE_ASM_ARM | ||
libsecp256k1_common_la_SOURCES = src/asm/field_10x26_arm.s | ||
endif | ||
endif | ||
|
||
libsecp256k1_la_SOURCES = src/secp256k1.c | ||
libsecp256k1_la_CPPFLAGS = $(SECP_INCLUDES) | ||
libsecp256k1_la_LIBADD = $(JNI_LIB) $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB) | ||
libsecp256k1_jni_la_SOURCES = src/java/org_bitcoin_NativeSecp256k1.c src/java/org_bitcoin_Secp256k1Context.c | ||
libsecp256k1_jni_la_CPPFLAGS = -DSECP256K1_BUILD $(JNI_INCLUDES) | ||
libsecp256k1_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_CURRENT):$(LIB_VERSION_REVISION):$(LIB_VERSION_AGE) | ||
|
||
if VALGRIND_ENABLED | ||
libsecp256k1_la_CPPFLAGS += -DVALGRIND | ||
endif | ||
|
||
noinst_PROGRAMS = | ||
if USE_BENCHMARK | ||
noinst_PROGRAMS += bench bench_internal bench_ecmult | ||
bench_SOURCES = src/bench.c | ||
bench_LDADD = libsecp256k1.la $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB) | ||
bench_internal_SOURCES = src/bench_internal.c | ||
bench_internal_LDADD = $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB) | ||
bench_internal_CPPFLAGS = $(SECP_INCLUDES) | ||
bench_ecmult_SOURCES = src/bench_ecmult.c | ||
bench_ecmult_LDADD = $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB) | ||
bench_ecmult_CPPFLAGS = $(SECP_INCLUDES) | ||
endif | ||
|
||
TESTS = | ||
if USE_TESTS | ||
noinst_PROGRAMS += tests | ||
tests_SOURCES = src/tests.c | ||
tests_CPPFLAGS = $(SECP_INCLUDES) $(SECP_TEST_INCLUDES) | ||
if VALGRIND_ENABLED | ||
tests_CPPFLAGS += -DVALGRIND | ||
noinst_PROGRAMS += valgrind_ctime_test | ||
valgrind_ctime_test_SOURCES = src/valgrind_ctime_test.c | ||
valgrind_ctime_test_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB) | ||
endif | ||
if !ENABLE_COVERAGE | ||
tests_CPPFLAGS += -DVERIFY | ||
endif | ||
tests_LDADD = $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB) | ||
tests_LDFLAGS = -static | ||
TESTS += tests | ||
endif | ||
|
||
if USE_EXHAUSTIVE_TESTS | ||
noinst_PROGRAMS += exhaustive_tests | ||
exhaustive_tests_SOURCES = src/tests_exhaustive.c | ||
exhaustive_tests_CPPFLAGS = $(SECP_INCLUDES) | ||
if !ENABLE_COVERAGE | ||
exhaustive_tests_CPPFLAGS += -DVERIFY | ||
endif | ||
# Note: do not include $(PRECOMPUTED_LIB) in exhaustive_tests (it uses runtime-generated tables). | ||
exhaustive_tests_LDADD = $(SECP_LIBS) $(COMMON_LIB) | ||
exhaustive_tests_LDFLAGS = -static | ||
TESTS += exhaustive_tests | ||
endif | ||
|
||
if USE_EXAMPLES | ||
noinst_PROGRAMS += ecdsa_example | ||
ecdsa_example_SOURCES = examples/ecdsa.c | ||
ecdsa_example_CPPFLAGS = -I$(top_srcdir)/include | ||
ecdsa_example_LDADD = libsecp256k1.la | ||
ecdsa_example_LDFLAGS = -static | ||
if BUILD_WINDOWS | ||
ecdsa_example_LDFLAGS += -lbcrypt | ||
endif | ||
TESTS += ecdsa_example | ||
if ENABLE_MODULE_ECDH | ||
noinst_PROGRAMS += ecdh_example | ||
ecdh_example_SOURCES = examples/ecdh.c | ||
ecdh_example_CPPFLAGS = -I$(top_srcdir)/include | ||
ecdh_example_LDADD = libsecp256k1.la | ||
ecdh_example_LDFLAGS = -static | ||
if BUILD_WINDOWS | ||
ecdh_example_LDFLAGS += -lbcrypt | ||
endif | ||
TESTS += ecdh_example | ||
endif | ||
if ENABLE_MODULE_SCHNORRSIG | ||
noinst_PROGRAMS += schnorr_example | ||
schnorr_example_SOURCES = examples/schnorr.c | ||
schnorr_example_CPPFLAGS = -I$(top_srcdir)/include | ||
schnorr_example_LDADD = libsecp256k1.la | ||
schnorr_example_LDFLAGS = -static | ||
if BUILD_WINDOWS | ||
schnorr_example_LDFLAGS += -lbcrypt | ||
endif | ||
TESTS += schnorr_example | ||
endif | ||
endif | ||
|
||
### Precomputed tables | ||
EXTRA_PROGRAMS = precompute_ecmult precompute_ecmult_gen | ||
CLEANFILES = $(EXTRA_PROGRAMS) | ||
|
||
precompute_ecmult_SOURCES = src/precompute_ecmult.c | ||
precompute_ecmult_CPPFLAGS = $(SECP_INCLUDES) | ||
precompute_ecmult_LDADD = $(SECP_LIBS) $(COMMON_LIB) | ||
|
||
precompute_ecmult_gen_SOURCES = src/precompute_ecmult_gen.c | ||
precompute_ecmult_gen_CPPFLAGS = $(SECP_INCLUDES) | ||
precompute_ecmult_gen_LDADD = $(SECP_LIBS) $(COMMON_LIB) | ||
|
||
# See Automake manual, Section "Errors with distclean". | ||
# We don't list any dependencies for the prebuilt files here because | ||
# otherwise make's decision whether to rebuild them (even in the first | ||
# build by a normal user) depends on mtimes, and thus is very fragile. | ||
# This means that rebuilds of the prebuilt files always need to be | ||
# forced by deleting them, e.g., by invoking `make clean-precomp`. | ||
src/precomputed_ecmult.c: | ||
$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(EXEEXT) | ||
./precompute_ecmult$(EXEEXT) | ||
src/precomputed_ecmult_gen.c: | ||
$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(EXEEXT) | ||
./precompute_ecmult_gen$(EXEEXT) | ||
|
||
PRECOMP = src/precomputed_ecmult_gen.c src/precomputed_ecmult.c | ||
precomp: $(PRECOMP) | ||
|
||
# Ensure the prebuilt files will be build first (only if they don't exist, | ||
# e.g., after `make maintainer-clean`). | ||
BUILT_SOURCES = $(PRECOMP) | ||
|
||
maintainer-clean-local: clean-precomp | ||
|
||
clean-precomp: | ||
rm -f $(PRECOMP) | ||
|
||
EXTRA_DIST = autogen.sh SECURITY.md | ||
|
||
if ENABLE_MODULE_ECDH | ||
include src/modules/ecdh/Makefile.am.include | ||
endif | ||
|
||
if ENABLE_MODULE_RECOVERY | ||
include src/modules/recovery/Makefile.am.include | ||
endif | ||
|
||
if ENABLE_MODULE_EXTRAKEYS | ||
include src/modules/extrakeys/Makefile.am.include | ||
endif | ||
|
||
if ENABLE_MODULE_SCHNORRSIG | ||
include src/modules/schnorrsig/Makefile.am.include | ||
endif |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to have a patch for original Makefile here instead of rewriting the whole file? Same for
configure.ac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an initial version with the copy of the whole files. Changes should be extracted to a script or diff file.