X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Ftools%2Fclam_tools%2Fwrite_build_config.cpp;h=6713ed637077cd82b0a1745f55dd1bc94dcd5ca0;hb=0d8e705a6a2a756c52cf8ad1d9c4d2b77d182d8b;hp=42914ebe6848fb84c24a9b599da778211852dc9c;hpb=b70fe636fde2c1eb990ac07cf5e1e1a2189cfffb;p=feisty_meow.git

diff --git a/nucleus/tools/clam_tools/write_build_config.cpp b/nucleus/tools/clam_tools/write_build_config.cpp
index 42914ebe..6713ed63 100644
--- a/nucleus/tools/clam_tools/write_build_config.cpp
+++ b/nucleus/tools/clam_tools/write_build_config.cpp
@@ -166,7 +166,7 @@ outcome write_build_config::output_decorated_macro(const astring &symbol_in,
 outcome write_build_config::output_definition_macro
     (const astring &embedded_value, astring &accumulator)
 {
-//  FUNCDEF("output_definition_macro");
+  FUNCDEF("output_definition_macro");
 //LOG(astring("into output def with: ") + embedded_value);
   variable_tokenizer t;
   t.parse(embedded_value);
@@ -206,12 +206,15 @@ if (read < 1) LOG("why is existing header contentless?");
   if (write_header) {
     // we actually want to blast out a new file.
     byte_filer build_header(filename, "wb");
-    if (!build_header.good())
-      non_continuable_error(static_class_name(), func, astring("failed to create "
-          "build header file in ") + build_header.filename());
-    build_header.write(new_contents);
-    LOG(astring(static_class_name()) + ": wrote config to "
-        + build_header.filename());
+    if (!build_header.good()) {
+      continuable_error(static_class_name(), func, astring("could not create "
+          "build header file in ") + build_header.name());
+      return false;
+    } else {
+      build_header.write(new_contents);
+      LOG(astring(static_class_name()) + ": wrote config to "
+          + build_header.name());
+    }
   } else {
     // nothing has changed.
 //    LOG(astring(static_class_name()) + ": config already up to date in "
@@ -226,7 +229,7 @@ int write_build_config::execute()
   SETUP_CONSOLE_LOGGER;  // override the file_logger from app_shell.
 
   // find our build ini file.
-  astring repodir = environment::get("REPOSITORY_DIR");
+  astring repodir = environment::get("FEISTY_MEOW_APEX");
 
   // the below code should never be needed for a properly configured build.
 #ifdef __WIN32__
@@ -245,8 +248,10 @@ int write_build_config::execute()
   // find our storage area for the build headers.  we know a couple build
   // configurations by now, but this should really be coming out of a config
   // file instead.
-  astring library_directory = repodir + "/nucleus/library";
-  if (!filename(library_directory).good()) {
+  astring versions_directory = environment::get("FEISTY_MEOW_GENERATED_STORE");
+  // we keep our version files one level below the top of the generated store.
+  versions_directory += "/versions";
+  if (!filename(versions_directory).good()) {
     non_continuable_error(static_class_name(), func,
         astring("failed to locate the library folder storing the generated files."));
   }
@@ -254,16 +259,14 @@ int write_build_config::execute()
   // these are very specific paths, but they really are where we expect to
   // see the headers.
 
-  astring cfg_header_filename = library_directory + "/"
-      "__build_configuration.h";
-  astring ver_header_filename = library_directory + "/"
-      "__build_version.h";
+  astring cfg_header_filename = versions_directory + "/__build_configuration.h";
+  astring ver_header_filename = versions_directory + "/__build_version.h";
 
   // open the ini file for reading.
   byte_filer ini(fname, "r");
   if (!ini.good())
     non_continuable_error(static_class_name(), func, astring("failed to open "
-        "build configuration file for reading at ") + ini.filename());
+        "build configuration file for reading at ") + ini.name());
 //hmmm: parameterize the build ini thing above!
 
   // now we build strings that represents the output files we want to create.
@@ -289,7 +292,7 @@ int write_build_config::execute()
   astring buffer;
   while (!ini.eof()) {
     int chars = ini.getline(buffer, MAX_LINE_SIZE);
-    if (!chars) continue;  // hmmm.
+    if (!chars) continue;  // hmmm: what does no chars mean?
     
     variable_tokenizer t;
     t.parse(buffer);
@@ -389,9 +392,11 @@ HOOPLE_MAIN(write_build_config, )
   // 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>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>