turned off noisy logging, added missing stuff into build pack.
authorChris Koeritz <fred@gruntose.com>
Tue, 11 Sep 2012 19:02:49 +0000 (15:02 -0400)
committerChris Koeritz <fred@gruntose.com>
Tue, 11 Sep 2012 19:02:49 +0000 (15:02 -0400)
nucleus/library/configuration/application_configuration.cpp
production/setup_src/whole_build_package/makefile
production/setup_src/whole_build_package/whole_build_manifest.txt

index d4b7aca8d87d8843050b92259e87194e5af7376c..a3a0636a249accd425550b473fc21718004e2807 100644 (file)
@@ -92,7 +92,7 @@ astring application_configuration::get_cmdline_from_proc()
   // command line are all separated by zero characters.
   __check_once_app_path = filebuff;
   delete [] filebuff;
-printf("got an app name before chewing: %s\n", __check_once_app_path.s());
+//printf("got an app name before chewing: %s\n", __check_once_app_path.s());
   // clean out quote characters from the name.
   for (int i = __check_once_app_path.length() - 1; i >= 0; i--) {
     if (__check_once_app_path[i] == '"') __check_once_app_path.zap(i, i);
@@ -102,7 +102,7 @@ printf("got an app name before chewing: %s\n", __check_once_app_path.s());
   filename testing(__check_once_app_path);
   if (testing.had_directory()) return __check_once_app_path;  // all set.
 
-printf("no dir part found, app name after chewing: %s\n", __check_once_app_path.s());
+//printf("no dir part found, app name after chewing: %s\n", __check_once_app_path.s());
 
 //hmmm: the below might be better off as a find app in path method, which relies on which.
   // there was no directory component, so we'll try to guess one.
@@ -311,7 +311,7 @@ astring application_configuration::get_logging_directory()
     // get the entry for the logging path.
   if (!log_dir) {
     // if the entry was absent, we set it.
-printf("did not find log dir in config file\n");
+//printf("did not find log dir in config file\n");
     ini_configurator ini(application_configuration_file(),
         ini_configurator::RETURN_ONLY,
         ini_configurator::APPLICATION_DIRECTORY);
@@ -320,7 +320,7 @@ printf("did not find log dir in config file\n");
     // they gave us something.  let's replace the environment variables
     // in their string so we resolve paths and such.
     log_dir = parser_bits::substitute_env_vars(log_dir);
-printf("%s", (char *)a_sprintf("got log dir with %s value\n", log_dir.s()).s());
+//printf("%s", (char *)a_sprintf("got log dir with %s value\n", log_dir.s()).s());
   }
 
   // now we make sure the directory exists.
@@ -339,28 +339,6 @@ printf("%s", (char *)a_sprintf("got log dir with %s value\n", log_dir.s()).s());
     }
   }
     
-#if 0
-  struct stat to_fill;
-  int stat_ret = stat(log_dir.observe(), &to_fill);
-  if (stat_ret || !(to_fill.st_mode & S_IFDIR) ) {
-    // if it's not anything yet or if it's not a directory, then we need
-    // to create it.
-
-//if it's something besides a directory... should it be deleted?
-#ifdef __UNIX__
-    int mk_ret = mkdir(log_dir.s(), 0777);
-#endif
-#ifdef __WIN32__
-    int mk_ret = mkdir(log_dir.s());
-#endif
-    if (mk_ret) {
-printf("creating logging directory failed with outcome %d.\n", mk_ret);
-      return "";
-//can't have a log file if we can't make the directory successfully???
-    }
-  }
-#endif
-
   return log_dir;
 }
 
index 834b0209d3f4e078ad44cb500476a527e1986fd2..a52bbd2ff56c0a279c33b1bcbff05caf05281182 100644 (file)
@@ -10,7 +10,7 @@ include cpp/rules.def
 
 create_package:
 ifeq "$(NO_BUILD_PACK)" ""
-       $(HIDE)mkdir $(TARGET)/waste
+       $(HIDE)-mkdir $(TARGET)/waste
        $(HIDESH)create_whole_build_pack.sh "$(major).$(minor).$(revision).$(build)"
 endif
 
index f024a3f9a4ecb02df9d97b1f7970cc59971726eb..c4938ccf3a08b28e45cc6bf12382712d179ff00c 100644 (file)
@@ -4,18 +4,31 @@
 [toc]
 set_temp=t
 set_tmp=t
-top_inis=t
-3rdparty=t
+production_inis=t
 docs=t
-makefile=t
-build=t
-packages=t
-source=t
+top_makefile=t
+production_makefile=t
+customizing=t
+database=t
+examples=t
+scripts=t
+nucleus=t
+octopi=t
+graphiq=t
+kona=t
+huffware=t
+webby=t
 text_files=t
+check_versions=t
+assign_bases=t
+setup_src=t
 
 ; not included in the source pack...
+3rdparty=t
 binaries=t
-fonts=t
+clam_bin=t
+packages=t
+win32_helper=t
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -32,9 +45,9 @@ keyword=sources
 
 ; this section is included in both types of package.
 
-[top_inis]
-source=$FEISTY_MEOW_DIR/*.ini
-target=$TARGET
+[production_inis]
+source=$PRODUCTION_DIR/*.ini
+target=$TARGET/production
 keyword=sources
 
 [text_files]
@@ -42,47 +55,124 @@ source=$FEISTY_MEOW_DIR/*.txt
 target=$TARGET
 keyword=sources
 
+[top_makefile]
+source=$FEISTY_MEOW_DIR/makefile
+target=$TARGET/makefile
+keyword=sources
+
+[production_makefile]
+source=$PRODUCTION_DIR/makefile
+target=$TARGET/production/makefile
+keyword=sources
+
+[customizing]
+source=$FEISTY_MEOW_DIR/customizing
+target=$TARGET/customizing
+recurse=1
+keyword=sources
+
+[database]
+source=$FEISTY_MEOW_DIR/database
+target=$TARGET/database
+recurse=1
+keyword=sources
+
 [docs]
 source=$FEISTY_MEOW_DIR/doc/*
 target=$TARGET/doc
+recurse=1
 keyword=sources
 
-[makefile]
-source=$FEISTY_MEOW_DIR/makefile
-target=$TARGET/makefile
+[examples]
+source=$FEISTY_MEOW_DIR/examples
+target=$TARGET/examples
+recurse=1
+keyword=sources
+
+[scripts]
+source=$FEISTY_MEOW_DIR/scripts
+target=$TARGET/scripts
+recurse=1
 keyword=sources
 
-[build]
-source=$FEISTY_MEOW_DIR/build
-target=$TARGET/build
+[nucleus]
+source=$FEISTY_MEOW_DIR/nucleus
+target=$TARGET/nucleus
 recurse=1
 keyword=sources
 
-[source]
-source=$FEISTY_MEOW_DIR/source
-target=$TARGET/source
+[octopi]
+source=$FEISTY_MEOW_DIR/octopi
+target=$TARGET/octopi
+recurse=1
+keyword=sources
+
+[graphiq]
+source=$FEISTY_MEOW_DIR/graphiq
+target=$TARGET/graphiq
+recurse=1
+keyword=sources
+
+[huffware]
+source=$FEISTY_MEOW_DIR/huffware
+target=$TARGET/huffware
+recurse=1
+keyword=sources
+
+[kona]
+source=$FEISTY_MEOW_DIR/kona
+target=$TARGET/kona
+recurse=1
+keyword=sources
+
+[webby]
+source=$FEISTY_MEOW_DIR/webby
+target=$TARGET/webby
+recurse=1
+keyword=sources
+
+[assign_bases]
+source=$PRODUCTION_DIR/assign_bases
+target=$TARGET/production/assign_bases
+recurse=1
+keyword=sources
+
+[check_versions]
+source=$PRODUCTION_DIR/check_versions
+target=$TARGET/production/check_versions
+recurse=1
+keyword=sources
+
+[setup_src]
+source=$PRODUCTION_DIR/setup_src
+target=$TARGET/production/setup_src
 recurse=1
 keyword=sources
 
 ; this section is only included in the full package (not in sources).
 
 [3rdparty]
-source=$FEISTY_MEOW_DIR/3rdparty
-target=$TARGET/3rdparty
+source=$PRODUCTION_DIR/3rdparty
+target=$TARGET/production/3rdparty
 recurse=1
 
 [binaries]
-source=$FEISTY_MEOW_DIR/binaries
-target=$TARGET/binaries
+source=$PRODUCTION_DIR/binaries
+target=$TARGET/production/binaries
 recurse=1
 
-[fonts]
-source=$FEISTY_MEOW_DIR/fonts
-target=$TARGET/fonts
+[clam_bin]
+source=$PRODUCTION_DIR/clam_bin
+target=$TARGET/production/clam_bin
 recurse=1
 
 [packages]
-source=$FEISTY_MEOW_DIR/packages
-target=$TARGET/packages
+source=$PRODUCTION_DIR/packages
+target=$TARGET/production/packages
+recurse=1
+
+[win32_helper]
+source=$PRODUCTION_DIR/win32_helper
+target=$TARGET/production/win32_helper
 recurse=1