From: Michael R. Crusoe Date: Wed, 4 Dec 2019 14:09:35 +0000 (+0100) Subject: reprobuild fixup X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~125 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38e317d58229eb269acf177dd2e49473b540f4cd;p=ncbi-blast%2B.git reprobuild fixup --- diff --git a/debian/patches/reprobuild b/debian/patches/reprobuild index da732e89..d485fdeb 100644 --- a/debian/patches/reprobuild +++ b/debian/patches/reprobuild @@ -25,7 +25,7 @@ Description: make the build more reproducible /** Convenient define to call the function Blast_PerrorEx. */ #define Blast_PerrorWithLocation(msg, error_code, context) \ -Blast_PerrorEx(msg, error_code, __FILE__, __LINE__, context) -+Blast_PerrorEx(msg, error_code, 'c++/include/algo/blast/core/blast_message.h', __LINE__, context) ++Blast_PerrorEx(msg, error_code, "c++/include/algo/blast/core/blast_message.h", __LINE__, context) /** Extended version of Blast_Perror which includes parameters for the file * name and line number where the error/warning occurred. This function should @@ -36,7 +36,7 @@ Description: make the build more reproducible #define LOG_WRITE(lg, code, subcode, level, message) \ LOG_Write(lg, code, subcode, level, THIS_MODULE, CORE_CURRENT_FUNCTION, \ - __FILE__, __LINE__, message, 0, 0) -+ 'c++/include/connect/ncbi_util.h', __LINE__, message, 0, 0) ++ "c++/include/connect/ncbi_util.h", __LINE__, message, 0, 0) #ifdef LOG_DATA /* AIX's defines LOG_DATA to be an integer constant; @@ -45,7 +45,7 @@ Description: make the build more reproducible #define LOG_DATA(lg, code, subcode, level, data, size, message) \ LOG_Write(lg, code, subcode, level, THIS_MODULE, CORE_CURRENT_FUNCTION, \ - __FILE__, __LINE__, message, data, size) -+ 'c++/include/connect/ncbi_util.h', __LINE__, message, data, size) ++ "c++/include/connect/ncbi_util.h", __LINE__, message, data, size) /** Default for THIS_MODULE. @@ -56,27 +56,18 @@ Description: make the build more reproducible #define JAVA_ABORT(msg) \ { \ - NcbiCerr << __FILE__ << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \ -+ NcbiCerr << 'c++/include/corelib/impl/ncbi_java.h' << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \ ++ NcbiCerr << "c++/include/corelib/impl/ncbi_java.h" << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \ abort(); \ } --- ncbi-blastplus.orig/c++/include/corelib/ncbidiag.hpp +++ ncbi-blastplus/c++/include/corelib/ncbidiag.hpp -@@ -55,7 +55,7 @@ - BEGIN_NCBI_SCOPE - - /// Incapsulate compile time information such as --/// __FILE__, __LINE__, NCBI_MODULE, current function. -+/// 'c++/include/corelib/ncbidiag.hpp', __LINE__, NCBI_MODULE, current function. - /// @note - /// NCBI_MODULE is used only in .cpp files - /// @sa @@ -167,7 +167,7 @@ /// @sa /// CDiagCompileInfo #define DIAG_COMPILE_INFO \ - NCBI_NS_NCBI::CDiagCompileInfo(__FILE__, \ -+ NCBI_NS_NCBI::CDiagCompileInfo('c++/include/corelib/ncbidiag.hpp', \ ++ NCBI_NS_NCBI::CDiagCompileInfo("c++/include/corelib/ncbidiag.hpp", \ __LINE__, \ NCBI_CURRENT_FUNCTION, \ NCBI_MAKE_MODULE(NCBI_MODULE)) @@ -87,7 +78,7 @@ Description: make the build more reproducible boost::unit_test::make_test_case( \ &BOOST_AUTO_TC_INVOKER( test_name ), #test_name, \ - __FILE__, __LINE__ ), \ -+ 'c++/include/corelib/test_boost.hpp', __LINE__ ), \ ++ "c++/include/corelib/test_boost.hpp", __LINE__ ), \ ::NCBI_NS_NCBI::SNcbiTestTCTimeout< \ BOOST_AUTO_TC_UNIQUE_ID( test_name )>::instance()->value(), \ decorators ); \ @@ -98,7 +89,7 @@ Description: make the build more reproducible do { \ if (! (YESNO)) { \ - SeqDB_FileIntegrityAssert(__FILE__, __LINE__, (#YESNO)); \ -+ SeqDB_FileIntegrityAssert('c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp', __LINE__, (#YESNO)); \ ++ SeqDB_FileIntegrityAssert("c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp", __LINE__, (#YESNO)); \ } \ } while(0) @@ -109,7 +100,7 @@ Description: make the build more reproducible #define DEBUGDUMP_BPT(name,obj) \ - do {CDebugDumpViewer().Bpt(name,&(obj),__FILE__,__LINE__);} while (0) -+ do {CDebugDumpViewer().Bpt(name,&(obj),'c++/include/util/ddump_viewer.hpp',__LINE__);} while (0) ++ do {CDebugDumpViewer().Bpt(name,&(obj),"c++/include/util/ddump_viewer.hpp",__LINE__);} while (0) //--------------------------------------------------------------------------- @@ -120,20 +111,20 @@ Description: make the build more reproducible #define DEFINE_STATIC_ARRAY_MAP(Type, Var, Array) \ - static const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__) -+ static const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__) ++ static const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__) #define DEFINE_CLASS_STATIC_ARRAY_MAP(Type, Var, Array) \ - const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__) -+ const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__) ++ const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__) #define DEFINE_STATIC_ARRAY_MAP_WITH_COPY(Type, Var, Array) \ - static const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__, \ -+ static const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__, \ ++ static const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__, \ NCBI_NS_NCBI::NStaticArray::eCopyWarn_hide) #define DEFINE_CLASS_STATIC_ARRAY_MAP_WITH_COPY(Type, Var, Array) \ - const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__, \ -+ const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__, \ ++ const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__, \ NCBI_NS_NCBI::NStaticArray::eCopyWarn_hide) @@ -144,33 +135,33 @@ Description: make the build more reproducible #define MBEDTLS_SSL_DEBUG_MSG( level, args ) \ - mbedtls_debug_print_msg( ssl, level, __FILE__, __LINE__, \ -+ mbedtls_debug_print_msg( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, \ ++ mbedtls_debug_print_msg( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, \ MBEDTLS_DEBUG_STRIP_PARENS args ) #define MBEDTLS_SSL_DEBUG_RET( level, text, ret ) \ - mbedtls_debug_print_ret( ssl, level, __FILE__, __LINE__, text, ret ) -+ mbedtls_debug_print_ret( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, ret ) ++ mbedtls_debug_print_ret( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, ret ) #define MBEDTLS_SSL_DEBUG_BUF( level, text, buf, len ) \ - mbedtls_debug_print_buf( ssl, level, __FILE__, __LINE__, text, buf, len ) -+ mbedtls_debug_print_buf( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, buf, len ) ++ mbedtls_debug_print_buf( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, buf, len ) #if defined(MBEDTLS_BIGNUM_C) #define MBEDTLS_SSL_DEBUG_MPI( level, text, X ) \ - mbedtls_debug_print_mpi( ssl, level, __FILE__, __LINE__, text, X ) -+ mbedtls_debug_print_mpi( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, X ) ++ mbedtls_debug_print_mpi( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, X ) #endif #if defined(MBEDTLS_ECP_C) #define MBEDTLS_SSL_DEBUG_ECP( level, text, X ) \ - mbedtls_debug_print_ecp( ssl, level, __FILE__, __LINE__, text, X ) -+ mbedtls_debug_print_ecp( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, X ) ++ mbedtls_debug_print_ecp( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, X ) #endif #if defined(MBEDTLS_X509_CRT_PARSE_C) #define MBEDTLS_SSL_DEBUG_CRT( level, text, crt ) \ - mbedtls_debug_print_crt( ssl, level, __FILE__, __LINE__, text, crt ) -+ mbedtls_debug_print_crt( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, crt ) ++ mbedtls_debug_print_crt( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, crt ) #endif #else /* MBEDTLS_DEBUG_C */ @@ -181,7 +172,7 @@ Description: make the build more reproducible /* Hostname should not be empty in any case */ if (hostname.empty()) { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eUnknown, "Internal error in LBOS Client IP Cache. Please contact developer", eLBOS_BadRequest); @@ -190,7 +181,7 @@ Description: make the build more reproducible message << " " << lbos_answer; } - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::s_HTTPCodeToEnum(result), message.str(), result); } @@ -199,7 +190,7 @@ Description: make the build more reproducible if (cur_host.empty()) { ConnNetInfo_Destroy(healthcheck_info); - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, NStr::IntToString(eLBOS_InvalidArgs), eLBOS_InvalidArgs); @@ -208,7 +199,7 @@ Description: make the build more reproducible } catch (...) { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "Could not parse port \"" + port_str + "\" in section \"" + reg_section + "\"", @@ -217,7 +208,7 @@ Description: make the build more reproducible if (port_int < 1 || port_int > 65535) { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "Invalid server port \"" + port_str + "\" in section \"" + reg_section + "\"", @@ -226,7 +217,7 @@ Description: make the build more reproducible if (name == "version" || name == "ip" || name == "port" || name == "check" || name == "format" || name == "name") { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "This name cannot be used for metadata", eLBOS_InvalidArgs); @@ -235,7 +226,7 @@ Description: make the build more reproducible } catch (const CStringException&) { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "Could not parse string value for SetRate", eLBOS_InvalidArgs); @@ -244,7 +235,7 @@ Description: make the build more reproducible } catch (const CStringException&) { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "Value in \"rate\" meta parameter cannot " "be represented as an integer", @@ -253,7 +244,7 @@ Description: make the build more reproducible { if (host_type.find_first_of(" \t\n\v\f\r") != string::npos) { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "This convenience function throws on whitespace characters " "in \"type\" meta parameter. If you know what you are doing, " @@ -262,7 +253,7 @@ Description: make the build more reproducible break; default: - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "Unknown EHostType " "value. If you are sure that a correct value is " "used, please tell the developer about this issue", @@ -271,7 +262,7 @@ Description: make the build more reproducible break; default: - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "Unknown ESERV_Type " "value. If you are sure that a correct value is " "used, please tell the developer about this issue", @@ -280,7 +271,7 @@ Description: make the build more reproducible break; default: - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "Unknown EHostType " "value. If you are sure that a correct value is " "used, please tell the developer about this issue", @@ -289,7 +280,7 @@ Description: make the build more reproducible { if (extra.find_first_of(" \t\n\v\f\r") != string::npos) { - throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL, -+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL, ++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL, CLBOSException::eInvalidArgs, "This convenience function throws on whitespace characters " "in \"extra\" meta parameter. If you know what you are doing, " @@ -300,7 +291,7 @@ Description: make the build more reproducible #define PARAM_TWICE_EXCEPTION(param) \ - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), \ -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), \ ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), \ NULL, CMonkeyException::e_MonkeyInvalidArgs, \ string("Parameter \"" param "\" is set " \ "twice in [") + GetSection() + "]" + \ @@ -309,7 +300,7 @@ Description: make the build more reproducible return "write"; default: - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Unknown EMonkeyActionType value")); } @@ -318,7 +309,7 @@ Description: make the build more reproducible return "connect()"; default: - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Unknown EMonkeyActionType value")); } @@ -327,7 +318,7 @@ Description: make the build more reproducible if (m_RunPos.find(sock) == m_RunPos.end()) { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, "The socket provided has not been registered with current rule"); } @@ -336,7 +327,7 @@ Description: make the build more reproducible } else if (eIOStatus == "eio_invalidarg") { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Unsupported 'return_status': ") + eIOStatus_in); } else if (eIOStatus == "eio_interrupt") { @@ -345,7 +336,7 @@ Description: make the build more reproducible } else { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Could not parse 'return_status': ") + eIOStatus_in); } @@ -354,7 +345,7 @@ Description: make the build more reproducible vector runs_list = s_Monkey_Split(runs, ','); if (runs_list.size() == 0) - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Parameter \"runs\" is empty in [") + m_Section + "]" + @@ -363,7 +354,7 @@ Description: make the build more reproducible if (*run.rbegin() != '%') { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, "Value is not percentage: " + run + ", values have to be either only percentages or " @@ -372,7 +363,7 @@ Description: make the build more reproducible if (last_step == 0 && step != 1) { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, "In the string of runs: " + runs + " the first " "element MUST set value for the first run"); @@ -381,7 +372,7 @@ Description: make the build more reproducible if (*run.rbegin() == '%') { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Value is percentage: ") + run + string(", values have to be either only percentages or " @@ -390,7 +381,7 @@ Description: make the build more reproducible if (m_Runs.size() > 0 && val <= *m_Runs.rbegin()) { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("\"runs\" should contain values in " "increasing order")); @@ -399,7 +390,7 @@ Description: make the build more reproducible if (name == "allow") { if (allow_set) { - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Parameter \"allow\" is set " @@ -408,7 +399,7 @@ Description: make the build more reproducible } if (!allow_set) - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Parameter \"allow\" not set in [") + GetSection() + "]" + @@ -417,7 +408,7 @@ Description: make the build more reproducible if (name == "ignore") { if (ignore_set) { - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Parameter \"ignore\" is set " @@ -426,7 +417,7 @@ Description: make the build more reproducible } if (!ignore_set) { - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, string("Parameter \"ignore\" not set in [") + GetSection() + "]" + @@ -435,7 +426,7 @@ Description: make the build more reproducible if (filtered.find_first_of("[]()+^?{}$.*\\") != string::npos) { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, exception_message); @@ -444,7 +435,7 @@ Description: make the build more reproducible else { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, exception_message); @@ -453,7 +444,7 @@ Description: make the build more reproducible << ". Check config!"; throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, ss.str()); } @@ -462,7 +453,7 @@ Description: make the build more reproducible ss << "Probability below zero for write rule in plan " << m_Name << ". Check config!"; - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, ss.str()); } @@ -471,7 +462,7 @@ Description: make the build more reproducible ss << "Probability below zero for write rule in plan " << m_Name << ". Check config!"; - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, ss.str()); } @@ -480,7 +471,7 @@ Description: make the build more reproducible << ". Check config!"; throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, ss.str()); } @@ -489,7 +480,7 @@ Description: make the build more reproducible if (sm_HookSwitch == NULL) { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, "Launch CONNECT_Init() before initializing CMonkey instance"); } @@ -498,7 +489,7 @@ Description: make the build more reproducible } if (prob < 0 || prob > 100) { - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, "Parameter \"probability\"=" + prob_str @@ -507,7 +498,7 @@ Description: make the build more reproducible } catch (const CStringException&) { - throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), -+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, "Parameter \"probability\"=" + prob_str + " for section [" + monkey_section @@ -516,7 +507,7 @@ Description: make the build more reproducible if (m_RegisteredTokens.find(token) != m_RegisteredTokens.end()) { throw CMonkeyException( - CDiagCompileInfo(__FILE__, __LINE__), -+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), ++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), NULL, CMonkeyException::e_MonkeyInvalidArgs, ss.str()); } @@ -527,7 +518,7 @@ Description: make the build more reproducible _mess.module = THIS_MODULE; \ _mess.func = CORE_CURRENT_FUNCTION; \ - _mess.file = __FILE__; \ -+ _mess.file = 'c++/src/connect/ncbi_priv.h'; \ ++ _mess.file = "c++/src/connect/ncbi_priv.h"; \ _mess.line = __LINE__; \ _mess.raw_data = (_raw_data); \ _mess.raw_size = (_raw_size); \ @@ -538,7 +529,7 @@ Description: make the build more reproducible typedef CStaticArraySet TCIgnoreCaseQualsSet; -static const TCIgnoreCaseQualsSet s_IgnoreCaseQualsSet(s_IgnoreCaseQuals, sizeof(s_IgnoreCaseQuals), __FILE__, __LINE__); -+static const TCIgnoreCaseQualsSet s_IgnoreCaseQualsSet(s_IgnoreCaseQuals, sizeof(s_IgnoreCaseQuals), 'c++/src/objects/seqfeat/BioSource.cpp', __LINE__); ++static const TCIgnoreCaseQualsSet s_IgnoreCaseQualsSet(s_IgnoreCaseQuals, sizeof(s_IgnoreCaseQuals), "c++/src/objects/seqfeat/BioSource.cpp", __LINE__); bool s_MayIgnoreCase(const string& value) { @@ -547,7 +538,7 @@ Description: make the build more reproducible typedef CStaticArraySet TCTaxNameElementQualsSet; -static const TCTaxNameElementQualsSet s_TaxNameElementQualsSet(s_TaxNameElementQuals, sizeof(s_TaxNameElementQuals), __FILE__, __LINE__); -+static const TCTaxNameElementQualsSet s_TaxNameElementQualsSet(s_TaxNameElementQuals, sizeof(s_TaxNameElementQuals), 'c++/src/objects/seqfeat/BioSource.cpp', __LINE__); ++static const TCTaxNameElementQualsSet s_TaxNameElementQualsSet(s_TaxNameElementQuals, sizeof(s_TaxNameElementQuals), "c++/src/objects/seqfeat/BioSource.cpp", __LINE__); bool s_IsTaxNameElement(const string& value) { @@ -556,7 +547,7 @@ Description: make the build more reproducible typedef CStaticArraySet TCStopWordStrSet; -static const TCStopWordStrSet s_StopWordsSet(s_StopWords, sizeof(s_StopWords), __FILE__, __LINE__); -+static const TCStopWordStrSet s_StopWordsSet(s_StopWords, sizeof(s_StopWords), 'c++/src/objects/seqfeat/BioSource.cpp', __LINE__); ++static const TCStopWordStrSet s_StopWordsSet(s_StopWords, sizeof(s_StopWords), "c++/src/objects/seqfeat/BioSource.cpp", __LINE__); bool CBioSource::IsStopWord(const string& value) @@ -567,7 +558,7 @@ Description: make the build more reproducible }; typedef CStaticArraySet TCStrSet; -static const TCStrSet s_CountriesSet(s_Countries, sizeof(s_Countries), __FILE__, __LINE__); -+static const TCStrSet s_CountriesSet(s_Countries, sizeof(s_Countries), 'c++/src/objects/seqfeat/SubSource.cpp', __LINE__); ++static const TCStrSet s_CountriesSet(s_Countries, sizeof(s_Countries), "c++/src/objects/seqfeat/SubSource.cpp", __LINE__); // former legal country names, must be in alphabetical order (case sensitive) static const char* const s_Former_Countries[] = { @@ -576,7 +567,7 @@ Description: make the build more reproducible "Zaire" }; -static const TCStrSet s_Former_CountriesSet(s_Former_Countries, sizeof(s_Former_Countries), __FILE__, __LINE__); -+static const TCStrSet s_Former_CountriesSet(s_Former_Countries, sizeof(s_Former_Countries), 'c++/src/objects/seqfeat/SubSource.cpp', __LINE__); ++static const TCStrSet s_Former_CountriesSet(s_Former_Countries, sizeof(s_Former_Countries), "c++/src/objects/seqfeat/SubSource.cpp", __LINE__); bool CCountries::IsValid(const string& country) { @@ -587,7 +578,7 @@ Description: make the build more reproducible " ThrowUnassigned("<