more things converted to filename in value tagger. fixed really out of date directories

[feisty_meow.git] / nucleus / tools / clam_tools / value_tagger.cpp

diff --git a/nucleus/tools/clam_tools/value_tagger.cpp b/nucleus/tools/clam_tools/value_tagger.cpp
index df1724a4521e7b7a8011ef22638e8ecaf301be21..076853a4dbe26c143ae5ef232b29ba6451bc9df3 100644 (file)
--- 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;
@@ -327,17 +327,17 @@ int value_tagger::execute()
 
   log(time_stamp::notarize(true) + "value_tagger started.", basis::ALWAYS_PRINT);
 
-  astring test_repository = environment::get("REPOSITORY_DIR");
+  astring test_repository = environment::get("FEISTY_MEOW_DIR");
   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\
-  REPOSITORY_DIR    This should point at the root of the build tree.\r\n\
+  FEISTY_MEOW_DIR    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 $REPOSITORY_DIR/clam\".\r\n\
+  MAKEFLAGS         This should be set to \"-I $FEISTY_MEOW_DIR/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";
@@ -352,8 +352,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,14 +373,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("REPOSITORY_DIR");
+  astring rdir = environment::get("FEISTY_MEOW_DIR");
   astring fname;
   astring parmfile = environment::get("BUILD_PARAMETER_FILE");
   if (parmfile.t()) fname = parmfile;
@@ -482,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(),
-        "Could not find the build configuration; is REPOSITORY_DIR set?");
+        "Could not find the build configuration; is FEISTY_MEOW_DIR set?");
   }
   byte_array full_config;
   build_file.read(full_config, 100000);  // a good chance to be big enough.