Asher Dawes
5 years ago
committed by
GitHub
GitHub
32 changed files with 103 additions and 9729 deletions
@ -1,218 +0,0 @@ |
|||||
*** Makefile.am 2017-01-03 10:53:52.436371005 +0000 |
|
||||
--- ../../komodo-jl777/Makefile.am 2017-01-03 09:49:08.848505929 +0000
|
|
||||
*************** |
|
||||
*** 39,58 **** |
|
||||
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \ |
|
||||
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh |
|
||||
|
|
||||
-
|
|
||||
- if BUILD_DARWIN
|
|
||||
- COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
|
|
||||
- leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
|
|
||||
- baseline_filtered.info block_test_filtered.info \
|
|
||||
- leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
|
|
||||
- # zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
|
|
||||
- else
|
|
||||
COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \ |
|
||||
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \ |
|
||||
baseline_filtered.info block_test_filtered.info \ |
|
||||
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \ |
|
||||
zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info |
|
||||
- endif
|
|
||||
|
|
||||
dist-hook: |
|
||||
-$(MAKE) -C $(top_distdir)/src/leveldb clean |
|
||||
--- 39,49 ----
|
|
||||
*************** |
|
||||
*** 159,173 **** |
|
||||
baseline.info: |
|
||||
$(LCOV) -c -i -d $(abs_builddir)/src -o $@ |
|
||||
|
|
||||
- if BUILD_DARWIN
|
|
||||
- baseline_filtered.info: baseline.info
|
|
||||
- $(LCOV) -r $< "/usr/include/*" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
|
|
||||
- "$(abs_builddir)/src/test/*" \
|
|
||||
- -o $@
|
|
||||
- else
|
|
||||
baseline_filtered.info: baseline.info |
|
||||
$(LCOV) -r $< "/usr/include/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ |
|
||||
--- 150,155 ----
|
|
||||
*************** |
|
||||
*** 177,196 **** |
|
||||
"$(abs_builddir)/src/gtest/*" \ |
|
||||
"$(abs_builddir)/src/test/*" \ |
|
||||
-o $@ |
|
||||
- endif
|
|
||||
|
|
||||
leveldb_baseline.info: baseline_filtered.info |
|
||||
$(LCOV) -c -i -d $(abs_builddir)/src/leveldb -b $(abs_builddir)/src/leveldb -o $@ |
|
||||
|
|
||||
- if BUILD_DARWIN
|
|
||||
- leveldb_baseline_filtered.info: leveldb_baseline.info
|
|
||||
- $(LCOV) -r $< "/usr/include/*" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
|
|
||||
- "$(abs_builddir)/src/test/*" \
|
|
||||
- -o $@
|
|
||||
- else
|
|
||||
leveldb_baseline_filtered.info: leveldb_baseline.info |
|
||||
$(LCOV) -r $< "/usr/include/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ |
|
||||
--- 159,168 ----
|
|
||||
*************** |
|
||||
*** 200,206 **** |
|
||||
"$(abs_builddir)/src/gtest/*" \ |
|
||||
"$(abs_builddir)/src/test/*" \ |
|
||||
-o $@ |
|
||||
- endif
|
|
||||
|
|
||||
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info |
|
||||
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@ |
|
||||
--- 172,177 ----
|
|
||||
*************** |
|
||||
*** 211,226 **** |
|
||||
$(LCOV) -z -d $(abs_builddir)/src |
|
||||
$(LCOV) -z -d $(abs_builddir)/src/leveldb |
|
||||
|
|
||||
- if BUILD_DARWIN
|
|
||||
test_bitcoin_filtered.info: test_bitcoin.info |
|
||||
$(LCOV) -r $< "/usr/include/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \ |
|
||||
"$(abs_builddir)/src/test/*" \ |
|
||||
-o $@ |
|
||||
! else
|
|
||||
! test_bitcoin_filtered.info: test_bitcoin.info
|
|
||||
$(LCOV) -r $< "/usr/include/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ |
|
||||
--- 182,204 ----
|
|
||||
$(LCOV) -z -d $(abs_builddir)/src |
|
||||
$(LCOV) -z -d $(abs_builddir)/src/leveldb |
|
||||
|
|
||||
test_bitcoin_filtered.info: test_bitcoin.info |
|
||||
$(LCOV) -r $< "/usr/include/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \ |
|
||||
+ "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
|
|
||||
+ "$(abs_builddir)/src/gtest/*" \
|
|
||||
"$(abs_builddir)/src/test/*" \ |
|
||||
-o $@ |
|
||||
!
|
|
||||
! zcash-gtest.info: baseline_filtered_combined.info
|
|
||||
! $(MAKE) -C src/ zcash-gtest_check
|
|
||||
! $(LCOV) -c -d $(abs_builddir)/src -t zcash-gtest -o $@
|
|
||||
! $(LCOV) -z -d $(abs_builddir)/src
|
|
||||
! $(LCOV) -z -d $(abs_builddir)/src/leveldb
|
|
||||
!
|
|
||||
! zcash-gtest_filtered.info: zcash-gtest.info
|
|
||||
$(LCOV) -r $< "/usr/include/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ |
|
||||
*************** |
|
||||
*** 229,235 **** |
|
||||
"$(abs_builddir)/src/gtest/*" \ |
|
||||
"$(abs_builddir)/src/test/*" \ |
|
||||
-o $@ |
|
||||
- endif
|
|
||||
|
|
||||
block_test.info: test_bitcoin_filtered.info |
|
||||
$(MKDIR_P) qa/tmp |
|
||||
--- 207,212 ----
|
|
||||
*************** |
|
||||
*** 238,252 **** |
|
||||
$(LCOV) -z -d $(abs_builddir)/src |
|
||||
$(LCOV) -z -d $(abs_builddir)/src/leveldb |
|
||||
|
|
||||
- if BUILD_DARWIN
|
|
||||
- block_test_filtered.info: block_test.info
|
|
||||
- $(LCOV) -r $< "/usr/include/*" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
|
|
||||
- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
|
|
||||
- "$(abs_builddir)/src/test/*" \
|
|
||||
- -o $@
|
|
||||
- else
|
|
||||
block_test_filtered.info: block_test.info |
|
||||
$(LCOV) -r $< "/usr/include/*" \ |
|
||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ |
|
||||
--- 215,220 ----
|
|
||||
*************** |
|
||||
*** 256,293 **** |
|
||||
"$(abs_builddir)/src/gtest/*" \ |
|
||||
"$(abs_builddir)/src/test/*" \ |
|
||||
-o $@ |
|
||||
- endif
|
|
||||
|
|
||||
test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info |
|
||||
! $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
|
|
||||
|
|
||||
- if ! BUILD_DARWIN
|
|
||||
zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info |
|
||||
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@ |
|
||||
- endif
|
|
||||
|
|
||||
- if BUILD_DARWIN
|
|
||||
- total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info
|
|
||||
- $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
|
|
||||
- else
|
|
||||
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info |
|
||||
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt |
|
||||
- endif
|
|
||||
-
|
|
||||
|
|
||||
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info |
|
||||
! $(GENHTML) -s $< -o $(@D)
|
|
||||
! @touch $@
|
|
||||
|
|
||||
total.coverage/.dirstamp: total_coverage.info |
|
||||
! $(GENHTML) -s $< -o $(@D)
|
|
||||
! @touch $@
|
|
||||
|
|
||||
- if BUILD_DARWIN
|
|
||||
- cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
|
|
||||
- else
|
|
||||
cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp |
|
||||
- endif
|
|
||||
|
|
||||
endif |
|
||||
|
|
||||
--- 224,254 ----
|
|
||||
"$(abs_builddir)/src/gtest/*" \ |
|
||||
"$(abs_builddir)/src/test/*" \ |
|
||||
-o $@ |
|
||||
|
|
||||
test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info |
|
||||
! $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
|
|
||||
|
|
||||
zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info |
|
||||
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@ |
|
||||
|
|
||||
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info |
|
||||
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt |
|
||||
|
|
||||
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info |
|
||||
! $(GENHTML) -s $< -o $(@D)
|
|
||||
! @touch $@
|
|
||||
!
|
|
||||
! zcash-gtest.coverage/.dirstamp: zcash-gtest_coverage.info
|
|
||||
! $(GENHTML) -s $< -o $(@D)
|
|
||||
! @touch $@
|
|
||||
!
|
|
||||
! cov-zcash: zcash-gtest.coverage/.dirstamp
|
|
||||
|
|
||||
total.coverage/.dirstamp: total_coverage.info |
|
||||
! $(GENHTML) -s $< -o $(@D)
|
|
||||
! @touch $@
|
|
||||
|
|
||||
cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp |
|
||||
|
|
||||
endif |
|
||||
|
|
||||
@ -1,55 +0,0 @@ |
|||||
*** depends/packages/boost.mk 2017-01-03 10:53:52.440371182 +0000 |
|
||||
--- ../../komodo-jl777/depends/packages/boost.mk 2017-01-03 09:48:21.650035146 +0000
|
|
||||
*************** |
|
||||
*** 11,24 **** |
|
||||
$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam |
|
||||
$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 |
|
||||
$(package)_config_opts_linux=threadapi=pthread runtime-link=shared |
|
||||
! $(package)_config_opts_darwin=--toolset=gcc threadapi=pthread runtime-link=shared
|
|
||||
$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static |
|
||||
$(package)_config_opts_x86_64_mingw32=address-model=64 |
|
||||
$(package)_config_opts_i686_mingw32=address-model=32 |
|
||||
$(package)_config_opts_i686_linux=address-model=32 architecture=x86 |
|
||||
$(package)_toolset_$(host_os)=gcc |
|
||||
$(package)_archiver_$(host_os)=$($(package)_ar) |
|
||||
! $(package)_toolset_darwin=gcc
|
|
||||
$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test |
|
||||
$(package)_cxxflags=-fvisibility=hidden |
|
||||
$(package)_cxxflags_linux=-fPIC |
|
||||
--- 11,25 ----
|
|
||||
$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam |
|
||||
$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 |
|
||||
$(package)_config_opts_linux=threadapi=pthread runtime-link=shared |
|
||||
! $(package)_config_opts_darwin=--toolset=darwin-4.2.1 runtime-link=shared
|
|
||||
$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static |
|
||||
$(package)_config_opts_x86_64_mingw32=address-model=64 |
|
||||
$(package)_config_opts_i686_mingw32=address-model=32 |
|
||||
$(package)_config_opts_i686_linux=address-model=32 architecture=x86 |
|
||||
$(package)_toolset_$(host_os)=gcc |
|
||||
$(package)_archiver_$(host_os)=$($(package)_ar) |
|
||||
! $(package)_toolset_darwin=darwin
|
|
||||
! $(package)_archiver_darwin=$($(package)_libtool)
|
|
||||
$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test |
|
||||
$(package)_cxxflags=-fvisibility=hidden |
|
||||
$(package)_cxxflags_linux=-fPIC |
|
||||
*************** |
|
||||
*** 35,43 **** |
|
||||
endef |
|
||||
|
|
||||
define $(package)_build_cmds |
|
||||
! ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 stage
|
|
||||
endef |
|
||||
|
|
||||
define $(package)_stage_cmds |
|
||||
! ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 install
|
|
||||
endef |
|
||||
--- 36,44 ----
|
|
||||
endef |
|
||||
|
|
||||
define $(package)_build_cmds |
|
||||
! ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
|
|
||||
endef |
|
||||
|
|
||||
define $(package)_stage_cmds |
|
||||
! ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
|
|
||||
endef |
|
||||
@ -1,99 +0,0 @@ |
|||||
*** configure.ac 2017-01-03 10:53:52.436371005 +0000 |
|
||||
--- ../../komodo-jl777/configure.ac 2017-01-03 09:49:08.848505929 +0000
|
|
||||
*************** |
|
||||
*** 124,130 **** |
|
||||
[AS_HELP_STRING([--enable-hardening], |
|
||||
[attempt to harden the resulting executables (default is yes)])], |
|
||||
[use_hardening=$enableval], |
|
||||
! [use_hardening=no])
|
|
||||
|
|
||||
AC_ARG_ENABLE([reduce-exports], |
|
||||
[AS_HELP_STRING([--enable-reduce-exports], |
|
||||
--- 124,130 ----
|
|
||||
[AS_HELP_STRING([--enable-hardening], |
|
||||
[attempt to harden the resulting executables (default is yes)])], |
|
||||
[use_hardening=$enableval], |
|
||||
! [use_hardening=yes])
|
|
||||
|
|
||||
AC_ARG_ENABLE([reduce-exports], |
|
||||
[AS_HELP_STRING([--enable-reduce-exports], |
|
||||
*************** |
|
||||
*** 276,305 **** |
|
||||
fi |
|
||||
fi |
|
||||
|
|
||||
! dnl AC_CHECK_PROG([BREW],brew, brew)
|
|
||||
! dnl if test x$BREW = xbrew; then
|
|
||||
dnl These Homebrew packages may be keg-only, meaning that they won't be found |
|
||||
dnl in expected paths because they may conflict with system files. Ask |
|
||||
dnl Homebrew where each one is located, then adjust paths accordingly. |
|
||||
dnl It's safe to add these paths even if the functionality is disabled by |
|
||||
dnl the user (--without-wallet or --without-gui for example). |
|
||||
|
|
||||
! dnl openssl_prefix=`$BREW --prefix openssl 2>/dev/null`
|
|
||||
! dnl bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null`
|
|
||||
! dnl qt5_prefix=`$BREW --prefix qt5 2>/dev/null`
|
|
||||
! dnl if test x$openssl_prefix != x; then
|
|
||||
! dnl PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
|
|
||||
! dnl export PKG_CONFIG_PATH
|
|
||||
! dnl fi
|
|
||||
! dnl if test x$bdb_prefix != x; then
|
|
||||
! dnl CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
|
|
||||
! dnl LIBS="$LIBS -L$bdb_prefix/lib"
|
|
||||
! dnl fi
|
|
||||
! dnl if test x$qt5_prefix != x; then
|
|
||||
! dnl PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
|
|
||||
! dnl export PKG_CONFIG_PATH
|
|
||||
! dnl fi
|
|
||||
! dnl fi
|
|
||||
else |
|
||||
case $build_os in |
|
||||
*darwin*) |
|
||||
--- 276,305 ----
|
|
||||
fi |
|
||||
fi |
|
||||
|
|
||||
! AC_CHECK_PROG([BREW],brew, brew)
|
|
||||
! if test x$BREW = xbrew; then
|
|
||||
dnl These Homebrew packages may be keg-only, meaning that they won't be found |
|
||||
dnl in expected paths because they may conflict with system files. Ask |
|
||||
dnl Homebrew where each one is located, then adjust paths accordingly. |
|
||||
dnl It's safe to add these paths even if the functionality is disabled by |
|
||||
dnl the user (--without-wallet or --without-gui for example). |
|
||||
|
|
||||
! openssl_prefix=`$BREW --prefix openssl 2>/dev/null`
|
|
||||
! bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null`
|
|
||||
! qt5_prefix=`$BREW --prefix qt5 2>/dev/null`
|
|
||||
! if test x$openssl_prefix != x; then
|
|
||||
! PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
|
|
||||
! export PKG_CONFIG_PATH
|
|
||||
! fi
|
|
||||
! if test x$bdb_prefix != x; then
|
|
||||
! CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
|
|
||||
! LIBS="$LIBS -L$bdb_prefix/lib"
|
|
||||
! fi
|
|
||||
! if test x$qt5_prefix != x; then
|
|
||||
! PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
|
|
||||
! export PKG_CONFIG_PATH
|
|
||||
! fi
|
|
||||
! fi
|
|
||||
else |
|
||||
case $build_os in |
|
||||
*darwin*) |
|
||||
*************** |
|
||||
*** 730,736 **** |
|
||||
AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) |
|
||||
AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) |
|
||||
|
|
||||
! LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium"
|
|
||||
|
|
||||
CXXFLAGS_TEMP="$CXXFLAGS" |
|
||||
LIBS_TEMP="$LIBS" |
|
||||
--- 730,736 ----
|
|
||||
AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) |
|
||||
AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) |
|
||||
|
|
||||
! LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp"
|
|
||||
|
|
||||
CXXFLAGS_TEMP="$CXXFLAGS" |
|
||||
LIBS_TEMP="$LIBS" |
|
||||
@ -1,21 +0,0 @@ |
|||||
*** depends/hosts/darwin.mk 2017-01-03 10:53:52.440371182 +0000 |
|
||||
--- ../../komodo-jl777/depends/hosts/darwin.mk 2017-01-03 09:48:21.650035146 +0000
|
|
||||
*************** |
|
||||
*** 2,9 **** |
|
||||
OSX_SDK_VERSION=10.9 |
|
||||
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk |
|
||||
LD64_VERSION=241.9 |
|
||||
! darwin_CC=gcc-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
|
|
||||
! darwin_CXX=g++-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
|
|
||||
|
|
||||
darwin_CFLAGS=-pipe |
|
||||
darwin_CXXFLAGS=$(darwin_CFLAGS) |
|
||||
--- 2,9 ----
|
|
||||
OSX_SDK_VERSION=10.9 |
|
||||
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk |
|
||||
LD64_VERSION=241.9 |
|
||||
! darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
|
|
||||
! darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
|
|
||||
|
|
||||
darwin_CFLAGS=-pipe |
|
||||
darwin_CXXFLAGS=$(darwin_CFLAGS) |
|
||||
@ -1,40 +0,0 @@ |
|||||
*** depends/builders/darwin.mk 2017-01-03 10:53:52.440371182 +0000 |
|
||||
--- ../../komodo-jl777/depends/builders/darwin.mk 2017-01-03 09:48:21.646034937 +0000
|
|
||||
*************** |
|
||||
*** 1,5 **** |
|
||||
! build_darwin_CC = gcc-6
|
|
||||
! build_darwin_CXX = g++-6
|
|
||||
build_darwin_AR: = $(shell xcrun -f ar) |
|
||||
build_darwin_RANLIB: = $(shell xcrun -f ranlib) |
|
||||
build_darwin_STRIP: = $(shell xcrun -f strip) |
|
||||
--- 1,5 ----
|
|
||||
! build_darwin_CC: = $(shell xcrun -f clang)
|
|
||||
! build_darwin_CXX: = $(shell xcrun -f clang++)
|
|
||||
build_darwin_AR: = $(shell xcrun -f ar) |
|
||||
build_darwin_RANLIB: = $(shell xcrun -f ranlib) |
|
||||
build_darwin_STRIP: = $(shell xcrun -f strip) |
|
||||
*************** |
|
||||
*** 7,17 **** |
|
||||
build_darwin_NM: = $(shell xcrun -f nm) |
|
||||
build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) |
|
||||
build_darwin_SHA256SUM = shasum -a 256 |
|
||||
! build_darwin_DOWNLOAD = wget --timeout=$(DOWNLOAD_CONNECT_TIMEOUT) --tries=$(DOWNLOAD_RETRIES) -nv -O
|
|
||||
|
|
||||
#darwin host on darwin builder. overrides darwin host preferences. |
|
||||
! darwin_CC= gcc-6
|
|
||||
! darwin_CXX= g++-6
|
|
||||
darwin_AR:=$(shell xcrun -f ar) |
|
||||
darwin_RANLIB:=$(shell xcrun -f ranlib) |
|
||||
darwin_STRIP:=$(shell xcrun -f strip) |
|
||||
--- 7,17 ----
|
|
||||
build_darwin_NM: = $(shell xcrun -f nm) |
|
||||
build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) |
|
||||
build_darwin_SHA256SUM = shasum -a 256 |
|
||||
! build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o
|
|
||||
|
|
||||
#darwin host on darwin builder. overrides darwin host preferences. |
|
||||
! darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION)
|
|
||||
! darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION)
|
|
||||
darwin_AR:=$(shell xcrun -f ar) |
|
||||
darwin_RANLIB:=$(shell xcrun -f ranlib) |
|
||||
darwin_STRIP:=$(shell xcrun -f strip) |
|
||||
@ -1,35 +0,0 @@ |
|||||
*** src/crypto/equihash.cpp 2017-01-03 10:53:52.444371361 +0000 |
|
||||
--- ../../komodo-jl777/src/crypto/equihash.cpp 2017-01-03 09:48:21.690037241 +0000
|
|
||||
*************** |
|
||||
*** 21,50 **** |
|
||||
|
|
||||
#include <boost/optional.hpp> |
|
||||
|
|
||||
- #ifdef __APPLE__
|
|
||||
- #include <machine/endian.h>
|
|
||||
- #include <libkern/OSByteOrder.h>
|
|
||||
-
|
|
||||
- #define htobe16(x) OSSwapHostToBigInt16(x)
|
|
||||
- #define htole16(x) OSSwapHostToLittleInt16(x)
|
|
||||
- #define be16toh(x) OSSwapBigToHostInt16(x)
|
|
||||
- #define le16toh(x) OSSwapLittleToHostInt16(x)
|
|
||||
-
|
|
||||
- #define htobe32(x) OSSwapHostToBigInt32(x)
|
|
||||
- #define htole32(x) OSSwapHostToLittleInt32(x)
|
|
||||
- #define be32toh(x) OSSwapBigToHostInt32(x)
|
|
||||
- #define le32toh(x) OSSwapLittleToHostInt32(x)
|
|
||||
-
|
|
||||
- #define htobe64(x) OSSwapHostToBigInt64(x)
|
|
||||
- #define htole64(x) OSSwapHostToLittleInt64(x)
|
|
||||
- #define be64toh(x) OSSwapBigToHostInt64(x)
|
|
||||
- #define le64toh(x) OSSwapLittleToHostInt64(x)
|
|
||||
-
|
|
||||
- #define __BIG_ENDIAN BIG_ENDIAN
|
|
||||
- #define __LITTLE_ENDIAN LITTLE_ENDIAN
|
|
||||
- #define __BYTE_ORDER BYTE_ORDER
|
|
||||
- #endif
|
|
||||
-
|
|
||||
EhSolverCancelledException solver_cancelled; |
|
||||
|
|
||||
template<unsigned int N, unsigned int K> |
|
||||
--- 21,26 ----
|
|
||||
@ -1,52 +0,0 @@ |
|||||
*** depends/packages/libsnark.mk 2017-01-03 10:53:52.440371182 +0000 |
|
||||
--- ../../komodo-jl777/depends/packages/libsnark.mk 2017-01-03 09:48:21.650035146 +0000
|
|
||||
*************** |
|
||||
*** 1,30 **** |
|
||||
package=libsnark |
|
||||
$(package)_version=0.1 |
|
||||
! $(package)_download_path=https://github.com/radix42/$(package)/archive
|
|
||||
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz |
|
||||
$(package)_download_file=$($(package)_git_commit).tar.gz |
|
||||
! $(package)_sha256_hash=9dbd5b44d3443e86463e934bfe1023cab4ca5948f8d74c23a67d9535c28d2584
|
|
||||
! $(package)_git_commit=9be18569b8abcda1245c3912877075259599c0f1
|
|
||||
|
|
||||
$(package)_dependencies=libgmp libsodium |
|
||||
|
|
||||
- ifeq ($(build_os),darwin)
|
|
||||
- define $(package)_build_cmds
|
|
||||
- CC=gcc-6 CXX=g++-6 CXXFLAGS="-arch x86_64 -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=0 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT
|
|
||||
- endef
|
|
||||
- else
|
|
||||
define $(package)_build_cmds |
|
||||
CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g " |
|
||||
endef |
|
||||
|
|
||||
-
|
|
||||
-
|
|
||||
-
|
|
||||
- endif
|
|
||||
-
|
|
||||
-
|
|
||||
-
|
|
||||
-
|
|
||||
define $(package)_stage_cmds |
|
||||
$(MAKE) install STATIC=1 DEPINST=$(host_prefix) PREFIX=$($(package)_staging_dir)$(host_prefix) CURVE=ALT_BN128 NO_SUPERCOP=1 |
|
||||
endef |
|
||||
--- 1,17 ----
|
|
||||
package=libsnark |
|
||||
$(package)_version=0.1 |
|
||||
! $(package)_download_path=https://github.com/zcash/$(package)/archive
|
|
||||
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz |
|
||||
$(package)_download_file=$($(package)_git_commit).tar.gz |
|
||||
! $(package)_sha256_hash=9422b1a2a94e6b8be61f07af7f146087c2a7d70b208d07ad076622225aa7f0e4
|
|
||||
! $(package)_git_commit=2e6314a9f7efcd9af1c77669d7d9a229df86a777
|
|
||||
|
|
||||
$(package)_dependencies=libgmp libsodium |
|
||||
|
|
||||
define $(package)_build_cmds |
|
||||
CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g " |
|
||||
endef |
|
||||
|
|
||||
define $(package)_stage_cmds |
|
||||
$(MAKE) install STATIC=1 DEPINST=$(host_prefix) PREFIX=$($(package)_staging_dir)$(host_prefix) CURVE=ALT_BN128 NO_SUPERCOP=1 |
|
||||
endef |
|
||||
@ -1,17 +0,0 @@ |
|||||
*** depends/packages/packages.mk 2017-01-03 10:53:52.440371182 +0000 |
|
||||
--- ../../komodo-jl777/depends/packages/packages.mk 2017-01-03 09:48:21.650035146 +0000
|
|
||||
*************** |
|
||||
*** 1,12 **** |
|
||||
zcash_packages := libsnark libgmp libsodium |
|
||||
-
|
|
||||
- ifeq ($(build_os),darwin)
|
|
||||
- packages := boost openssl $(zcash_packages)
|
|
||||
- else
|
|
||||
packages := boost openssl $(zcash_packages) googletest googlemock |
|
||||
- endif
|
|
||||
-
|
|
||||
-
|
|
||||
native_packages := native_ccache |
|
||||
|
|
||||
wallet_packages=bdb |
|
||||
--- 1,5 ----
|
|
||||
File diff suppressed because it is too large
@ -1,7 +0,0 @@ |
|||||
#!/bin/bash |
|
||||
|
|
||||
#set working directory to the location of this script |
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
|
||||
cd $DIR |
|
||||
|
|
||||
./komodo-cli -ac_name=VRSC "$@" |
|
||||
@ -1,5 +0,0 @@ |
|||||
#!/bin/bash |
|
||||
#set working directory to the location of this script |
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
|
||||
cd $DIR |
|
||||
./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 "$@" |
|
||||
@ -1,10 +0,0 @@ |
|||||
@call :GET_CURRENT_DIR |
|
||||
@cd %THIS_DIR% |
|
||||
komodod.exe -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 %1 %2 %3 %4 %5 %6 %7 %8 %9 |
|
||||
@goto :EOF |
|
||||
|
|
||||
:GET_CURRENT_DIR |
|
||||
@pushd %~dp0 |
|
||||
@set THIS_DIR=%CD% |
|
||||
@popd |
|
||||
@goto :EOF |
|
||||
Loading…
Reference in new issue