Revision: 75872
http://sourceforge.net/p/brlcad/code/75872
Author: starseeker
Date: 2020-05-21 14:47:28 +0000 (Thu, 21 May 2020)
Log Message:
-----------
Merge changes from trunk through r75871
Modified Paths:
--------------
brlcad/branches/bioh/regress/repository/repocheck.cpp
Property Changed:
----------------
brlcad/branches/bioh/
brlcad/branches/bioh/regress/
Index: brlcad/branches/bioh
===================================================================
--- brlcad/branches/bioh 2020-05-21 14:45:52 UTC (rev 75871)
+++ brlcad/branches/bioh 2020-05-21 14:47:28 UTC (rev 75872)
Property changes on: brlcad/branches/bioh
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75720-75867
\ No newline at end of property
+/brlcad/trunk:75720-75871
\ No newline at end of property
Index: brlcad/branches/bioh/regress
===================================================================
--- brlcad/branches/bioh/regress 2020-05-21 14:45:52 UTC (rev 75871)
+++ brlcad/branches/bioh/regress 2020-05-21 14:47:28 UTC (rev 75872)
Property changes on: brlcad/branches/bioh/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
/brlcad/branches/tcltk86/regress:68300-75257
-/brlcad/trunk/regress:75728-75867
\ No newline at end of property
+/brlcad/trunk/regress:75728-75871
\ No newline at end of property
Modified: brlcad/branches/bioh/regress/repository/repocheck.cpp
===================================================================
--- brlcad/branches/bioh/regress/repository/repocheck.cpp 2020-05-21
14:45:52 UTC (rev 75871)
+++ brlcad/branches/bioh/regress/repository/repocheck.cpp 2020-05-21
14:47:28 UTC (rev 75872)
@@ -55,7 +55,9 @@
#include <string>
#include "bu/app.h"
+#include "bu/exit.h"
#include "bu/mapped_file.h"
+#include "bu/str.h"
#define MAX_LINES_CHECK 500
#define EXPECTED_PLATFORM_SYMBOLS 254
@@ -774,13 +776,29 @@
int
main(int argc, const char *argv[])
{
- if (argc != 3) {
- std::cerr << "Usage: repocheck file_list.txt source_dir\n";
+ int verbosity = 0;
+
+ if (argc < 3 || argc > 5) {
+ std::cerr << "Usage: repocheck [-v] file_list.txt source_dir\n";
return -1;
}
+
bu_setprogname(argv[0]);
+ if (argc == 4) {
+ if (BU_STR_EQUAL(argv[1], "-v")) {
+ verbosity = 1;
+ for (int i = 2; i < argc; i++) {
+ argv[i-1] = argv[i];
+ }
+ argc--;
+ } else {
+ bu_exit(-1, "invalid option %s", argv[1]);
+ }
+ }
+
+
repo_info_t repo_info;
repo_info.path_root = std::string(argv[2]);
regex_init(repo_info);
@@ -874,7 +892,7 @@
std::cout << "\n\nNote: need to update EXPECTED_PLATFORM_SYMBOLS -
looking for " << expected_psym_cnt << ", but only found " << psym_cnt <<
"\n\n\n";
}
- if (ret) {
+ if (ret || verbosity) {
std::sort(repo_info.api_log.begin(), repo_info.api_log.end());
std::sort(repo_info.bio_log.begin(), repo_info.bio_log.end());
std::sort(repo_info.bnet_log.begin(), repo_info.bnet_log.end());
@@ -920,7 +938,9 @@
std::cout << "FAILURE: expected " << expected_psym_cnt << "
platform symbols, found " << psym_cnt << "\n";
std::cout <<
"**************************************************************************\n";
ret = 1;
+ }
+ if (psym_cnt > expected_psym_cnt || verbosity) {
if (repo_info.symbol_inc_log.size()) {
std::cout << "\nFound " << repo_info.symbol_inc_log.size() << "
instances of platform symbol usage in header files:\n";
for (size_t i = 0; i < repo_info.symbol_inc_log.size(); i++) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
