status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

bump vendor/nimbus-build-system (#894) 

* bump vendor/nimbus-build-system

* change beacon_node banner

* beacon_node: update copyright years

* version.nim is imported in beacon_chain.nimble
This commit is contained in:
Ștefan Talpalaru 2020-04-16 00:20:27 +02:00 committed by GitHub
parent c44d66c697
commit 7b8d6ea61c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -86,7 +86,7 @@ endif
#- deletes and recreates "beacon_chain.nims" which on Windows is a copy instead of a proper symlink #- deletes and recreates "beacon_chain.nims" which on Windows is a copy instead of a proper symlink
update: | update-common update: | update-common
rm -f beacon_chain.nims && \ rm -f beacon_chain.nims && \
$(MAKE) beacon_chain.nims $(MAKE) beacon_chain.nims $(HANDLE_OUTPUT)
# symlink # symlink
beacon_chain.nims: beacon_chain.nims:

6
beacon_chain/beacon_node.nim
View File

@ -1225,9 +1225,9 @@ when hasPrompt:
# createThread(t, processPromptCommands, addr p) # createThread(t, processPromptCommands, addr p)
when isMainModule: when isMainModule:
let config = BeaconNodeConf.load( let
version = clientId, banner = clientId & "\p" & copyrights & "\p\p" & nimBanner
copyrightBanner = clientId & "\p" & copyrights) config = BeaconNodeConf.load(version = banner, copyrightBanner = banner)
when compiles(defaultChroniclesStream.output.writer): when compiles(defaultChroniclesStream.output.writer):
defaultChroniclesStream.output.writer = defaultChroniclesStream.output.writer =

8
beacon_chain/version.nim
View File

@ -1,6 +1,8 @@
const when not defined(nimscript):
copyrights* = "Copyright (c) 2019 Status Research & Development GmbH" import times
let copyrights* = "Copyright (c) 2019-" & $(now().utc.year) & " Status Research & Development GmbH"
const
versionMajor* = 0 versionMajor* = 0
versionMinor* = 3 versionMinor* = 3
versionBuild* = 0 versionBuild* = 0
@ -14,6 +16,8 @@ const
gitRevision* = staticExec("git rev-parse --short HEAD") gitRevision* = staticExec("git rev-parse --short HEAD")
nimBanner* = staticExec("nim --version")
versionAsStr* = versionAsStr* =
$versionMajor & "." & $versionMinor & "." & $versionBuild $versionMajor & "." & $versionMinor & "." & $versionBuild

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit 3ff26b54ebc2b1bc06d29af8043c3ac8ee4145a3 Subproject commit d8cde2ad855295fe3539f9beaa2ca95cb991863b