working towards non-brokenness still

diff --git a/octopi/library/tests_cromp/makefile b/octopi/library/tests_cromp/makefile
index 391d36f45010a371f3f10a7360ac87678ad85280..a359a61e9321a3d710429433589d11308daaf6c2 100644 (file)
--- a/octopi/library/tests_cromp/makefile
+++ b/octopi/library/tests_cromp/makefile
@@ -5,12 +5,12 @@ include cpp/variables.def
 PROJECT = test_cromp
 TYPE = test
 TARGETS = test_cromp_client.exe test_cromp_server.exe test_many_cromp.exe
-#DEFINITIONS += USE_HOOPLE_DLLS
 LAST_TARGETS = create_decoder_ring
-#LOCAL_LIBS_USED = basis i_library i_communication
+LOCAL_LIBS_USED = unit_test application configuration filesystem loggers \
+  mathematics nodes octopi processes sockets structures textual timely \
+  structures basis 
 USE_SSL = t
-#VCPP_USE_SOCK = t
-RUN_TARGETS = $(ACTUAL_TARGETS)
+#RUN_TARGETS = $(ACTUAL_TARGETS)
 
 include cpp/rules.def
 

diff --git a/octopi/library/tests_cromp/makefile.decoder b/octopi/library/tests_cromp/makefile.decoder
index a54e4ae8b5b2577c7149d6a8aeea132bc081725f..564d3b337ea5a0817b5acb4641b868b68669d0d1 100644 (file)
--- a/octopi/library/tests_cromp/makefile.decoder
+++ b/octopi/library/tests_cromp/makefile.decoder
@@ -6,12 +6,8 @@ PROJECT = decoder_ring
 TYPE = application
 TARGETS = cromp_decoder.exe
 LOCAL_LIBS_USED = basis 
-#ifeq "$(COMPILER)" "VISUAL_CPP"
-#  SOURCE += cromp_decoder_version.rc
-#endif
-#USE_SSL = t
-#VCPP_USE_SOCK = t
-#RUN_TARGETS = $(ACTUAL_TARGETS)
+USE_SSL = t
+RUN_TARGETS = $(ACTUAL_TARGETS)
 
 include cpp/rules.def
 

diff --git a/octopi/library/tests_cromp/test_cromp_client.cpp b/octopi/library/tests_cromp/test_cromp_client.cpp
index 9b466edf4c26d43498470cddf9a7ddc464b0805e..b8ed2613bab2739ce71fd862854ac70112512ff6 100644 (file)
--- a/octopi/library/tests_cromp/test_cromp_client.cpp
+++ b/octopi/library/tests_cromp/test_cromp_client.cpp
@@ -56,7 +56,10 @@ using namespace timely;
 using namespace unit_test;
 
 #undef LOG
-#define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), s)
+#define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), astring(s))
+#undef BASE_LOG
+#define BASE_LOG(s) EMERGENCY_LOG(program_wide_logger::get(), astring(s))
+
 
 #define DEBUG_TESTER
   // uncomment for noisier version.
@@ -123,9 +126,6 @@ const int PENDING_REQUESTS_FORCED = MAXIMUM_PENDING_REQUESTS;
 const int CHANCE_OF_RECONSTRUCT = 14;
   // how frequently a bus reconstruction occurs, in 1000.
 
-#define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), s)
-#define BASE_LOG(s) EMERGENCY_LOG(program_wide_logger::get(), s)
-
 class cromp_client_tester : virtual public unit_base, virtual public application_shell
 {
 public:
@@ -241,7 +241,8 @@ private:
 //////////////
 
 cromp_client_tester::cromp_client_tester()
-: application_shell("cromp_client_tester"),
+: application_shell(),
+//"cromp_client_tester"),
   _uplink(NULL_POINTER),
   _lock(new mutex),
   _threads_active(0),
@@ -409,7 +410,7 @@ int cromp_client_tester::print_instructions()
 {
   astring name = filename(application::_global_argv[0]).basename().raw();
   log(a_sprintf("%s usage:", name.s()));
-  log("");
+  log(astring(""));
   log(a_sprintf("\
 This program connects to a cromp test server and exchanges packets to test\n\
 the performance of the cromp protocol.  All command line flags are optional\n\
@@ -557,7 +558,7 @@ void cromp_client_tester::bite_server(structures::set<octopus_request_id> &ids,
       }
       case cromp_client::TOO_FULL: {
 //treating as failure right now.
-BASE_LOG("got too full outcome!");
+LOG("got too full outcome!");
         sends--;
         overall_sent -= curr_sending;
         continue;
@@ -565,7 +566,7 @@ BASE_LOG("got too full outcome!");
       }
       case cromp_client::TIMED_OUT: {
 //treating as failure right now.
-BASE_LOG("got timed out outcome!");
+LOG("got timed out outcome!");
         sends--;
         overall_sent -= curr_sending;
         continue;
@@ -598,10 +599,10 @@ BASE_LOG("got timed out outcome!");
     }
 
     if (! (sends % _checkpoint_count)) {
-      BASE_LOG(a_sprintf("%x send #%d", originator, sends));
+      LOG(a_sprintf("%x send #%d", originator, sends));
     }
   }
-  BASE_LOG(a_sprintf("%x final send #%d", originator, _send_count));
+  LOG(a_sprintf("%x final send #%d", originator, _send_count));
 
 ///  LOG(timestamp(true, true) + " done.");
 ///  LOG(a_sprintf("sent %d items.", _send_count));

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 0ba91e04f275e15e85c5aefeb91236f5226f3563..21c1bbb1970c278c74e8ff29580139df515fc5c6 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -327,7 +327,10 @@ ifeq "$(OPERATING_SYSTEM)" "WIN32"
   # the root name of the version file.  This is currently irrelevant on
   # non-windoze platforms.
   #CLAM_VERSION_RC_ROOT = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/rc_name.sh)
+  CLAM_VERSION_RC_ROOT=
   #hmmm: also currently irrelevant since we are only doing static builds.
+else
+  CLAM_VERSION_RC_ROOT=
 endif
 
 ifneq "$(CONSOLE_MODE)" ""