X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Ftools%2Fclam_tools%2Fwrite_build_config.cpp;h=4afed778ac91223bc51ba5b1d1047a20bda871d4;hb=f5c1517187d9ecc10cd914e175380a688509714d;hp=53cfa0a4d43a597961df28f87df95c8c79f8da94;hpb=457b128b77b5b4a0b7dd3094de543de2ce1477ad;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 53cfa0a4..4afed778 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);
@@ -208,10 +208,10 @@ if (read < 1) LOG("why is existing header contentless?");
     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 file in ") + build_header.name());
     build_header.write(new_contents);
     LOG(astring(static_class_name()) + ": wrote config to "
-        + build_header.filename());
+        + build_header.name());
   } else {
     // nothing has changed.
 //    LOG(astring(static_class_name()) + ": config already up to date in "
@@ -226,7 +226,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,19 +245,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 + "/source/lib_src/library";
+  astring library_directory = repodir + "/nucleus/library";
   if (!filename(library_directory).good()) {
-    library_directory = repodir + "/source/core/library";
-    if (!filename(library_directory).good()) {
-      library_directory = repodir + "/libraries/library";
-      if (!filename(library_directory).good()) {
-        library_directory = repodir + "/../../libraries/library";
-        if (!filename(library_directory).good()) {
-          non_continuable_error(static_class_name(), func,
-              astring("failed to locate the library folder storing the generated files."));
-        }
-      }
-    }
+    non_continuable_error(static_class_name(), func,
+        astring("failed to locate the library folder storing the generated files."));
   }
 
   // these are very specific paths, but they really are where we expect to
@@ -272,7 +263,7 @@ int write_build_config::execute()
   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.
@@ -298,7 +289,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);
@@ -398,9 +389,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>