ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the git tag to the compile (RIPD-238)

Browse Source
This commit is contained in:
Tom Ritchford
2014-08-08 14:28:44 -04:00
committed by Vinnie Falco
parent 50f9b68d61
commit c841f8b360
5 changed files with 398 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/beast/site_scons/Beast.py
View File

@@ -79,7 +79,10 @@ class Git(object):
def __init__(self, env):
self.exists = env.Detect('git')
if self.exists:
self.commit_id = _execute('git describe --tags')
try:
self.commit_id = _execute('git describe --tags')
except:
self.exists = False
else:
self.commit_id = None

21
src/ripple/module/app/main/Application.cpp
View File

@@ -853,26 +853,13 @@ public:
// Initialize the Validators object with Config information.
void prepareValidators ()
{
#if 1
{
std::vector <std::string> const& strings (getConfig().validators);
m_validators->addStrings ("rippled.cfg", strings);
}
#endif
m_validators->addStrings ("rippled.cfg", getConfig().validators);
#if 1
if (! getConfig().getValidatorsURL().empty())
{
m_validators->addURL (getConfig().getValidatorsURL());
}
#endif
#if 1
if (getConfig().getValidatorsFile() != beast::File::nonexistent ())
{
m_validators->addFile (getConfig().getValidatorsFile());
}
#endif
}
//--------------------------------------------------------------------------
@@ -887,7 +874,11 @@ public:
void onStart ()
{
m_journal.debug << "Application starting";
#ifdef GIT_COMMIT_ID
m_journal.info << "Application starting. Build is " << GIT_COMMIT_ID;
#else
m_journal.info << "Application starting.";
#endif
m_sweepTimer.setExpiration (10);