Add non-unity build targets:

The SConstruct is modified to provide a new family of targets, ending with the suffix ".nounity", which compile individual translation units instead of some of the unity translation units ("classic" builds). Two modules updated for this treatment are ripple/basics/ and ripple/protocol/, with plans to update more in the future. A consequence is longer build times in some cases. A benefit of classic builds is that missing includes can be identified through compiler errors.
2025-12-06 17:27:55 +00:00 · 2014-12-26 14:31:32 -08:00
parent 9a3214d46e
commit 6283801981
30 changed files with 232 additions and 142 deletions
--- a/src/ripple/basics/StringUtilities.h
+++ b/src/ripple/basics/StringUtilities.h
@@ -25,6 +25,7 @@
 #include <ripple/basics/strHex.h>
 #include <boost/format.hpp>
 #include <beast/module/core/text/StringPairArray.h>
+#include <sstream>
 #include <string>

 namespace ripple {
--- a/src/ripple/basics/Sustain.h
+++ b/src/ripple/basics/Sustain.h
@@ -20,6 +20,8 @@
 #ifndef RIPPLE_BASICS_SUSTAIN_H_INCLUDED
 #define RIPPLE_BASICS_SUSTAIN_H_INCLUDED

+#include <string>
+
 namespace ripple {

 // "Sustain" is a system for a buddy process that monitors the main process
--- a/src/ripple/basics/Time.h
+++ b/src/ripple/basics/Time.h
@@ -20,6 +20,8 @@
 #ifndef RIPPLE_BASICS_TIME_H_INCLUDED
 #define RIPPLE_BASICS_TIME_H_INCLUDED

+#include <boost/date_time/posix_time/posix_time.hpp>
+
 namespace ripple {

 // VFALCO TODO Roll this into some utilities header
--- a/src/ripple/basics/impl/CheckLibraryVersionsImpl.h
+++ b/src/ripple/basics/impl/CheckLibraryVersionsImpl.h
@@ -21,6 +21,8 @@
 #define RIPPLE_BASICS_CHECKLIBRARYVERSIONS_IMPL_H_INCLUDED

 #include <ripple/basics/CheckLibraryVersions.h>
+#include <boost/version.hpp>
+#include <openssl/opensslv.h>

 namespace ripple {
 namespace version {
--- a/src/ripple/basics/impl/Log.cpp
+++ b/src/ripple/basics/impl/Log.cpp
@@ -21,6 +21,7 @@
 #include <boost/algorithm/string.hpp>
 // VFALCO TODO Use std::chrono
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <cassert>
 #include <fstream>

 namespace ripple {
@@ -203,7 +204,7 @@ Logs::fromSeverity (beast::Journal::Severity level)
    case Journal::kError:   return lsERROR;

    default:
-        bassertfalse;
+        assert(false);
    case Journal::kFatal:
        break;
    }
@@ -223,7 +224,7 @@ Logs::toSeverity (LogSeverity level)
    case lsWARNING: return Journal::kWarning;
    case lsERROR:   return Journal::kError;
    default:
-        bassertfalse;
+        assert(false);
    case lsFATAL:
        break;
    }
@@ -313,7 +314,7 @@ Logs::format (std::string& output, std::string const& message,
    case beast::Journal::kWarning:  output += "WRN "; break;
    case beast::Journal::kError:    output += "ERR "; break;
    default:
-        bassertfalse;
+        assert(false);
    case beast::Journal::kFatal:    output += "FTL "; break;
    }

--- a/src/ripple/basics/impl/StringUtilities.cpp
+++ b/src/ripple/basics/impl/StringUtilities.cpp
@@ -18,14 +18,15 @@
 //==============================================================================

 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/ToString.h>
 #include <beast/module/core/text/LexicalCast.h>
 #include <beast/unit_test/suite.h>
+#include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/regex.hpp>
+#include <algorithm>
 #include <cstdarg>

-#include <ripple/basics/ToString.h>
-
 namespace ripple {

 // NIKB NOTE: This function is only used by strUnHex (std::string const& strSrc)
--- a/src/ripple/basics/impl/Sustain.cpp
+++ b/src/ripple/basics/impl/Sustain.cpp
@@ -17,14 +17,17 @@
 */
 //==============================================================================

+#include <ripple/basics/Sustain.h>
 #include <ripple/basics/ThreadName.h>
-
+#include <boost/format.hpp>
+    
 // For Sustain Linux variants
 // VFALCO TODO Rewrite Sustain to use beast::Process
 #ifdef __linux__
 #include <sys/types.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
+#include <unistd.h>
 #endif
 #ifdef __FreeBSD__
 #include <sys/types.h>
--- a/src/ripple/basics/impl/Time.cpp
+++ b/src/ripple/basics/impl/Time.cpp
@@ -17,6 +17,8 @@
 */
 //==============================================================================

+#include <ripple/basics/Time.h>
+
 namespace ripple {

 // VFALCO TODO Tidy this up into a RippleTime object
--- a/src/ripple/basics/impl/UptimeTimer.cpp
+++ b/src/ripple/basics/impl/UptimeTimer.cpp
@@ -18,6 +18,7 @@
 //==============================================================================

 #include <ripple/basics/UptimeTimer.h>
+#include <beast/threads/Thread.h>

 #include <atomic>

--- a/src/ripple/protocol/impl/strHex.cpp
+++ b/src/ripple/protocol/impl/strHex.cpp
@@ -17,6 +17,8 @@
 */
 //==============================================================================

+#include <algorithm>
+    
 namespace ripple {

 char charHex (int iDigit)
--- a/src/ripple/basics/strHex.h
+++ b/src/ripple/basics/strHex.h
@@ -25,6 +25,8 @@
 #ifndef RIPPLE_BASICS_STRHEX_H_INCLUDED
 #define RIPPLE_BASICS_STRHEX_H_INCLUDED

+#include <string>
+    
 namespace ripple {

 /** Converts an integer to the corresponding hex digit
--- a/src/ripple/basics/tests/StringUtilities.test.cpp
+++ b/src/ripple/basics/tests/StringUtilities.test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================

 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/ToString.h>
 #include <beast/unit_test/suite.h>

 namespace ripple {
--- a/src/ripple/protocol/STAccount.h
+++ b/src/ripple/protocol/STAccount.h
@@ -20,7 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED
 #define RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED

+#include <ripple/protocol/RippleAddress.h>
 #include <ripple/protocol/STBlob.h>
+#include <string>

 namespace ripple {

--- a/src/ripple/protocol/STPathSet.h
+++ b/src/ripple/protocol/STPathSet.h
@@ -20,6 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_STPATHELEMENT_H_INCLUDED
 #define RIPPLE_PROTOCOL_STPATHELEMENT_H_INCLUDED

+#include <ripple/json/json_value.h>
+#include <ripple/protocol/SField.h>
+#include <ripple/protocol/STBase.h>
+#include <ripple/protocol/UintTypes.h>
 #include <cstddef>

 namespace ripple {
--- a/src/ripple/protocol/SystemParameters.h
+++ b/src/ripple/protocol/SystemParameters.h
@@ -21,10 +21,11 @@
 #define RIPPLE_CORE_SYSTEMPARAMETERS_H_INCLUDED

 #include <cstdint>
+#include <string>

 namespace ripple {

-/** Various protocol and system specific constant globals. */
+// Various protocol and system specific constant globals.

 /* The name of the system. */
 static inline
--- a/src/ripple/protocol/impl/STLedgerEntry.cpp
+++ b/src/ripple/protocol/impl/STLedgerEntry.cpp
@@ -17,8 +17,12 @@
 */
 //==============================================================================

+#include <ripple/basics/Log.h>
+#include <ripple/json/to_string.h>
 #include <ripple/protocol/Indexes.h>
+#include <ripple/protocol/STAccount.h>
 #include <ripple/protocol/STLedgerEntry.h>
+#include <boost/format.hpp>

 namespace ripple {

--- a/src/ripple/protocol/impl/STParsedJSON.cpp
+++ b/src/ripple/protocol/impl/STParsedJSON.cpp
@@ -20,8 +20,19 @@
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/STInteger.h>
 #include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/LedgerFormats.h>
+#include <ripple/protocol/STAccount.h>
+#include <ripple/protocol/STAmount.h>
+#include <ripple/protocol/STArray.h>
+#include <ripple/protocol/STBitString.h>
+#include <ripple/protocol/STBlob.h>
+#include <ripple/protocol/STVector256.h>
+#include <ripple/protocol/STParsedJSON.h>
+#include <ripple/protocol/STPathSet.h>
+#include <ripple/protocol/TxFormats.h>
 #include <beast/module/core/text/LexicalCast.h>
 #include <cassert>
+#include <beast/cxx14/memory.h> // <memory>

 namespace ripple {

--- a/src/ripple/protocol/impl/STPathSet.cpp
+++ b/src/ripple/protocol/impl/STPathSet.cpp
@@ -18,6 +18,10 @@
 //==============================================================================

 #include <ripple/protocol/STPathSet.h>
+#include <ripple/protocol/JsonFields.h>
+#include <ripple/basics/Log.h>
+#include <ripple/basics/strHex.h>
+#include <ripple/basics/StringUtilities.h>

 namespace ripple {

--- a/src/ripple/protocol/impl/STTx.cpp
+++ b/src/ripple/protocol/impl/STTx.cpp
@@ -17,13 +17,18 @@
 */
 //==============================================================================

-#include <ripple/core/Config.h>
+#include <ripple/basics/Log.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/Protocol.h>
+#include <ripple/protocol/STAccount.h>
+#include <ripple/protocol/STArray.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/STParsedJSON.h>
 #include <ripple/protocol/TxFlags.h>
+#include <ripple/basics/StringUtilities.h>
+#include <ripple/json/to_string.h>
 #include <beast/unit_test/suite.h>
+#include <boost/format.hpp>

 namespace ripple {

--- a/src/ripple/protocol/impl/STValidation.cpp
+++ b/src/ripple/protocol/impl/STValidation.cpp
@@ -19,6 +19,8 @@

 #include <ripple/protocol/STValidation.h>
 #include <ripple/protocol/HashPrefix.h>
+#include <ripple/json/to_string.h>
+#include <ripple/basics/Log.h>

 namespace ripple {

--- a/src/ripple/protocol/impl/UintTypes.cpp
+++ b/src/ripple/protocol/impl/UintTypes.cpp
@@ -17,6 +17,7 @@
 */
 //==============================================================================

+#include <ripple/protocol/Serializer.h>
 #include <ripple/protocol/SystemParameters.h>
 #include <ripple/protocol/RippleAddress.h>
 #include <ripple/protocol/UintTypes.h>
--- a/src/ripple/protocol/tests/BuildInfo.test.cpp
+++ b/src/ripple/protocol/tests/BuildInfo.test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================

 #include <ripple/protocol/BuildInfo.h>
+#include <beast/module/core/diagnostic/SemanticVersion.h>
 #include <beast/unit_test/suite.h>

 namespace ripple {
--- a/src/ripple/protocol/tests/RippleAddress.test.cpp
+++ b/src/ripple/protocol/tests/RippleAddress.test.cpp
@@ -19,6 +19,8 @@

 #include <ripple/protocol/RippleAddress.h>
 #include <ripple/protocol/RipplePublicKey.h>
+#include <ripple/protocol/Serializer.h>
+#include <ripple/basics/StringUtilities.h>
 #include <beast/unit_test/suite.h>

 namespace ripple {
--- a/src/ripple/protocol/tests/STObject.test.cpp
+++ b/src/ripple/protocol/tests/STObject.test.cpp
@@ -17,11 +17,14 @@
 */
 //==============================================================================

+#include <ripple/basics/Log.h>
 #include <ripple/protocol/STBase.h>
 #include <ripple/protocol/STAccount.h>
 #include <ripple/protocol/STArray.h>
 #include <ripple/protocol/STObject.h>
 #include <ripple/protocol/STParsedJSON.h>
+#include <ripple/json/json_reader.h>
+#include <ripple/json/to_string.h>
 #include <beast/unit_test/suite.h>
 #include <beast/cxx14/memory.h> // <memory>

--- a/src/ripple/protocol/tests/STTx.test.cpp
+++ b/src/ripple/protocol/tests/STTx.test.cpp
@@ -18,6 +18,8 @@
 //==============================================================================

 #include <ripple/protocol/STTx.h>
+#include <ripple/protocol/STParsedJSON.h>
+#include <ripple/json/to_string.h>
 #include <beast/unit_test/suite.h>

 namespace ripple {
--- a/src/ripple/unity/basics.cpp
+++ b/src/ripple/unity/basics.cpp
@@ -27,15 +27,16 @@
 #include <ripple/basics/impl/CheckLibraryVersions.cpp>
 #include <ripple/basics/impl/CountedObject.cpp>
 #include <ripple/basics/impl/Log.cpp>
-#include <ripple/basics/impl/StringUtilities.cpp>
+#include <ripple/basics/impl/make_SSLContext.cpp>
 #include <ripple/basics/impl/RangeSet.cpp>
+#include <ripple/basics/impl/ResolverAsio.cpp>
+#include <ripple/basics/impl/strHex.cpp>
+#include <ripple/basics/impl/StringUtilities.cpp>
 #include <ripple/basics/impl/Sustain.cpp>
 #include <ripple/basics/impl/TestSuite.test.cpp>
 #include <ripple/basics/impl/ThreadName.cpp>
 #include <ripple/basics/impl/Time.cpp>
 #include <ripple/basics/impl/UptimeTimer.cpp>
-#include <ripple/basics/impl/make_SSLContext.cpp>
-#include <ripple/basics/impl/ResolverAsio.cpp>

 #include <ripple/basics/tests/CheckLibraryVersions.test.cpp>
 #include <ripple/basics/tests/KeyCache.test.cpp>
--- a/src/ripple/unity/protocol.cpp
+++ b/src/ripple/unity/protocol.cpp
@@ -33,7 +33,6 @@
 #include <ripple/protocol/impl/Serializer.cpp>
 #include <ripple/protocol/impl/SField.cpp>
 #include <ripple/protocol/impl/SOTemplate.cpp>
-#include <ripple/protocol/impl/strHex.cpp>
 #include <ripple/protocol/impl/TER.cpp>
 #include <ripple/protocol/impl/TxFormats.cpp>
 #include <ripple/protocol/impl/UintTypes.cpp>