turned off logging again, fixed inclusion list.

diff --git a/nucleus/applications/bundler/bundle_creator.cpp b/nucleus/applications/bundler/bundle_creator.cpp
index 8212edc32e63b10d0063fc69d67542f29bd0d7b6..a7855255ced85bf3e3ddd0ea8796cf972ce3f924 100644 (file)
--- a/nucleus/applications/bundler/bundle_creator.cpp
+++ b/nucleus/applications/bundler/bundle_creator.cpp
@@ -471,10 +471,10 @@ int bundle_creator::read_manifest()
       astring new_value = parser_bits::substitute_env_vars(_manifest_list[i]._parms);
       environment::set(_manifest_list[i]._payload, new_value);
           
-//#ifdef DEBUG_BUNDLER
+#ifdef DEBUG_BUNDLER
       BASE_LOG(astring("** variable ") + _manifest_list[i]._payload + " should have value=" + new_value);
       BASE_LOG(astring("** variable ") + _manifest_list[i]._payload + " now does have value=" + environment::get(_manifest_list[i]._payload));
-//#endif
+#endif
 
       continue;
     } else if (ini.get(section_name, "assert_defined", value)) {

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 5cf1f88756522e64760a9d4be9158b83c58ecbf6..545638e85c2da718d0cb87ceca8c1b5959072630 100644 (file)
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=6
+revision=42
 build=0
 
 # specifies the remainder of the version record info.

diff --git a/production/setup_src/whole_build_package/makefile b/production/setup_src/whole_build_package/makefile
index a52bbd2ff56c0a279c33b1bcbff05caf05281182..c2f3327c94d49e8be3f37cb0ba0727e96870be94 100644 (file)
--- a/production/setup_src/whole_build_package/makefile
+++ b/production/setup_src/whole_build_package/makefile
@@ -4,13 +4,13 @@ PROJECT = Whole_Build_Pack
 FIRST_TARGETS = create_package
 CLEANUPS = $(PRODUCTION_DIR)/install/whole_build*
 TYPE = hierarchy
-export TARGET=$(TMP)
+export TARGET=/tmp/zz_wholebuild
 
 include cpp/rules.def
 
 create_package:
 ifeq "$(NO_BUILD_PACK)" ""
-       $(HIDE)-mkdir $(TARGET)/waste
+       $(HIDE)-mkdir -p $(TARGET)/waste
        $(HIDESH)create_whole_build_pack.sh "$(major).$(minor).$(revision).$(build)"
 endif
 

diff --git a/production/setup_src/whole_build_package/whole_build_manifest.txt b/production/setup_src/whole_build_package/whole_build_manifest.txt
index c4938ccf3a08b28e45cc6bf12382712d179ff00c..9b8f37acf8e428da5074e6b2acd8748faae8ff1d 100644 (file)
--- a/production/setup_src/whole_build_package/whole_build_manifest.txt
+++ b/production/setup_src/whole_build_package/whole_build_manifest.txt
@@ -78,7 +78,7 @@ recurse=1
 keyword=sources
 
 [docs]
-source=$FEISTY_MEOW_DIR/doc/*
+source=$FEISTY_MEOW_DIR/doc
 target=$TARGET/doc
 recurse=1
 keyword=sources