From 393c5d16bddb0ffef914699d2294ca2204dd16d7 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 11 Sep 2012 02:06:20 -0400 Subject: [PATCH] fix for bundle creator weirdo log file at FS root, finally, i hope. turned off logging in app config again. took code_guide out of feisty meow package since it's HUGE. took unnecessary logging out of bootstrap. --- doc/feisty_meow_dox.config | 2 +- nucleus/applications/bundler/bundle_creator.cpp | 2 +- .../configuration/application_configuration.cpp | 13 ++++++++----- scripts/archival/pack_feisty_meow.sh | 2 +- scripts/generator/bootstrap_build.sh | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/doc/feisty_meow_dox.config b/doc/feisty_meow_dox.config index 246b71e8..53da9b58 100644 --- a/doc/feisty_meow_dox.config +++ b/doc/feisty_meow_dox.config @@ -483,7 +483,7 @@ EXCLUDE_SYMLINKS = NO # against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = "*/3rdparty/*" "*/clam_bin/*" "*/bin/*" "*/binaries/*" "*/install/*" "*/logs/*" "*/objects/*" "*/packages/*" "*/waste/*" +EXCLUDE_PATTERNS = "*/3rdparty/*" "*/bin/*" "*/binaries/*" "*/clam_bin/*" "*/install/*" "*/logs/*" "*/objects/*" "*/packages/*" "*/waste/*" # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see diff --git a/nucleus/applications/bundler/bundle_creator.cpp b/nucleus/applications/bundler/bundle_creator.cpp index 5a6722a9..52affc8f 100644 --- a/nucleus/applications/bundler/bundle_creator.cpp +++ b/nucleus/applications/bundler/bundle_creator.cpp @@ -465,7 +465,7 @@ int bundle_creator::read_manifest() BASE_LOG(astring("will set ") + _manifest_list[i]._payload + " = " + _manifest_list[i]._parms); astring new_value = parser_bits::substitute_env_vars(_manifest_list[i]._parms); - environment::set(_manifest_list[i]._payload, new_value); +///why oh why are we allowing them to overwrite our actual environment just because they're bundling something? environment::set(_manifest_list[i]._payload, new_value); #ifdef DEBUG_BUNDLER BASE_LOG(astring("** variable ") + _manifest_list[i]._payload + " should have value=" + new_value); diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp index 9302c0b8..9502a3a8 100644 --- a/nucleus/library/configuration/application_configuration.cpp +++ b/nucleus/library/configuration/application_configuration.cpp @@ -101,9 +101,9 @@ astring application_configuration::get_cmdline_from_proc() filename testing(__check_once_app_path); if (testing.had_directory()) return __check_once_app_path; // all set. -//hmmm: the below might be better off as a find app in path method, which relies on which. -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. astring temp_filename(environment::TMP() + a_sprintf("/zz_cmdfind.%d", chaos().inclusive(0, 999999999))); @@ -293,13 +293,14 @@ const astring &application_configuration::LOGGING_FOLDER_NAME() { STATIC_STRING( ////////////// -const int MAX_LOG_PATH = 200; +////const int MAX_LOG_PATH = 512; // the maximum length of the entry stored for the log path. astring application_configuration::get_logging_directory() { - // start with the root of our installation. - astring def_log = application_directory(); + // new scheme is to just use the temporary directory, which can vary per user + // and which hopefully is always set to something usable. + astring def_log = environment::TMP(); // add logs directory underneath that. def_log += "/logs"; // add the subdirectory for logs. @@ -309,6 +310,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"); ini_configurator ini(application_configuration_file(), ini_configurator::RETURN_ONLY, ini_configurator::APPLICATION_DIRECTORY); @@ -317,6 +319,7 @@ astring application_configuration::get_logging_directory() // 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()); } // now we make sure the directory exists. diff --git a/scripts/archival/pack_feisty_meow.sh b/scripts/archival/pack_feisty_meow.sh index 02bf7ac5..0a7029c0 100644 --- a/scripts/archival/pack_feisty_meow.sh +++ b/scripts/archival/pack_feisty_meow.sh @@ -14,7 +14,7 @@ base_dir="$(basename "$FEISTY_MEOW_DIR")" pushd $parent_dir # zip up feisty meow, but exclude the file names we never want to see. -tar -h -czf $TEMPO_FILE $base_dir $XC"*/*.tar.gz" $XC"*/*.zip" $XC"*/waste/*" $XC"*/logs/*" $XC"*/binaries/*" $XC"*.git*" +tar -h -czf $TEMPO_FILE $base_dir $XC"*/*.tar.gz" $XC"*/*.zip" $XC"*/waste/*" $XC"*/logs/*" $XC"*/binaries/*" $XC"*.git*" $XC"*/code_guide/*" # now move the newest version into its resting place. this prepares the # feisty_meow package for uploading. diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 4f439bd0..c6bb8faa 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -31,9 +31,9 @@ export INCLUDED_FROM_BOOTSTRAP=true # pull in our build variables using the path to this script. export BUILD_SCRIPTS_DIR="$( \cd "$(\dirname "$0")" && \pwd )" -echo build script initial from bootstrap: $BUILD_SCRIPTS_DIR +#echo build scripts dir initial value: $BUILD_SCRIPTS_DIR BUILD_SCRIPTS_DIR="$(echo $BUILD_SCRIPTS_DIR | tr '\\\\' '/' )" -echo build script after: $BUILD_SCRIPTS_DIR +#echo build scripts dir after chewing: $BUILD_SCRIPTS_DIR # load in feisty meow basic scripts, if not already loaded. if [ -z "$FEISTY_MEOW_SCRIPTS_LOADED" ]; then -- 2.34.1