X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Ftools%2Fclam_tools%2Fvalue_tagger.cpp;h=80debd79ffe5cc3f1d2527bc775f8fd267824558;hb=6d2ec9becc9374e514a30f49763eca1f071d0e73;hp=6c745e500906f01ebe90198a1dd546491d07c75e;hpb=5da4dd90dd41adadeac1355ee5d50c3f400a1b83;p=feisty_meow.git

diff --git a/nucleus/tools/clam_tools/value_tagger.cpp b/nucleus/tools/clam_tools/value_tagger.cpp
index 6c745e50..80debd79 100644
--- a/nucleus/tools/clam_tools/value_tagger.cpp
+++ b/nucleus/tools/clam_tools/value_tagger.cpp
@@ -229,6 +229,7 @@ int value_tagger::print_instructions_and_exit()
 {
   LOG(a_sprintf("%s usage:", filename(_global_argv[0]).basename().raw().s()));
   LOG("");
+
   LOG("\
 This utility scans a code base for outcome and filter definitions.  It will\n\
 only scan the header files (*.h) found in the directories specified.  The\n\
@@ -327,17 +328,17 @@ int value_tagger::execute()
 
   log(time_stamp::notarize(true) + "value_tagger started.", basis::ALWAYS_PRINT);
 
-  astring test_repository = environment::get("FEISTY_MEOW_DIR");
+  astring test_repository = environment::get("FEISTY_MEOW_APEX");
   if (!test_repository) {
     astring msg = "\
 There is a problem with a required build precondition.  The following\r\n\
 variables must be set before the build is run:\r\n\
 \r\n\
-  FEISTY_MEOW_DIR    This should point at the root of the build tree.\r\n\
+  FEISTY_MEOW_APEX    This should point at the root of the build tree.\r\n\
 \r\n\
 There are also a few variables only required for CLAM-based compilation:\r\n\
 \r\n\
-  MAKEFLAGS         This should be set to \"-I $FEISTY_MEOW_DIR/clam\".\r\n\
+  MAKEFLAGS         This should be set to \"-I $FEISTY_MEOW_APEX/clam\".\r\n\
 \r\n\
 Note that on Win32 platforms, these should be set in the System or User\r\n\
 variables before running a build.\r\n";
@@ -373,14 +374,14 @@ variables before running a build.\r\n";
   }
   for (int i = 0; i < temp_dirs.symbols(); i++) {
 //log(astring("curr is ") + current);
-    astring current = parser_bits::substitute_env_vars(temp_dirs.name(i));
+    filename current = filename(parser_bits::substitute_env_vars(temp_dirs.name(i)));
     _dirs.add(current, "");
   }
 
   LOG(astring("Directories to scan..."));
   LOG(_dirs.text_form());
 
-  astring rdir = environment::get("FEISTY_MEOW_DIR");
+  astring rdir = environment::get("FEISTY_MEOW_APEX");
   astring fname;
   astring parmfile = environment::get("BUILD_PARAMETER_FILE");
   if (parmfile.t()) fname = parmfile;
@@ -481,8 +482,8 @@ variables before running a build.\r\n";
 
   byte_filer build_file(fname, "r");
   if (!build_file.good()) {
-    non_continuable_error(class_name(), build_file.filename(),
-        "Could not find the build configuration; is FEISTY_MEOW_DIR set?");
+    non_continuable_error(class_name(), build_file.name(),
+        "Could not find the build configuration; is FEISTY_MEOW_APEX set?");
   }
   byte_array full_config;
   build_file.read(full_config, 100000);  // a good chance to be big enough.
@@ -501,7 +502,7 @@ variables before running a build.\r\n";
   build_number += ".";
   build_number += temp_ini.load("version", "build", "");
   if (build_number.equal_to("...")) {
-    non_continuable_error(class_name(), build_file.filename(),
+    non_continuable_error(class_name(), build_file.name(),
         "Could not read the build number; is build parameter file malformed?");
   }
 
@@ -957,6 +958,7 @@ HOOPLE_MAIN(value_tagger, )
   // static dependencies found by buildor_gen_deps.sh:
   #include <application/application_shell.cpp>
   #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
@@ -973,10 +975,10 @@ HOOPLE_MAIN(value_tagger, )
   #include <filesystem/directory.cpp>
   #include <filesystem/directory_tree.cpp>
   #include <filesystem/file_info.cpp>
+  #include <filesystem/file_time.cpp>
   #include <filesystem/filename.cpp>
   #include <filesystem/filename_list.cpp>
   #include <filesystem/filename_tree.cpp>
-  #include <filesystem/file_time.cpp>
   #include <filesystem/huge_file.cpp>
   #include <loggers/combo_logger.cpp>
   #include <loggers/console_logger.cpp>