From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 11 Sep 2012 19:50:19 +0000 (-0400)
Subject: turned off logging again, fixed inclusion list.
X-Git-Tag: 2.140.90~1238
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=2294405182840f27251aeba92685f069d8500bc3;p=feisty_meow.git

turned off logging again, fixed inclusion list.
---

diff --git a/nucleus/applications/bundler/bundle_creator.cpp b/nucleus/applications/bundler/bundle_creator.cpp
index 8212edc3..a7855255 100644
--- 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 5cf1f887..545638e8 100644
--- 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 a52bbd2f..c2f3327c 100644
--- 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 c4938ccf..9b8f37ac 100644
--- 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