moved feisty inits and examples etc

some cleanups for location of the examples collection and also for the feisty_inits.

diff --git a/documentation/history_anat.txt b/documentation/history_anat.txt
index 6f727015c9a6578787987552a1e89be8bc891d5e..46f95fc2899d6273267a54503afd459e5596d3c1 100644 (file)
--- a/documentation/history_anat.txt
+++ b/documentation/history_anat.txt
@@ -74,18 +74,22 @@ octopi/
     Octopus design pattern and CROMP protocol reference implementations.  Assorted applications
     based on these.
 
-infabase/
+infobase/
     Some files considered critical to the operations of Feisty Meow Concerns Ltd.  This includes
     the database of fortunes used by the Nechung Oracle Program.
 
-documentation/
-    Helpful guides and information for Feisty Meow.  Also includes a code documentation generator
-    configuration for feisty meow that produces a nice set of web docs, using doxygen.
+infobase/feisty_inits
+    Some example startup files for use with feisty meow.  These are deployed automatically by
+    the "connect_feisty_meow" command.
 
-examples/
+infobase/examples/
     Some files that show how to get work done with Feisty Meow or that show how to do certain
     tasks in different scripting / programming languages.
 
+documentation/
+    Helpful guides and information for Feisty Meow.  Also includes a code documentation generator
+    configuration for feisty meow that produces a nice set of web docs, using doxygen.
+
 kona/
     Our burgeoning Java libraries.  Not much to see here yet, but there is some code piling
     up for these that we will try to release soon.

diff --git a/feisty_inits/dot.bashrc-normal-user b/feisty_inits/dot.bashrc-normal-user
deleted file mode 100644 (file)
index edc83b7..0000000
--- a/feisty_inits/dot.bashrc-normal-user
+++ /dev/null
@@ -1,39 +0,0 @@
-
-##############
-
-# initializes the feisty meow environment for "normal" users (not intended for the root user).
-
-##############
-
-# drag in the default version of this file.  this may not be needed if your
-# .bashrc script already has substantial code or already does this.
-source /etc/bash.bashrc
-
-##############
-
-# set the history sizes to be much larger, and do this whether we load the
-# feisty meow environment or not.
-
-export HISTSIZE=1000000
-export HISTFILESIZE=8000000
-
-##############
-
-# system-wide install:
-export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
-# personal install:
-#export FEISTY_MEOW_APEX="$HOME/feisty_meow"
-
-# sets up the feisty_meow scripts if appropriate for the environment.
-if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then
-  source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
-fi
-
-# if not commented out, then feisty meow will run all the unit tests during builds.
-#export RUN_ALL_TESTS=true
-
-# turns on noisy debugging in feisty meow scripts if uncommented.
-#export DEBUG_FEISTY_MEOW=true
-
-##############
-

diff --git a/feisty_inits/dot.bashrc-root b/feisty_inits/dot.bashrc-root
deleted file mode 100644 (file)
index 20a9023..0000000
--- a/feisty_inits/dot.bashrc-root
+++ /dev/null
@@ -1,37 +0,0 @@
-
-##############
-
-# provides a macro to initialize the feisty meow environment for the "root" user.
-
-##############
-
-# drag in the default version of this file.  this may not be needed if your
-# .bashrc script already has substantial code or already does this.
-source /etc/bash.bashrc
-
-##############
-
-# set the history sizes to be much larger, and do this whether we load the
-# feisty meow environment or not.
-
-export HISTSIZE=1000000
-export HISTFILESIZE=8000000
-
-##############
-
-# system-wide install:
-export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
-# personal install:
-#export FEISTY_MEOW_APEX="$HOME/feisty_meow"
-
-# the "fredme" macro enables the feisty_meow environment.
-alias fredme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
-
-# if not commented out, then feisty meow will run all the unit tests during builds.
-#export RUN_ALL_TESTS=true
-
-# turns on noisy debugging in feisty meow scripts if uncommented.
-#export DEBUG_FEISTY_MEOW=true
-
-##############
-

diff --git a/infobase/feisty_inits/dot.bashrc-normal-user b/infobase/feisty_inits/dot.bashrc-normal-user
new file mode 100644 (file)
index 0000000..edc83b7
--- /dev/null
+++ b/infobase/feisty_inits/dot.bashrc-normal-user
@@ -0,0 +1,39 @@
+
+##############
+
+# initializes the feisty meow environment for "normal" users (not intended for the root user).
+
+##############
+
+# drag in the default version of this file.  this may not be needed if your
+# .bashrc script already has substantial code or already does this.
+source /etc/bash.bashrc
+
+##############
+
+# set the history sizes to be much larger, and do this whether we load the
+# feisty meow environment or not.
+
+export HISTSIZE=1000000
+export HISTFILESIZE=8000000
+
+##############
+
+# system-wide install:
+export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
+# personal install:
+#export FEISTY_MEOW_APEX="$HOME/feisty_meow"
+
+# sets up the feisty_meow scripts if appropriate for the environment.
+if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then
+  source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
+fi
+
+# if not commented out, then feisty meow will run all the unit tests during builds.
+#export RUN_ALL_TESTS=true
+
+# turns on noisy debugging in feisty meow scripts if uncommented.
+#export DEBUG_FEISTY_MEOW=true
+
+##############
+

diff --git a/infobase/feisty_inits/dot.bashrc-root b/infobase/feisty_inits/dot.bashrc-root
new file mode 100644 (file)
index 0000000..20a9023
--- /dev/null
+++ b/infobase/feisty_inits/dot.bashrc-root
@@ -0,0 +1,37 @@
+
+##############
+
+# provides a macro to initialize the feisty meow environment for the "root" user.
+
+##############
+
+# drag in the default version of this file.  this may not be needed if your
+# .bashrc script already has substantial code or already does this.
+source /etc/bash.bashrc
+
+##############
+
+# set the history sizes to be much larger, and do this whether we load the
+# feisty meow environment or not.
+
+export HISTSIZE=1000000
+export HISTFILESIZE=8000000
+
+##############
+
+# system-wide install:
+export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
+# personal install:
+#export FEISTY_MEOW_APEX="$HOME/feisty_meow"
+
+# the "fredme" macro enables the feisty_meow environment.
+alias fredme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
+
+# if not commented out, then feisty meow will run all the unit tests during builds.
+#export RUN_ALL_TESTS=true
+
+# turns on noisy debugging in feisty meow scripts if uncommented.
+#export DEBUG_FEISTY_MEOW=true
+
+##############
+

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 e12d8425c1da8bd05b3bf3d3bae9a7d1fb771afa..017b534b12a73a909890709d04bd4fceb74b17aa 100644 (file)
--- a/production/setup_src/whole_build_package/whole_build_manifest.txt
+++ b/production/setup_src/whole_build_package/whole_build_manifest.txt
@@ -8,9 +8,7 @@ production_inis=t
 docs=t
 top_makefile=t
 production_makefile=t
-##customize=t
-database=t
-examples=t
+infobase=t
 scripts=t
 nucleus=t
 octopi=t
@@ -70,7 +68,7 @@ keyword=sources
 #recurse=1
 #keyword=sources
 
-[database]
+[infobase]
 source=$FEISTY_MEOW_APEX/infobase
 target=$TARGET/infobase
 recurse=1
@@ -82,12 +80,6 @@ target=$TARGET/documentation
 recurse=1
 keyword=sources
 
-[examples]
-source=$FEISTY_MEOW_APEX/examples
-target=$TARGET/examples
-recurse=1
-keyword=sources
-
 [scripts]
 source=$FEISTY_MEOW_APEX/scripts
 target=$TARGET/scripts

diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl
index d79a73f5f9187e768b243e6be6f2bac0b98f555c..c695be7371d98820e388d3cb67bc24da5fb6fa3b 100644 (file)
--- a/scripts/archival/snarf_feisty_meow.pl
+++ b/scripts/archival/snarf_feisty_meow.pl
@@ -42,9 +42,7 @@ local($root) = &canonicalize("$FEISTY_MEOW_APEX");
 ###moved &backup_hierarchy($snarf_file_base, $number, $root, "customize");
 &backup_hierarchy($snarf_file_base, $number, $root, "infobase");
 &backup_hierarchy($snarf_file_base, $number, $root, "documentation");
-&backup_hierarchy($snarf_file_base, $number, $root, "examples");
 &backup_hierarchy($snarf_file_base, $number, $root, "experiments");
-&backup_hierarchy($snarf_file_base, $number, $root, "feisty_inits");
 &backup_hierarchy($snarf_file_base, $number, $root, "graphiq");
 &backup_hierarchy($snarf_file_base, $number, $root, "huffware");
 &backup_hierarchy($snarf_file_base, $number, $root, "kona");

diff --git a/scripts/core/connect_feisty_meow.sh b/scripts/core/connect_feisty_meow.sh
index 25db1171ce13d1c63e9fe65718d0a19c77441277..9a5c81d548bb3b98b6b22e36a3009641f6cdb868 100644 (file)
--- a/scripts/core/connect_feisty_meow.sh
+++ b/scripts/core/connect_feisty_meow.sh
@@ -17,7 +17,7 @@ if [ -f "$HOME/.bashrc" ] && grep -q "launch_feisty_meow.sh" "$HOME/.bashrc"; th
 else
   # stuff the normal user init file into .bashrc.  not appropriate for root probably, but
   # this is the easy quick start script for normal folks.
-  cat $FEISTY_MEOW_APEX/feisty_inits/dot.bashrc-normal-user |
+  cat $FEISTY_MEOW_APEX/infobase/feisty_inits/dot.bashrc-normal-user |
     sed -e \
       "s?FEISTY_MEOW_APEX=\".*\"?FEISTY_MEOW_APEX=\"$FEISTY_MEOW_APEX\"?" \
       >> "$HOME/.bashrc"

diff --git a/scripts/core/reconfigure_feisty_meow.sh b/scripts/core/reconfigure_feisty_meow.sh
index dad26d1477cbdd79d404d90ca38673bd1de55e68..bcf187acd89bdde42fbc38460a27b7cacee590e1 100644 (file)
--- a/scripts/core/reconfigure_feisty_meow.sh
+++ b/scripts/core/reconfigure_feisty_meow.sh
@@ -7,7 +7,7 @@
 #
 # Note: this does not yet ensure that the profile is executed on shell
 # startup.  that can be added manually by editing your .bashrc file.
-# read the examples/feisty_meow_startup/bashrc_user file for more details.
+# read the files infobase/feisty_inits for more details.
 
 ORIGINATING_FOLDER="$( \cd "$(\dirname "$0")" && /bin/pwd )"
 CORE_SCRIPTS_DIR="$(echo "$ORIGINATING_FOLDER" | tr '\\\\' '/' )"