X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Ftools%2Fclam_tools%2Fvalue_tagger.cpp;h=2bac060202684e8b54325aa4c12ab9d4e7af1e9b;hb=46db3e069f6346301f8d55a1d155a4904f18ec1e;hp=0975186e5e54f1e46fa0637415fa8f5570a5f6f0;hpb=2dc7262979a054eeb1167aa60546365f1da812e1;p=feisty_meow.git

diff --git a/nucleus/tools/clam_tools/value_tagger.cpp b/nucleus/tools/clam_tools/value_tagger.cpp
index 0975186e..2bac0602 100644
--- a/nucleus/tools/clam_tools/value_tagger.cpp
+++ b/nucleus/tools/clam_tools/value_tagger.cpp
@@ -200,7 +200,7 @@ private:
   ini_configurator *_ini;  // the configuration for what we'll scan.
   string_table _dirs;  // the list of directories.
   string_table _dirs_seen;  // full list of already processed directories.
-  astring _manifest_filename;  // the name of the manifest we'll create.
+  filename _manifest_filename;  // the name of the manifest we'll create.
   byte_filer _manifest;  // the actual file we're building.
   active_searches _search_list;  // tracks our progress in scanning files.
   int_array _search_ordering;
@@ -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\
@@ -352,8 +353,8 @@ variables before running a build.\r\n";
   _ini = new ini_configurator(ini_file, ini_configurator::RETURN_ONLY);
 
   // read the name of the manifest file to create.
-  _manifest_filename = _ini->load("manifest", "output", "");
-  if (!_manifest_filename) {
+  _manifest_filename = filename(_ini->load("manifest", "output", ""));
+  if (!_manifest_filename.raw().length()) {
     non_continuable_error(class_name(), ini_file, "The 'output' file entry is missing");
   }
   _manifest_filename = parser_bits::substitute_env_vars(_manifest_filename);
@@ -373,7 +374,7 @@ 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, "");
   }
 
@@ -481,7 +482,7 @@ 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(),
+    non_continuable_error(class_name(), build_file.name(),
         "Could not find the build configuration; is FEISTY_MEOW_DIR set?");
   }
   byte_array full_config;
@@ -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>