a bunch of cleaning to get wayward unit tests passing on windows. not there yet.

also a nice change in tree, to support the 40,000 deep symbol tree test that was barfing.
this was totally due to having a recursive destructor with a crazy deep tree; we blew out the stack on windows,
which we never even noticed on linux.  replacement algorithm does an iterative spider instead of beautiful
recursion, but it also handles arbitrarily large trees with no additional stack frames.

diff --git a/nucleus/library/application/windoze_helper.cpp b/nucleus/library/application/windoze_helper.cpp
index 85c30488d844dfcd75cdaad66831e2fcd5896f9d..a78392c9f0f7f4a5e5c5cdfb178dcf6bed712907 100644 (file)
--- a/nucleus/library/application/windoze_helper.cpp
+++ b/nucleus/library/application/windoze_helper.cpp
@@ -13,15 +13,8 @@
 \*****************************************************************************/
 
 #include "windoze_helper.h"
-///#include "array.h"
-///#include "build_configuration.h"
-///#include "convert_utf.h"
-///#include "function.h"
-///#include "mutex.h"
-///#include "portable.h"
-///#include "set.h"
-///#include "version_record.h"
 #include <configuration/application_configuration.h>
+#include <loggers/program_wide_logger.h>
 
 ///#include <errno.h>
 ///#include <stdlib.h>
@@ -50,12 +43,15 @@
 */
 
 using namespace basis;
+using namespace loggers;
 using namespace structures;
 using namespace configuration;
 
 #undef static_class_name
 #define static_class_name() "windoze_helper"
 
+#define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), s)
+
 /*
 //#define DEBUG_PORTABLE
   // uncomment for noisy debugging.
@@ -836,13 +832,16 @@ const char *opsystem_name(known_operating_systems which)
     case WIN_XP: return "WIN_XP";
     case WIN_SRV2K3: return "WIN_SRV2K3";
     case WIN_VISTA: return "WIN_VISTA";
-    case WIN_SRV2K8: return "WIN_SRV2K8";
+    case WIN_7: return "WIN_7";
+    case WIN_8: return "WIN_8";
+    case WIN_10: return "WIN_10";
     default: return "UNKNOWN_OS";
   }
 }
 
 known_operating_systems determine_OS()
 {
+  FUNCDEF("determine_OS");
   version osver = application_configuration::get_OS_version();
   if ( (osver.v_major() == 4) && (osver.v_minor() == 0) ) {
     if (osver.v_revision() == VER_PLATFORM_WIN32_WINDOWS) return WIN_95;
@@ -855,9 +854,19 @@ known_operating_systems determine_OS()
     return WIN_SRV2K3;
   } else if ( (osver.v_major() == 6) && (osver.v_minor() == 0) ) {
     return WIN_VISTA;
+//  } else if ( (osver.v_major() == 6) && (osver.v_minor() == 1) ) {
+//    return WIN_SRV2K8;
   } else if ( (osver.v_major() == 6) && (osver.v_minor() == 1) ) {
-    return WIN_SRV2K8;
+    return WIN_7;
+  } else if ( (osver.v_major() == 6) && (osver.v_minor() == 2) ) {
+    return WIN_8;
+  } else if ( (osver.v_major() == 10) && (osver.v_minor() == 0) ) {
+    return WIN_10;
   }
+
+//temp
+LOG(a_sprintf("got a major OS of %d and minor OS of %d", osver.v_major(), osver.v_minor()));
+
   return UNKNOWN_OS;
 }
 

diff --git a/nucleus/library/application/windoze_helper.h b/nucleus/library/application/windoze_helper.h
index 3da874538d22c3ca89f5b4442d54cd7313e15854..969501b55022ebcfa13f09c57ff968dacb7d4405 100644 (file)
--- a/nucleus/library/application/windoze_helper.h
+++ b/nucleus/library/application/windoze_helper.h
@@ -216,7 +216,9 @@ namespace application {
     #define BROADCAST_HANDLE HWND_BROADCAST
 
     enum known_operating_systems {
-      WIN_95, WIN_NT, WIN_2K, WIN_XP, WIN_SRV2K3, WIN_VISTA, WIN_SRV2K8,
+      WIN_95, WIN_NT, WIN_2K, WIN_XP, WIN_SRV2K3, WIN_VISTA, 
+///WIN_SRV2K8,
+      WIN_7, WIN_8, WIN_10,
       UNKNOWN_OS
     };
     const char *opsystem_name(known_operating_systems which);

diff --git a/nucleus/library/basis/astring.cpp b/nucleus/library/basis/astring.cpp
index 3c09fce8f1c30efac4565011823bc03923d810ee..916ec0fd2e3cf12db5d1f29f86bf8bd3c522cd98 100644 (file)
--- a/nucleus/library/basis/astring.cpp
+++ b/nucleus/library/basis/astring.cpp
@@ -19,12 +19,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-//#ifdef __WIN32__
-//  #undef strcasecmp 
-//  #undef strncasecmp 
-//  #define strcasecmp strcmpi
-//  #define strncasecmp strnicmp
-//#endif
+#ifdef _MSC_VER
+  #undef strcasecmp 
+  #undef strncasecmp 
+  #define strcasecmp strcmpi
+  #define strncasecmp strnicmp
+#endif
 
 //#define DEBUG_STRING
   // uncomment for debugging version.

diff --git a/nucleus/library/filesystem/filename.cpp b/nucleus/library/filesystem/filename.cpp
index 5ce3886e9affe0ec1a99cba71046403a778b41ff..152cfc04b434b6bd644d2af28d13336752dfc8fb 100644 (file)
--- a/nucleus/library/filesystem/filename.cpp
+++ b/nucleus/library/filesystem/filename.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
+#if defined(__UNIX__) 
   #include <unistd.h>
 #else
   #include <io.h>
@@ -190,13 +190,22 @@ void filename::canonicalize()
   // on windows, we want to translate away from any cygwin or msys format into a more palatable
   // version that the rest of windows understands.
   // first, cygwin...
-  const astring CYGDRIVE_PATH = astring(astring(DEFAULT_SEPARATOR, 1) + "cygdrive"
-      + astring(DEFAULT_SEPARATOR, 1));
+//hmmm: make these into statics!
+  const astring CYGDRIVE_SENTINEL = "cygdrive";
+  const astring CYGDRIVE_PATH = astring(astring(DEFAULT_SEPARATOR, 1)
+      + CYGDRIVE_SENTINEL + astring(DEFAULT_SEPARATOR, 1));
+
   // must be at least as long as the string we're looking for, plus a drive letter afterwards.
-  if ( (length() > CYGDRIVE_PATH.length() + 1) && begins(CYGDRIVE_PATH) ) {
+  if ( (length() >= CYGDRIVE_PATH.length() + 1)
+      && separator(get(0))
+      && separator(get(CYGDRIVE_PATH.length() - 1))
+      && compare(CYGDRIVE_SENTINEL, 1, 
+          0, CYGDRIVE_SENTINEL.length(), true) ) {
     zap(0, CYGDRIVE_PATH.length() - 1);  // whack the cygdrive portion plus two slashes.
     insert(1, ":");  // add a colon after the imputed drive letter.
-//LOG(astring("turned cygdrive string into: ") + *this);
+//LOG(astring("turned cygdrive path string into: ") + *this);
+  } else {
+//LOG(astring("path didn't match so left as: ") + *this);
   }
   // now we convert msys...
   if ( (length() >= 2) && (get(0) == DEFAULT_SEPARATOR)

diff --git a/nucleus/library/loggers/critical_events.cpp b/nucleus/library/loggers/critical_events.cpp
index ebb60bb8245bca72e984426ee674318020db7d99..79f872616d7bd819555971b8c674b3d55ca498cc 100644 (file)
--- a/nucleus/library/loggers/critical_events.cpp
+++ b/nucleus/library/loggers/critical_events.cpp
@@ -26,7 +26,7 @@
 #include <timely/time_stamp.h>
 
 #include <stdio.h>
-#ifdef __UNIX__
+#ifndef _MSC_VER
   #include <errno.h>
 #endif
 
@@ -54,9 +54,9 @@ SAFE_STATIC(mutex, __critical_event_dir_lock, )
 
 basis::un_int critical_events::system_error()
 {
-#if defined(__UNIX__)
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   return errno;
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
   return GetLastError();
 #else
   #pragma error("hmmm: no code for error number for this operating system")
@@ -66,9 +66,9 @@ basis::un_int critical_events::system_error()
 
 astring critical_events::system_error_text(basis::un_int to_name)
 {
-#if defined(__UNIX__)
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   return strerror(to_name);
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
   char error_text[1000];
   FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NIL, to_name,
       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)error_text,

diff --git a/nucleus/library/loggers/critical_events.h b/nucleus/library/loggers/critical_events.h
index f814de50a521b3ab1435620a944ac80b3a8b6337..86352c20ca0cecbda542848b4a800f3a88421402 100644 (file)
--- a/nucleus/library/loggers/critical_events.h
+++ b/nucleus/library/loggers/critical_events.h
@@ -20,10 +20,10 @@
 namespace loggers {
 
 //! This macro wraps the notion of stopping in the debugger.
-#ifdef __UNIX__
+#ifndef _MSC_VER
   #define CAUSE_BREAKPOINT
 //hmmm: need a unix equivalent for this.  supporting gcc might be enough.
-#elif defined(__WIN32__)
+#else
   #ifdef __MINGW32__
     extern "C" {
 //      #include <ddk/winddi.h>

diff --git a/nucleus/library/nodes/packable_tree.cpp b/nucleus/library/nodes/packable_tree.cpp
index 168e3500429e80d68dd91b7a156c20b29d0c3e92..aa85c3756bb6f0870109e7950306885d46f29542 100644 (file)
--- a/nucleus/library/nodes/packable_tree.cpp
+++ b/nucleus/library/nodes/packable_tree.cpp
@@ -23,7 +23,7 @@
 using namespace basis;
 using namespace structures;
 
-#define DEBUG_PACKABLE_TREE
+//#define DEBUG_PACKABLE_TREE
   // uncomment for noisy debugging.
 
 #undef LOG
@@ -82,12 +82,16 @@ packable_tree::packable_tree() : tree() {}
 
 void packable_tree::calcit(int &size_accumulator, const packable_tree *current_node)
 {
-LOG(a_sprintf("calcing node %x", current_node));
   FUNCDEF("calcit");
+#ifdef DEBUG_PACKABLE_TREE
+  LOG(a_sprintf("calcing node %x", current_node));
+#endif
   if (!current_node) throw_error(static_class_name(), func, "current node is nil");
   tree_command_unit temp;
   size_accumulator += current_node->packed_size() + temp.packed_size();
-LOG(a_sprintf("len A %d", size_accumulator));
+#ifdef DEBUG_PACKABLE_TREE
+  LOG(a_sprintf("len A %d", size_accumulator));
+#endif
 }
 
 void packable_tree::packit(byte_array &packed_form, const packable_tree *current_node)

diff --git a/nucleus/library/nodes/symbol_tree.cpp b/nucleus/library/nodes/symbol_tree.cpp
index a4e455a50629fa892c37e81dbee03aba381b33f5..dd96fea511897215f0da01d23000bf2bafb5f3b5 100644 (file)
--- a/nucleus/library/nodes/symbol_tree.cpp
+++ b/nucleus/library/nodes/symbol_tree.cpp
@@ -22,8 +22,10 @@
 //#define DEBUG_SYMBOL_TREE
   // uncomment for totally noisy version.
 
+#include <loggers/program_wide_logger.h>
 #undef LOG
 #define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), s)
+using namespace loggers;
 
 using namespace basis;
 using namespace structures;
@@ -36,6 +38,11 @@ class symbol_tree_associations : public symbol_table<symbol_tree *>
 public:
   symbol_tree_associations(int estimated_elements)
       :  symbol_table<symbol_tree *>(estimated_elements) {}
+  virtual ~symbol_tree_associations() {
+//    for (int i = 0; i < symbols(); i++) {
+//      WHACK(use(i));
+//    }
+  }
 };
 
 //////////////
@@ -49,8 +56,11 @@ symbol_tree::symbol_tree(const astring &node_name, int estimated_elements)
 
 symbol_tree::~symbol_tree()
 {
-  WHACK(_name);
+  FUNCDEF("destructor");
+LOG("prior to whacks");
   WHACK(_associations);
+  WHACK(_name);
+LOG("after whacks");
 }
 
 int symbol_tree::children() const { return _associations->symbols(); }

diff --git a/nucleus/library/nodes/tree.cpp b/nucleus/library/nodes/tree.cpp
index a087b0b74edaeb032771f1b725eb80d3a4e000bb..0a2fbf9eea119fd052362fb24356b9a60273e8fe 100644 (file)
--- a/nucleus/library/nodes/tree.cpp
+++ b/nucleus/library/nodes/tree.cpp
@@ -278,10 +278,61 @@ tree::~tree()
   // cousin.
   tree *my_parent = parent();
   if (my_parent) my_parent->prune(this);
+  my_parent = NIL;  // disavow since we are loose now.
+
+#if 0
+
+  //original version suffers from being too recursive on windoze,
+  //which blows out the stack.  linux never showed this problem.  so, i
+  //guess i'm glad i tested on windows.
+  //anyway, it's a general problem for a degenerate tree like the one
+  //i've constructed.  current version has ~40000 direct descendants of
+  //the root in a single line, so the stack has to support 40000 frames
+  //for the delete implementation below to work.
 
   // iterate over the child nodes and whack each individually.
   while (branches()) delete branch(0);
     // this relies on the child getting out of our branch list.
+#else
+
+  // newer version of delete doesn't recurse; it just iterates instead,
+  // which avoids the massive recursive depth of the original approach.
+  tree *curr_node = this;
+  while (curr_node != NIL) {
+    // make a breadcrumb for getting back to 'here' in the tree.
+    tree *way_back = curr_node;
+    // our main operation here is to go down a node without using any
+    // stack frames.  so we just pick the first kid; it's either valid
+    // or there are no kids at all.
+    curr_node = curr_node->branch(0);
+
+    if (curr_node = NIL) {
+      // wayback has no children, so we can take action.
+
+      // if wayback is the same as "this", then we exit from iterations since
+      // we've cleaned all the kids out.
+      if (way_back == this) {
+        break;
+      }
+
+      // we want to whack the wayback node at this point, since it's a parent
+      // with no kids, i.e. a leaf.  we've guaranteed we're not going beyond
+      // our remit, since wayback is not the same node as the top level one
+      // in the destructor (as long as there are no cycles in the tree...).
+      curr_node = way_back->parent();  // go up in tree on next iteration.
+      delete way_back;  // whack a node, finally.
+
+    } else {
+      // okay, there's a node below here.  we will spider down to it.
+      continue;
+    }
+
+
+  }
+
+#endif
+
+
 }
 
 tree *tree::parent() const { return (tree *)get_link(BACKWARDS_BRANCH); }

diff --git a/nucleus/library/tests_basis/test_system_preconditions.cpp b/nucleus/library/tests_basis/test_system_preconditions.cpp
index f18f17d6e106022b8bf62f3ff139a2243887e818..ee6e1af9e4cff4a1a89013a894159fa165541458 100644 (file)
--- a/nucleus/library/tests_basis/test_system_preconditions.cpp
+++ b/nucleus/library/tests_basis/test_system_preconditions.cpp
@@ -147,16 +147,10 @@ int test_system_preconditions::execute()
 
 #ifdef __WIN32__
   known_operating_systems os = determine_OS();
-  if (os == WIN_95)
-    printf("This is windows 95.\n");
-  else if (os == WIN_NT)
-    printf("This is windows NT.\n");
-  else if (os == WIN_2K)
-    printf("This is windows 2000.\n");
-  else if (os == WIN_XP)
-    printf("This is windows XP.\n");
-  else 
-    printf("This OS is unknown.\n");
+  astring os_report = "This OS is: ";
+  os_report += opsystem_name(os);
+  os_report += "\n";
+  printf(os_report.s());
 #endif
 
   version os_ver = application_configuration::get_OS_version();

diff --git a/nucleus/library/tests_filesystem/makefile b/nucleus/library/tests_filesystem/makefile
index 7761b8c65dc5e0577f7b52f2514b46f864ee021d..fb7e2a97e12605372cf1c0799acf4f314ba51e9d 100644 (file)
--- a/nucleus/library/tests_filesystem/makefile
+++ b/nucleus/library/tests_filesystem/makefile
@@ -6,7 +6,8 @@ TARGETS = test_byte_filer.exe test_directory.exe test_directory_tree.exe test_fi
   test_file_time.exe test_filename.exe test_huge_file.exe
 DEFINITIONS += USE_HOOPLE_DLLS
 LOCAL_LIBS_USED = unit_test application configuration filesystem loggers \
-  mathematics nodes processes structures textual timely structures basis 
+  mathematics nodes processes structures textual timely structures basis  \
+loggers 
 RUN_TARGETS = $(ACTUAL_TARGETS)
 
 include cpp/rules.def

diff --git a/nucleus/library/tests_filesystem/test_directory_tree.cpp b/nucleus/library/tests_filesystem/test_directory_tree.cpp
index f9fa5adf8bc3670b45dadb1ec4bf987388a9ca3d..d6136becfd693d9f2918520c27311888f329eb80 100644 (file)
--- a/nucleus/library/tests_filesystem/test_directory_tree.cpp
+++ b/nucleus/library/tests_filesystem/test_directory_tree.cpp
@@ -216,7 +216,7 @@ LOG("what happened with that?  did it work?");
 
 //hmmm: plug in real recursive delete here instead.
 basis::un_int kid;
-launch_process::run("rm", astring("-rf ") + tmpdir.raw(), launch_process::AWAIT_APP_EXIT, kid);
+launch_process::run("/usr/bin/rm", astring("-rf ") + tmpdir.raw(), launch_process::AWAIT_APP_EXIT, kid);
 ASSERT_FALSE(kid, "removing temporary files after test");
 
   }

diff --git a/nucleus/library/tests_filesystem/test_file_time.cpp b/nucleus/library/tests_filesystem/test_file_time.cpp
index 6e79f9a2b4fe10b5405259516996bce26e262d52..14e25490ffdd5deabc54ae91d3a779ba4fe26894 100644 (file)
--- a/nucleus/library/tests_filesystem/test_file_time.cpp
+++ b/nucleus/library/tests_filesystem/test_file_time.cpp
@@ -57,18 +57,26 @@ int test_file_time::execute()
   FUNCDEF("execute");
 
 #ifdef __UNIX__
+  // just open the root directory on unix; always works.
   astring toppy("/");
 #endif
 #ifdef __WIN32__
-  astring toppy("c:/ntldr");  // will work for any modern windows OS.
+  // windows cannot fopen a directory.  this blows.  so we pick a file
+  // that should work for most windowses.
+  astring toppy("c:/Windows/notepad.exe");
 #endif
 
   // test storing info via the constructor.
   file_time absurdity_time(toppy);
   FILE *topdir = fopen(toppy.s(), "r");
+  ASSERT_INEQUAL(topdir, NIL, "opening topdir for testing");
+  if (topdir == NIL) {
+    return 1;
+  }
   file_time nutty_time(topdir);
-  struct stat sbuffer;
+
   int filenum = fileno(topdir);
+  struct stat sbuffer;
   int stat_okay = fstat(filenum, &sbuffer);
   ASSERT_FALSE(stat_okay, "failure to read filetime");
   file_time goofy_time(sbuffer.st_mtime); 

diff --git a/nucleus/library/tests_filesystem/test_filename.cpp b/nucleus/library/tests_filesystem/test_filename.cpp
index 54bba456d58d952109f11095c74695c8cc7f7d5c..c91c032040563061ab02b025d1913ae7f220be77 100644 (file)
--- a/nucleus/library/tests_filesystem/test_filename.cpp
+++ b/nucleus/library/tests_filesystem/test_filename.cpp
@@ -224,7 +224,7 @@ int test_filename::execute()
   {
     // eighth test group is only for windows side.
 //hmmm: might be nice to get the build machine launching this on a windows vm.
-    astring GROUP = "eighth: cygwin and msys paths";
+    astring GROUP = "eighth: cygwin and msys paths ";
     filename test1("/cygdrive/q/marbles");
     ASSERT_EQUAL(test1, astring("q:\\marbles"), GROUP + "test 1 failed");
     filename test2("/cygdrive/r");
@@ -253,13 +253,13 @@ int test_filename::execute()
     filename test14("/r/");
     ASSERT_EQUAL(test14, astring("r:\\"), GROUP + "test 14 failed");
     filename test15("/r");
-    ASSERT_EQUAL(test15, astring("r:"), GROUP + "test 15 failed");
+    ASSERT_EQUAL(test15, astring("r:\\"), GROUP + "test 15 failed");
     filename test16("/");
     ASSERT_EQUAL(test16, astring("\\"), GROUP + "test 16 failed");
     filename test17("r/");
     ASSERT_EQUAL(test17, astring("r\\"), GROUP + "test 17 failed");
     filename test18("/kr/soop");
-    ASSERT_INEQUAL(test18, astring("\\kr\\soop"), GROUP + "test 18 failed");
+    ASSERT_EQUAL(test18, astring("\\kr\\soop"), GROUP + "test 18 failed");
   }
 #endif
 

diff --git a/nucleus/library/tests_nodes/test_symbol_tree.cpp b/nucleus/library/tests_nodes/test_symbol_tree.cpp
index ef9917c45d44e34cc1d0feb5e0cf4964a348c9c8..8d4b2a151cc29e7dc28980fe8d36463de0a2d258 100644 (file)
--- a/nucleus/library/tests_nodes/test_symbol_tree.cpp
+++ b/nucleus/library/tests_nodes/test_symbol_tree.cpp
@@ -46,22 +46,26 @@ using namespace unit_test;
 
 #define DEBUG_SYMBOL_TREE
 
-class test_symbol_tree : public virtual unit_base, virtual public application_shell
+// how many nodes we add to the tree.
+const int MAX_NODES_TESTED = 40000;
+
+class test_symbol_tree : public unit_base, public application_shell
 {
 public:
-  test_symbol_tree() {}
+  test_symbol_tree() : unit_base() {}
   DEFINE_CLASS_NAME("test_symbol_tree");
   int execute();
 };
 
 int test_symbol_tree::execute()
 {
+  FUNCDEF("execute");
   LOG("please check memory usage and record it, then hit a key to start testing.");
 
   try {
     symbol_tree t("blork");
     symbol_tree *curr = &t;
-    for (int i = 0; i < 40000; i++) {
+    for (int i = 0; i < MAX_NODES_TESTED; i++) {
       // if the current node has any branches, we'll jump on one as the next
       // place.
       if (curr->branches()) {
@@ -78,6 +82,13 @@ int test_symbol_tree::execute()
     return 1;
   }
 
+LOG("got out of the loop");
+
+//one assertion to tickle final report.
+  bool farp = true;
+  ASSERT_TRUE(farp, "tickling reporting for assertions");
+//hmmm: above shouldn't be needed at all.
+
   LOG("check memory usage after the run.  then hit a key to end "
       "the program.");
 

diff --git a/nucleus/library/unit_test/unit_base.cpp b/nucleus/library/unit_test/unit_base.cpp
index 439cc6974dc518a7a9d9179b9d23f18073759f94..dfcd858ef7fdbc5078b64c5873cc819ac96a866b 100644 (file)
--- a/nucleus/library/unit_test/unit_base.cpp
+++ b/nucleus/library/unit_test/unit_base.cpp
@@ -270,6 +270,9 @@ int unit_base::final_report()
 
   astring keyword = "FAILURE";  // but be pessimistic about overall result at first..?
 
+
+BASE_LOG(a_sprintf("total tests %d passed tests %d", c_total_tests, c_passed_tests));
+
   // check whether we really did succeed or not.
   if (c_total_tests == c_passed_tests) keyword = "SUCCESS";  // success!
   else to_return = 12;  // a failure return.

diff --git a/scripts/clam/cpp/ms_manifest.sh b/scripts/clam/cpp/ms_manifest.sh
index a752837cc893309fbb4aa382ce4bfadcb6ec4ab0..a4ac61d19f79804c9a2dcfbe6b1a6b8ae460c672 100755 (executable)
--- a/scripts/clam/cpp/ms_manifest.sh
+++ b/scripts/clam/cpp/ms_manifest.sh
@@ -1,25 +1,33 @@
 #!/bin/bash
-# the basename is the file that needs its manifest stuffed into the file
+# the target is the file that needs its manifest stuffed into the file
 # itself.  the where parameter tells us what index to use when stuffing it.
-basename=$1
-where=$2
+target=$1; shift
+where=$1; shift
 if [ -z "$WIN32_MANIFEST_FILE" ]; then
   WIN32_MANIFEST_FILE=$CLAM_DIR/cpp/ms_manifests/security_manifest.txt 
 fi
-error_val=0
-if [ -f "$basename.manifest" -a -f "$basename" ]; then 
-  bash $BUILD_SCRIPTS_DIR/wrapdoze.sh mt -manifest $basename.manifest $WIN32_MANIFEST_FILE -outputresource:$basename\;$where >/dev/null 
-  error_val=$?
-elif [ -f "$basename" ]; then 
-  bash $BUILD_SCRIPTS_DIR/wrapdoze.sh mt -manifest $WIN32_MANIFEST_FILE -outputresource:$basename\;$where >/dev/null
-  error_val=$?
-else
-  echo skipping manifest generation for $basename.
-  if [ ! -f "$basename.manifest" ]; then echo manifest file was missing.; fi
-  if [ ! -f "$basename" ]; then echo main file was missing.; fi
-fi
+for ((count=1 ; count <= 10; count++)); do
+  error_val=0
+  if [ -f "$target.manifest" -a -f "$target" ]; then 
+    bash $BUILD_SCRIPTS_DIR/wrapdoze.sh mt -manifest $target.manifest $WIN32_MANIFEST_FILE -outputresource:$target\;$where >/dev/null 
+    error_val=$?
+  elif [ -f "$target" ]; then 
+    bash $BUILD_SCRIPTS_DIR/wrapdoze.sh mt -manifest $WIN32_MANIFEST_FILE -outputresource:$target\;$where >/dev/null
+    error_val=$?
+  else
+    echo skipping manifest generation for $target.
+    if [ ! -f "$target.manifest" ]; then echo manifest file was missing.; fi
+    if [ ! -f "$target" ]; then echo main file was missing.; fi
+    break
+  fi
+  if [ $error_val -ne 0 ]; then
+    echo "Error attaching manifest to $target at try #$count."
+  else
+    break
+  fi
+done
 if [ $error_val -ne 0 ]; then
-  echo There was an error attaching manifest to $1.
+  echo There was an error attaching manifest to $target.
   exit 12
 fi
 

diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 9183ab87bc86f6e7d10de81ffcc51d0d1970b5a0..0edf1ba09ac02effc1f38e8f0dfa43b53ae066c3 100644 (file)
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -271,7 +271,11 @@ ifeq "$(OP_SYSTEM)" "WIN32"
   else
     TEMP_OBJ3a = $(TEMP_OBJ2)
   endif
-  TEMP_OBJ3 = $(TEMP_OBJ3a:%.rc=%.res)
+  ifeq "$(COMPILER)" "VISUAL_CPP"
+    TEMP_OBJ3 = $(TEMP_OBJ3a:%.rc=%.res)
+  else
+    TEMP_OBJ3 = $(TEMP_OBJ3a)
+  endif
 else
   # replace this when supporting resource files on unix.
   TEMP_OBJ3 = $(TEMP_OBJ2:%.rc=)

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 8dda91725dcb50aa7ef0c4bab2eb85fbd62008ce..cf57dcfa2be4b9d9f0519692cc34c36ab44cf998 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -72,8 +72,8 @@ ifeq "$(COMPILER)" ""
     endif
   endif
   ifeq "$(OP_SYSTEM)" "WIN32"
-    COMPILER := GNU_WINDOWS
-#    COMPILER := VISUAL_CPP
+#    COMPILER := GNU_WINDOWS
+    COMPILER := VISUAL_CPP
   endif
   ifeq "$(COMPILER)" ""
     # if we get into this case, we have no idea how to set the default
@@ -599,7 +599,8 @@ ifeq "$(COMPILER)" "GNU_WINDOWS"
 ###$(COMPILER_ROOT_DIR)/usr/include/mingw $(COMPILER_ROOT_DIR)/usr/include $(COMPILER_ROOT_DIR)/usr/include/w32api $(COMPILER_ROOT_DIR)/usr/include/extras
 
   COMPILER_LIBRARY_DIR = $(COMPILER_ROOT_DIR)/lib
-  DEFINITIONS += __GNU_WINDOWS__ _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 __cplusplus __USE_W32_SOCKETS
+  DEFINITIONS += __GNU_WINDOWS__ _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 __USE_W32_SOCKETS
+#__cplusplus 
 #__USE_GNU 
 
   LIBRARY_TOOL = ar
@@ -615,6 +616,7 @@ ifeq "$(COMPILER)" "GNU_WINDOWS"
   MIDL_DEFS = -no_robust
   # some lovely definitions used by some of the mfc and other ms code.
   DEPENDENCY_DEFINITIONS += __cplusplus __MINGW32__ _WIN32 _CHAR_UNSIGNED M_I86 _M_I86 _M_IX86=500 _WIN32_WINNT=0x501 __RPC_WIN32__ __RPCNDR_H_VERSION__ __RPCPROXY_H_VERSION__ TARGET_IS_NT40_OR_LATER PGM_SETCHILD _MFC_VER=0x0600
+
 endif
 
 ifeq "$(COMPILER)" "VISUAL_CPP"