Merge branch 'release-2.140.103'

bringing in updated docs and much improved version files approach in c++

diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat
index 1f462d80b874fe56a077245b02073bdd8f2508a6..32f238a0d6e647be2608f36af39af467a2fef668 100644 (file)
--- a/infobase/fortunes.dat
+++ b/infobase/fortunes.dat
@@ -43025,4 +43025,29 @@ you see he gets so high,
 mind expanded to sky;
 real world grokking just not ready.
   -- fred t. hamster
+~
+    Generally speaking, when we are too desirous of something in life, we’re
+less likely to attain it.  Success seems to increase in direct proportion to
+the diminution of our desires.  The same logic applies to our need for
+recognition.  We might want to be appreciated and respected, but we have only
+a limited ability to influence how other people respond and we can’t make
+somebody show us gratitude any more than we can force someone to love us.  If
+we show love without expecting it to be reciprocated, we will have more chance
+of finding love than if we simply yearn for it.  Likewise, doing something
+without expecting gratitude is more likely to elicit appreciation for what we
+do.  Whether someone can acknowledge our actions or not should be no concern
+of ours.
+    We simply commit ourselves to doing things to the best of our ability and
+in as thorough a manner as possible without sloppiness.  We should never think
+that other people are indebted to us or obligated to help us in return.  We
+should simply do things because we love doing them, not because we want other
+people to feel indebted to us.  Shantideva says:
+
+        The work of bringing benefit to beings
+        Will not, then, make me proud and self-admiring.
+        The happiness of others is itself my satisfaction;
+        I do not expect another recompense.
+
+  -- Traleg Kyabgon, from "The Practice of Lojong: Cultivating Compassion
+     through Training the Mind", published by Shambhala Publications
 

diff --git a/nucleus/library/versions/version_ini.cpp b/nucleus/library/versions/version_ini.cpp
index 6a5519e14e1c73fd0666f5b936cbee5ef51a8b9c..e9fc8b23afb5a02e22aa770f348bf291c03d1dcc 100644 (file)
--- a/nucleus/library/versions/version_ini.cpp
+++ b/nucleus/library/versions/version_ini.cpp
@@ -269,8 +269,9 @@ END\n\
 #define REPLACE(tag, replacement) \
   new_version_entry.replace_all(tag, replacement); \
 
-bool version_ini::write_rc(const version_record &to_write)
+bool version_ini::write_rc(const astring &header_store, const version_record &to_write)
 {
+  FUNCDEF("write_rc");
   astring new_version_entry(version_rc_template);
 
   // $file_ver -> w, x, y, z for version of the file.
@@ -320,7 +321,7 @@ bool version_ini::write_rc(const version_record &to_write)
   astring root_part = "/";
   root_part += _ini->load(VERSION_SECTION, ROOT, "");
 
-  astring rc_filename(astring(_path_name->dirname()) + root_part
+  astring rc_filename(header_store + "/" + root_part
       + "_version.rc");
 
   filename(rc_filename).chmod(filename::ALLOW_BOTH, filename::USER_RIGHTS);
@@ -374,8 +375,9 @@ const astring version_header_template = "\
 
 //////////////
 
-bool version_ini::write_code(const version_record &to_write)
+bool version_ini::write_code(const astring &header_store, const version_record &to_write)
 {
+  FUNCDEF("write_code");
   astring root_part = _ini->load(VERSION_SECTION, ROOT, "");
   astring root = root_part.upper();  // make upper case for naming sake.
   astring name = _ini->load(VERSION_SECTION, NAME, "");
@@ -409,7 +411,7 @@ bool version_ini::write_code(const version_record &to_write)
   // $web_address -> the web site for the company.  not actually stored.
   REPLACE("$web_address", to_write.web_address);
 
-  astring header_filename(_path_name->dirname().raw() + "/" + root_part
+  astring header_filename(header_store + "/" + root_part
       + astring("_version.h"));
 
   filename(header_filename).chmod(filename::ALLOW_BOTH, filename::USER_RIGHTS);
@@ -447,12 +449,16 @@ bool replace_version_entry(astring &full_string, const astring &look_for,
   return to_return;
 }
 
-bool version_ini::write_assembly(const version_record &to_write,
+bool version_ini::write_assembly(const astring &header_store, const version_record &to_write,
     bool do_logging)
 {
   FUNCDEF("write_assembly");
-  filename just_dir = _path_name->dirname();
-//LOG(astring("dir is set to: ") + just_dir);
+  filename just_dir = filename(header_store);
+         //_path_name->dirname();
+
+//hmmm: make condit on debug
+LOG(astring("dir is set to: ") + just_dir);
+
   directory dir(just_dir);
   filename to_patch;
 //LOG(astring("dir has: ") + dir.files().text_form());
@@ -530,8 +536,9 @@ bool version_ini::write_assembly(const version_record &to_write,
 }
 
 bool version_ini::one_stop_version_stamp(const astring &path,
-    const astring &source_version, bool do_logging)
+    const astring &header_store, const astring &source_version, bool do_logging)
 {
+  FUNCDEF("one_stop_version_stamp");
   astring path_name = path;
   if (path_name.equal_to("."))
     path_name = application_configuration::current_directory();
@@ -569,24 +576,26 @@ bool version_ini::one_stop_version_stamp(const astring &path,
   version_ini verini(path_name);
   verini.set_record(source.get_record(), false);
 
-//  LOG(a_sprintf("The file \"%s\" contains this version information:",
-//      path_name.s()));
-//  LOG(verini.get_record().text_form());
+//put this in debug brackets
+  LOG(a_sprintf("The file \"%s\" contains this version information:",
+      path_name.s()));
+  LOG(verini.get_record().text_form());
+//...debug to here
 
-  if (!verini.write_rc(verini.get_record())) {
+  if (!verini.write_rc(header_store, verini.get_record())) {
     critical_events::alert_message(a_sprintf("Could not write the RC file in \"%s\".",
         filename(path_name).basename().raw().s()));
     return false;
   }
 
-  if (verini.library() && !verini.write_code(verini.get_record())) {
+  if (verini.library() && !verini.write_code(header_store, verini.get_record())) {
     critical_events::alert_message(astring("Could not write the C++ header file for "
         "the directory \"")
         + filename(path_name).basename() + astring("\".\n"));
     return false;
   }
 
-  if (!verini.write_assembly(verini.get_record(), do_logging)) {
+  if (!verini.write_assembly(header_store, verini.get_record(), do_logging)) {
     critical_events::alert_message(astring("Could not write the Assembly info file for "
         "the directory \"")
         + filename(path_name).basename() + astring("\".\n"));

diff --git a/nucleus/library/versions/version_ini.h b/nucleus/library/versions/version_ini.h
index 6838adee20a151e072d7099b3eccb857c60f374c..0fe559d20762165a7ed852b067b0c5238d659ca3 100644 (file)
--- a/nucleus/library/versions/version_ini.h
+++ b/nucleus/library/versions/version_ini.h
@@ -80,18 +80,18 @@ public:
   bool ole_auto_registering();
     //!< returns true if this version file specifies ole auto registration.
 
-  bool write_rc(const structures::version_record &to_write);
+  bool write_rc(const basis::astring &header_store, const structures::version_record &to_write);
     //!< writes out the file 'X_version.rc' for the X library or application.
     /*!< the contents will include the information specified in "to_write",
     where X is the library name from that record. */
 
-  bool write_code(const structures::version_record &to_write);
+  bool write_code(const basis::astring &header_store, const structures::version_record &to_write);
     //!< writes out the header ('X_version.h') with the version information.
     /*!< this file is needed for other libraries or application to know this
     project's version number.  the users can make sure that the header info
     agrees with the actual version seen on the file. */
 
-  bool write_assembly(const structures::version_record &to_write, bool do_logging);
+  bool write_assembly(const basis::astring &header_store, const structures::version_record &to_write, bool do_logging);
     //!< fixes any assemblies with the info in "to_write".
 
   static bool executable(const basis::astring &path_name);
@@ -103,9 +103,11 @@ public:
     //!< specialized version ignores cache and gets version directly from file.
 
   static bool one_stop_version_stamp(const basis::astring &path,
-          const basis::astring &source_version, bool do_logging);
+          const basis::astring &header_store, const basis::astring &source_version,
+          bool do_logging);
     //!< performs version stamping using the ini file in "path".
-    /*!< "source_version" supplies the name of the main version file where
+    /*!< the created version files will be written to the "header_store".
+    "source_version" supplies the name of the main version file where
     we retrieve the current version numbers.  if that is not specified, then
     only the version header and RC file are created.  if "do_logging" is
     true, then version info will be sent to the program-wide logger. */

diff --git a/nucleus/tools/clam_tools/version_stamper.cpp b/nucleus/tools/clam_tools/version_stamper.cpp
index ea90cd41822b2291551384c88783548ea92d5eb1..3313906d82f90b50343b49cfa44413f470ab49a0 100644 (file)
--- a/nucleus/tools/clam_tools/version_stamper.cpp
+++ b/nucleus/tools/clam_tools/version_stamper.cpp
@@ -67,24 +67,27 @@ int version_stamper::execute()
 {
   FUNCDEF("execute");
   SETUP_CONSOLE_LOGGER;  // override the file_logger from app_shell.
-  if (application::_global_argc < 2) {
-    log(astring("The directory where the 'version.ini' file is located\n"
-        "must be specified as the first parameter of this program.  Another\n"
-        "version file may optionally be specified as the second parameter of\n"
-        "the program; the version contained in this file will be used to set\n"
-        "the version of the file specified in the first parameter.\n"
-        "Additionally, if the environment variable 'DEBUG' exists, then the\n"
-        "generated RC file will be marked as a debug build.  Otherwise it is\n"
-        "marked as a release build.  Note that the CLAM system automatically\n"
-        "sets this for you.\n\n"), ALWAYS_PRINT);
+  if (application::_global_argc < 3) {
+    log(astring(
+"The directory where the 'version.ini' file is located must be specified as the\n"
+"first parameter of this program.  The second parameter must provide the\n"
+"storage location where the version header will be written.  Another version\n"
+"file may optionally be specified as the third parameter of the program; the\n"
+"version contained in this file will be used to set the version of the file\n"
+"specified in the first parameter.\n"
+"Additionally, if the environment variable 'DEBUG' exists, then the\n"
+"generated RC file will be marked as a debug build.  Otherwise it is\n"
+"marked as a release build.  Note that the CLAM system automatically\n"
+"sets this for you.\n\n"), ALWAYS_PRINT);
     return 1;
   }
 
   astring path_name = application::_global_argv[1];
+  astring storage_name = application::_global_argv[2];
   astring source_version_file;  // blank by default.
-  if (application::_global_argc > 2)
-    source_version_file = application::_global_argv[2];
-  bool ret = version_ini::one_stop_version_stamp(path_name, source_version_file, true);
+  if (application::_global_argc > 3)
+    source_version_file = application::_global_argv[3];
+  bool ret = version_ini::one_stop_version_stamp(path_name, storage_name, source_version_file, true);
   if (!ret) return 1;  // failure.
   return 0;  // success.
 }

diff --git a/nucleus/tools/clam_tools/vsts_version_fixer.cpp b/nucleus/tools/clam_tools/vsts_version_fixer.cpp
index bef8fcbafaf727d3b5f0b215280e4c54f8181722..3beb8779ee2310e125a71ef2eff21a010aa6577e 100644 (file)
--- a/nucleus/tools/clam_tools/vsts_version_fixer.cpp
+++ b/nucleus/tools/clam_tools/vsts_version_fixer.cpp
@@ -219,8 +219,13 @@ bool stamping_spider(const directory &current)
     if (current_file.ends("version.ini")
         && !current_file.iequals("core_version.ini") ) {
 //LOG(astring("found ver file: ") + current.path() + "/" + current_file);
+//
+      astring versions_directory = environment::get("FEISTY_MEOW_GENERATED_STORE");
+     // we keep our version files one level below the top of the generated store.
+      versions_directory += "/versions";
+
       version_ini::one_stop_version_stamp(current.path() + "/" + current_file,
-          global_build_ini, true);
+          versions_directory, global_build_ini, true);
     }
   }
   return true;

diff --git a/nucleus/tools/clam_tools/write_build_config.cpp b/nucleus/tools/clam_tools/write_build_config.cpp
index 4afed778ac91223bc51ba5b1d1047a20bda871d4..6eb06ad2ef3015e79806e98348a065e1eda09a0b 100644 (file)
--- a/nucleus/tools/clam_tools/write_build_config.cpp
+++ b/nucleus/tools/clam_tools/write_build_config.cpp
@@ -206,12 +206,15 @@ if (read < 1) LOG("why is existing header contentless?");
   if (write_header) {
     // we actually want to blast out a new file.
     byte_filer build_header(filename, "wb");
-    if (!build_header.good())
-      non_continuable_error(static_class_name(), func, astring("failed to create "
+    if (!build_header.good()) {
+      continuable_error(static_class_name(), func, astring("could not create "
           "build header file in ") + build_header.name());
-    build_header.write(new_contents);
-    LOG(astring(static_class_name()) + ": wrote config to "
-        + build_header.name());
+      return false;
+    } else {
+      build_header.write(new_contents);
+      LOG(astring(static_class_name()) + ": wrote config to "
+          + build_header.name());
+    }
   } else {
     // nothing has changed.
 //    LOG(astring(static_class_name()) + ": config already up to date in "
@@ -245,8 +248,10 @@ int write_build_config::execute()
   // find our storage area for the build headers.  we know a couple build
   // configurations by now, but this should really be coming out of a config
   // file instead.
-  astring library_directory = repodir + "/nucleus/library";
-  if (!filename(library_directory).good()) {
+  astring versions_directory = environment::get("FEISTY_MEOW_GENERATED_STORE");
+  // we keep our version files one level below the top of the generated store.
+  versions_directory += "/versions";
+  if (!filename(versions_directory).good()) {
     non_continuable_error(static_class_name(), func,
         astring("failed to locate the library folder storing the generated files."));
   }
@@ -254,10 +259,8 @@ int write_build_config::execute()
   // these are very specific paths, but they really are where we expect to
   // see the headers.
 
-  astring cfg_header_filename = library_directory + "/"
-      "__build_configuration.h";
-  astring ver_header_filename = library_directory + "/"
-      "__build_version.h";
+  astring cfg_header_filename = versions_directory + "/__build_configuration.h";
+  astring ver_header_filename = versions_directory + "/__build_version.h";
 
   // open the ini file for reading.
   byte_filer ini(fname, "r");
@@ -380,6 +383,17 @@ int write_build_config::execute()
     LOG(astring("failed writing output file ") + ver_header_filename);
   }
 
+//NO, not any more  // now make a copy into the library folder, for when we release a production version.
+//  astring library_directory = repodir + "/nucleus/library";
+//  astring cfg_header_copy = library_directory + "/__build_configuration.h";
+//  astring ver_header_copy = library_directory + "/__build_version.h";
+//  if (!write_output_file(cfg_header_copy, cfg_accumulator)) {
+//    LOG(astring("skipping copy due to read-only issue on output file: ") + cfg_header_copy);
+//  }
+//  if (!write_output_file(ver_header_copy, ver_accumulator)) {
+//    LOG(astring("skipping copy due to read-only issue on output file: ") + ver_header_copy);
+//  }
+
   return 0;
 }
 

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index e11b6d7ad89897ba76afb90265bdc1be559811bd..19a79a96da39d090ac058d681f0fd62cb61bb6d1 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=102
+revision=103
 build=420
 
 # specifies the remainder of the version record info.

diff --git a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html
index 561e734a85f5a25492c222400b088e7ff33b12c8..8473cc2799fd86943d97cad10b3afff64b59795d 100644 (file)
--- a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html
+++ b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html
@@ -7,21 +7,28 @@
   <body>
     <h1 style="text-align: center;">The cakelampvm VM:<br>
       Configuration and Usage</h1>
-    <h2 style=" text-align: center;">By Chris Koeritz</h2>
+    <h2 style="   text-align: center;">By Chris Koeritz<br>
+      <span style="font-family: Comic Sans MS;">feisty meow® concerns ltd</span></h2>
     <h3 style="   text-align: center;"> Vintage: cakelampvm v002 &nbsp;&nbsp;
-      Updated: 2017-11-16 (rev E)</h3>
+      Updated: 2017-11-20 (rev F)</h3>
     <p>The cakelampvm project provides a Virtualbox VM that acts as an "internet
-      in a bottle".&nbsp; The virtual machine provides DNS services (<a title="dns server"
-        href="http://www.bind9.net/">bind9</a>), a Web server (<a title="patchy"
-        href="https://httpd.apache.org/">Apache2</a>), a full <a title="ubuntu means compassion and humanity"
-        href="https://www.ubuntu.com/">Ubuntu</a> <a title="it's pronounced leenoox"
-        href="https://www.linuxfoundation.org/">Linux</a> desktop environment,
-      the <a title="flux is change" href="http://fluxbox.org/">Fluxbox</a> <a
-        title="a better windows" href="https://www.x.org/">X window manager</a>,
-      and a suite of tools called the <a title="feisty meow® concerns ltd. website"
-        href="https://feistymeow.org/">Feisty Meow® codebase</a> .&nbsp;
-      Together, these services provide you with a very flexible and powerful
-      testbed for web development, especially suited for <a title="it's cake" href="https://cakephp.org/">CakePHP</a>.</p>
+      in a bottle", serving up your web sites securely and only to your local
+      host.&nbsp; The virtual machine provides DNS services (<a target="_blank"
+        title="dns server" href="http://www.bind9.net/">bind9</a>), a Web server
+      (<a target="_blank" title="patchy" href="https://httpd.apache.org/">Apache2</a>),
+      a full <a target="_blank" title="ubuntu means compassion and humanity" href="https://www.ubuntu.com/">Ubuntu</a>
+      <a target="_blank" title="it's pronounced leenoox" href="https://www.linuxfoundation.org/">Linux</a>
+      desktop environment, the <a target="_blank" title="flux is change" href="http://fluxbox.org/">Fluxbox</a>
+      <a target="_blank" title="x11 -- best windowing system" href="https://www.x.org/">X
+        window manager</a>, and a suite of tools called the <a target="_blank"
+        title="feisty meow® concerns ltd. website" href="https://feistymeow.org/">Feisty
+        Meow® codebase</a> .&nbsp; Together, these services provide you with a
+      very flexible and powerful testbed for web development, especially suited
+      for <a target="_blank" title="it's cake" href="https://cakephp.org/">CakePHP</a>.&nbsp;
+      This VM was built with the assistance of and was partially funded by <a target="_blank"
+        title="saco design" href="http://sacodesign.com">Saco Design</a> of <a
+        target="_blank" title="winterport" href="http://www.winterportmaine.gov/">Winterport,
+        Maine</a>.</p>
     <p>Commands preceded by an octothorpe ('#') below are intended to be typed
       into a bash shell running on the cakelampvm virtual machine.&nbsp; The
       bash shell can be obtained either by logging into the VM through ssh or by
@@ -29,52 +36,28 @@
       ssh session more convenient, because copy &amp; paste features work as
       expected.</p>
     <p>Commands preceded by a greater-than symbol ('&gt;') are intended to be
-      run on the Host PC in a Windows command prompt (or in a bash prompt running
-      on the Host PC).</p>
+      run on the Host PC in a Windows command prompt (or in a bash prompt
+      running on the Host PC).</p>
     <h2> Guest VM Configuration<a id="#config" name="#config"></a></h2>
     <ul>
-      <li>Hostname: <a title="the vm's website, when configured properly" href="https://cakelampvm.com/">cakelampvm.com</a></li>
+      <li>Hostname: <a target="_blank" title="the vm's website, when configured properly"
+          href="https://cakelampvm.com/">cakelampvm.com</a></li>
       <li>Local IP Address: 10.28.42.20</li>
       <li>Services Included: DNS (bind9), apache2, fluxbox X windowing system, <a
-          title="not just in the garden" href="https://www.gnome.org/">gnome
+          target="_blank" title="not just in the garden" href="https://www.gnome.org/">gnome
           display manager</a></li>
       <li>Main VM User: developer (password distributed separately)</li>
       <li>Database Access: mysql root account, password: (password distributed
         separately)</li>
     </ul>
-    <h2>Powering up with the Feisty Meow® scripts<a id="#powerup" name="#powerup"></a></h2>
-    The feisty meow scripts are a cohesive bash scripting environment for
-    getting a variety of tasks done.&nbsp; The feisty meow scripts recently
-    incorporated the "avbash" collection from Saco Designs and added those
-    scripts to a new "site_avenger" collection of scripts.&nbsp; The site
-    avenger scripts provide tools for bringing up CakePHP web sites and managing
-    the collection of repositories for those sites.&nbsp; Each website is
-    considered an "application", and the application name itself (e.g.
-    "winterportlibrary") can often provide all the details for "powering up" the
-    site.&nbsp; The feisty meow team has added additional scripts for managing
-    DNS domains and Apache websites that provide the capability to "stand up" an
-    entire website around an application, with an accompanying DNS domain and
-    Apache2 site definition.
-    <p>The site avenger scripts are documented separately within the feisty meow
-      codebase.&nbsp; Consult the <span style="text-decoration: underline;">f</span><a
-        title="quickstart" href="https://feistymeow.org/feisty_meow/readme.txt">eisty
-meow
-        readme</a> file first, as it provides some valuable information on
-      configuring the codebase initially.&nbsp; The site avenger script commands
-      are documented in the <a title="useful commands" href="https://feistymeow.org/feisty_meow/documentation/feisty_meow_command_reference.txt">feisty
-        meow command reference</a> file.</p>
-    <p>(The feisty meow codebase is already configured for the developer account
-      on the cakelampvm virtual machine.)</p>
     <h2>How to set up virtualbox for your host PC<a id="#virtualbox-setup" name="#virtualbox-setup"></a></h2>
     <ol>
-      <li>Download and install virtualbox:
-        https://www.virtualbox.org/wiki/Downloads</li>
+      <li>Download and install virtualbox: <a target="_blank" href="https://www.virtualbox.org/wiki/Downloads">https://www.virtualbox.org/wiki/Downloads</a></li>
       <li>Install the extension pack for Virtualbox: This provides USB drivers
         and other features.&nbsp; This is installed on Virtualbox itself (on the
         Host PC), not on the guests.</li>
       <ol>
-        <li>Download the extension pack at
-          https://www.virtualbox.org/wiki/Downloads</li>
+        <li>Download the extension pack (also) at <a target="_blank" href="https://www.virtualbox.org/wiki/Downloads">https://www.virtualbox.org/wiki/Downloads</a></li>
         <li>Stop any running Virtualbox VMs.</li>
         <li>Close the Virtualbox control panel.</li>
         <li>Double-click on the downloaded extensions package (in a file
@@ -95,11 +78,13 @@ meow
     <h3>Configure the Host-Only network on Virtualbox<a id="#host-only" name="#host-only"></a></h3>
     <p>Configuring host-only networking for the VM makes the VM completely local
       to your machine.&nbsp; The cakelampvm will not be accessible on the
-      internet or from the LAN, and can only be accessed by your host PC.</p>
+      internet or from the LAN, and can only be accessed by your host PC.&nbsp;
+      This is a key component of security for your VM and your host PC, and is
+      considered a crucial configuration step.</p>
     <p>Note: If the host-only or NAT network exist ahead of time, Virtualbox may
       complain about them even if they have the correct configuration.&nbsp;
-      This can be corrected simply by opening the VM settings and selecting the
-      appropriate network names again.</p>
+      This can be corrected simply by opening the cakelampvm settings and
+      selecting the appropriate network names again.</p>
     <p>To configure the host-only network, follow these steps:</p>
     <ol>
       <li> Go to virtual box "Preferences" (global preferences, not for a
@@ -126,10 +111,11 @@ meow
     <h3>Configure the NAT Network on Virtualbox<a id="#nat-network" name="#nat-network"></a></h3>
     <p>The NAT (Network Address Translation) network allows the VM to get off of
       the machine and onto the internet safely.&nbsp; It will use this interface
-      for any communication off of the host machine.&nbsp; Since the real IP
-      address of the VM is hidden behind the NAT firewall on Virtualbox, this
-      keeps the VM safe from attackers, and hence your machine stays safe as
-      well.</p>
+      for any communication off of the host machine.&nbsp; This is another
+      crucial component for the security of the VM and your host PC.&nbsp; Since
+      the real IP address of the VM is hidden behind the NAT firewall on
+      Virtualbox, this keeps the VM safe from attackers, and hence your machine
+      stays safe as well.</p>
     <p>To set up the NAT network, follow these steps:</p>
     <ol>
       <li> Go to virtual box "Preferences" (global preferences, not for a
@@ -148,47 +134,91 @@ meow
     <h2>Starting up the VM<a id="#start-vm" name="#start-vm"></a></h2>
     <p>Using the Virtualbox interface, you should now be able to start your
       virtual machine.&nbsp; Virtualbox will complain if it detects any
-      remaining configuration problems in the VM, but it should start
-      normally.&nbsp; The Linux boot sequence will show many lines of text,
-      before bringing up a black console window with a login dialog.</p>
+      remaining configuration problems in the VM.&nbsp; The Linux boot sequence
+      will show many lines of text, before bringing up a black console window
+      with a login dialog.</p>
     <p>If Windows complains about the Virtualbox application slamming into its
       firewall, then allow the Virtualbox to get through.&nbsp; Usually, telling
-      Windows that once is enough, but if any odd network access problems result,
-      edit the Windows firewall settings and allow Virtualbox to use both
-      "Public" and "Private" networks.</p>
+      Windows that once is enough, but if any odd network access problems
+      result, edit the Windows firewall settings and allow Virtualbox to use
+      both "Public" and "Private" networks.</p>
     <p>You can log in directly on the VM console with the developer account, but
       it is generally more useful to connect to the cakelampvm over ssh.&nbsp;
       If the networking has been established properly, you should be able to do
       this with:</p>
-    <pre>ssh developer@cakelampvm.com&nbsp; (or equivalent with your ssh client)</pre>
+    <pre># ssh developer@10.28.42.20&nbsp;  # or the equivalent with your ssh client</pre>
     <p>And then provide the password to log in.</p>
-    <p>If a feature called "X forwarding" is enabled in your ssh client, then
-      you can start graphical applications on the VM and display them on your
-      local machine.&nbsp; This works right away on most Linux hosts, but can
-      also work on PCs with X window system installed.&nbsp; The section below
-      describes how to set up Cygwin to run X server, which enable X forwarding
-      to your local display.</p>
-    <p>...{insert that info}...</p>
+    <p>Once the DNS services are set up (discussed in detail below), you will be
+      able to run the much friendlier command:</p>
+    <pre># ssh developer@cakelampvm.com</pre>
     <h2>Updating cakelampvm to the Latest Model<a id="#update-vm" name="#update-vm"></a></h2>
-    <p>The cakelampvm is released with the intention to not be released
-      again.&nbsp; Version 001 was not built with that explicit intention, which
-      then required the release of Version 002.&nbsp; We hope to not need a v003
-      release.</p>
+    <p>The cakelampvm v002 is released with the intention that it not need to be
+      released again.&nbsp; Version 001 was not built with that explicit
+      intention, which then required the release of Version 002.&nbsp; But we
+      hope to not need a v003 release...</p>
     <p>There is an update feature built into the VM that is quite easy to
       use.&nbsp; The updates are driven by the feisty meow script repository in
       conjunction with a local scripted command.&nbsp; To activate the "update
-      process" for your VM, run the following commands (without the initial '#'
-      symbol):</p>
-    <p># rpuffer $FEISTY_MEOW_APEX&nbsp;&nbsp; # updates to the latest version
-      of feisty meow<br>
-      # revamp_cakelampvm&nbsp;&nbsp;&nbsp; # enacts any configuration changes
-      needed, plus fixes web folder and other permissions.</p>
+      process" for your VM, run the following commands on the VM (without the
+      initial '#' symbol):</p>
+    <pre># rpuffer $FEISTY_MEOW_APEX&nbsp;&nbsp; # updates to the latest version of feisty meow
+# revamp_cakelampvm&nbsp;&nbsp;&nbsp;        # enacts any configuration changes needed,<br>                              # plus fixes web folder and other permissions.</pre>
     <p>These two commands can be run at any time to patch up your VM to the
       latest.</p>
     <p>The first command ("rpuffer ...") is also useful on its own for getting
-      the latest version of the feisty meow code.&nbsp; If there are bug fixes
-      you need for the scripts or you want updated cakelampvm documentation,
-      that is the command to use.</p>
+      the latest version of the feisty meow code.&nbsp; Run it again if there
+      are bug fixes you need for any of the scripts or if you would like the
+      most up-to-date cakelampvm documentation.</p>
+    <h2>First Tasks as the Developer User</h2>
+    <p>Here are some first steps that will make the vm your own:</p>
+    <ol>
+      <li>Change your password for the developer account.&nbsp; (This may
+        eventually be required and automatic.)&nbsp; First, log into the VM with
+        ssh.&nbsp; Then type this command:<br>
+        <pre># passwd</pre>
+        The 'passwd' command will ask for your current password, and then for a
+        new password plus a verification of that new password.<br>
+        &nbsp;</li>
+      <li>Change your git configuration for the user and email address.&nbsp; This
+        is how we've configured it so far:<br>
+        <pre># git config --global user.email "developer@cakelampvm.com"</pre>
+        <pre># git config --global user.name "Developer J. Cakemo"</pre>
+        If you're developing on a real project, you probably don't want the
+        bogus email and even more bogus name above attached to your
+        commits.&nbsp; Just run the two commands again but with proper values.</li>
+    </ol>
+    <h2>Powering up with the Feisty Meow® scripts<a id="#powerup" name="#powerup"></a></h2>
+    The feisty meow scripts are a cohesive bash scripting environment for
+    getting a variety of tasks done.&nbsp; The feisty meow scripts recently
+    incorporated the "avbash" collection from Saco Design and added those
+    scripts to a new "site_avenger" collection of scripts.&nbsp; The site
+    avenger scripts provide tools for bringing up CakePHP web sites and managing
+    the collection of repositories for those sites.&nbsp; Each website is
+    considered an "application", and the application name itself (e.g.
+    "winterportlibrary") can often provide all the details for "powering up" the
+    site.&nbsp; The feisty meow team has added additional scripts for managing
+    DNS domains and Apache websites that provide the capability to "stand up" an
+    entire website around an application, with an accompanying DNS domain and an
+    Apache2 site definition.
+    <p>The site avenger scripts are documented separately within the feisty meow
+      codebase.&nbsp; Consult the <span style="text-decoration: underline;">f</span><a
+        target="_blank" title="quickstart" href="https://feistymeow.org/feisty_meow/readme.txt">eisty
+meow
+        readme</a> file first, as it provides some valuable information on
+      configuring the codebase initially.&nbsp; The site avenger script commands
+      are documented in the <a target="_blank" title="useful commands" href="https://feistymeow.org/feisty_meow/documentation/feisty_meow_command_reference.txt">feisty
+        meow command reference</a> file.</p>
+    <p>(The feisty meow codebase is already configured for the developer account
+      on the cakelampvm virtual machine.)</p>
+    <h2>X11 applications launched from the VM</h2>
+    <p>[incomplete section]</p>
+    <p>If a feature called "X forwarding" is enabled in your ssh client, then
+      you can start graphical applications on the VM and display them on your
+      local machine.&nbsp; This works right away on most Linux hosts, but can
+      also work on PCs with X window system installed.&nbsp; This section
+      describes how to set up Cygwin to run X server, which enables X11
+      forwarding to your local display.</p>
+    <p>...{insert that info}...</p>
     <h2>Using the guest VM's DNS services<a id="#dns-from-vm" name="#dns-from-vm"></a></h2>
     <p>The cakelampvm has been set up to provide a DNS server which will answer
       name lookup requests on any of the sites that the cakelampvm is hosting
@@ -213,15 +243,17 @@ meow
     <p>Once the DNS server is properly set up (by whatever means necessary),
       these ping commands should get answering responses (from 10.28.42.20) on
       both the cakelampvm VM and on your host PC.&nbsp; Note: ping on Linux
-      keeps going forever, so hit control-C when you are tired of seeing the pings:</p>
+      keeps going forever, so hit control-C when you are tired of seeing the
+      pings:</p>
     <pre># ping cakelampvm.com</pre>
     <pre># ping mapsdemo.cakelampvm.com</pre>
     <p>Note that any other answer than 10.28.42.20 for the address is *bzzzt*
       wrong, and means something needs to be fixed.</p>
     <p>If these pings succeed (which hopefully they will!), then try accessing
       the websites of each domain:</p>
-    <pre>(browse to) http://cakelampvm.com</pre>
-    <pre>(browse to) http://mapsdemo.cakelampvm.com</pre>
+    <pre>(browse to) <a target="_blank" title="vm website if dns working" href="http://cakelampvm.com">http://cakelampvm.com</a></pre>
+    <pre>(browse to) <a target="_blank" title="mapsdemo app, hopefully functional"
+href="http://mapsdemo.cakelampvm.com">http://mapsdemo.cakelampvm.com</a></pre>
     <p>These should show local sites on the VM rather than sites on the
       internet.&nbsp; If you instead get failures to find the domains, or if the
       "real internet" site comes up for cakelampvm.com (the page covered with
@@ -285,13 +317,10 @@ meow
       developer's home folder also ("/home/developer").</p>
     <p>If you run into any permission problems that prevent file access, either
       remotely or within the VM itself, then try running this command to fix
-      them:</p>
+      them (repeated from the section above about updating the cakelampvm):</p>
     <pre># revamp_cakelampvm</pre>
     <p>Afterwards, the www folder and others should allow the developer user to
       create new folders at will.</p>
-    <p>The revamp command above is also used to deliver new configuration to the
-      VM from the feisty meow script environment; running it after any update of
-      the feisty meow codebase is a good idea.</p>
     <h2>Accessing files on the host PC from the guest VM<a id="#samba-shares" name="#samba-shares"></a></h2>
     <p>If you want to share a folder from the host to the guest, perhaps for
       driver updates or other conveniences, then make the share with these
@@ -312,7 +341,7 @@ meow
     <p>Note: these instructions, even the quick approaches below, pale in
       comparison to the ease of use of the "standup" command in feisty meow's
       site avenger scripts.&nbsp; The standup command is detailed in the&nbsp;<a
-        title="useful commands" href="https://feistymeow.org/feisty_meow/documentation/feisty_meow_command_reference.txt">feisty
+        target="_blank" title="useful commands" href="https://feistymeow.org/feisty_meow/documentation/feisty_meow_command_reference.txt">feisty
         meow command reference</a> document.&nbsp; These instructions are for
       situations when the domain or site is idiosyncratic in some way that
       standup doesn't support.</p>
@@ -418,9 +447,10 @@ meow
       it means the DNS is working.&nbsp; If there are no responses or it's some
       other IP address talking back, check the instructions in the above DNS
       sections.</p>
-    <p>Once the DNS is working, try browsing to the site at "http://excalibur.tv".&nbsp;
-      That should at least bring up the configured site storage path, even if
-      nothing is being served from that folder yet.</p>
+    <p>Once the DNS is working, try browsing to the site at "<a title="it's excalibur, wilbur!"
+        href="http://excalibur.tv">http://excalibur.tv</a>".&nbsp; That should
+      at least bring up the configured site storage path, even if nothing is
+      being served from that folder yet.</p>
     <p>If the new site is not showing up properly, try examining the apache logs
       for any error messages that can be corrected.&nbsp; The log files are
       stored in "/var/log/apache2" and are named after the website (if
@@ -428,8 +458,8 @@ meow
     <h2>Handy Techniques for Using cakelampvm</h2>
     <h3>Assorted Guides and Cheat-Sheets</h3>
     <p>A Cheat sheet for the Vim editor (there are many of these available): <a
-        title="vim commands" href="https://vim.rtorr.com/">https://vim.rtorr.com/</a></p>
-    <p>A git branching model that seems to work well: <a title="release and patch process"
+        target="_blank" title="vim commands" href="https://vim.rtorr.com/">https://vim.rtorr.com/</a></p>
+    <p>A git branching model that seems to work well: <a target="_blank" title="release and patch process"
         href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a></p>
     <h3>Get the network address on the guest vm</h3>
     <p>Run this command: ifconfig</p>
@@ -447,8 +477,6 @@ meow
     <pre># sudo shutdown -h now</pre>
     <p>Using these commands is kinder to the VM than just cycling the power from
       the Virtualbox control panel.</p>
-    <p><br>
-    </p>
     <h1>Gritty Details of the Nitty Variety<a id="#nitty-gritty" name="#nitty-gritty"></a></h1>
     <p>This is the lowest level of plumbing for your VM.&nbsp; Hopefully you
       will not need to engage with this section.&nbsp; The most useful doc
@@ -503,23 +531,25 @@ meow
     <ul>
       <li>Downloaded and installed Virtualbox for host computer (where the vm
         image will be built).</li>
-      <li>Downloaded ubuntu server 16.04 iso.
-        (https://www.ubuntu.com/download/server)</li>
+      <li>Downloaded ubuntu server 16.04 iso. (<a target="_blank" title="ubuntu server"
+          href="https://www.ubuntu.com/download/server">https://www.ubuntu.com/download/server</a>)</li>
       <li>Created a new vm in Virtualbox, telling it to start from the ubuntu
         server iso.</li>
-      <li>Installed LAMP stack on guest VM.&nbsp; Some help here:
-        http://howtoubuntu.org/how-to-install-lamp-on-ubuntu</li>
-      <li>Configured CAKE on the guest VM.&nbsp; Useful link:
-        https://askubuntu.com/questions/628938/how-to-install-cakephp-in-ubuntu-14-04</li>
+      <li>Installed LAMP stack on guest VM.&nbsp; Some help here: <a target="_blank"
+          title="lamplighter" href="http://howtoubuntu.org/how-to-install-lamp-on-ubuntu">http://howtoubuntu.org/how-to-install-lamp-on-ubuntu</a></li>
+      <li>Configured CAKE on the guest VM.&nbsp; Useful link: <a target="_blank"
+          title="cakebundtu" href="https://askubuntu.com/questions/628938/how-to-install-cakephp-in-ubuntu-14-04">https://askubuntu.com/questions/628938/how-to-install-cakephp-in-ubuntu-14-04</a></li>
       <li>Configured the two network adapters as needed (one for host-only
         network and one for nat network).&nbsp; Here's some info about
         Virtualbox networking with two adapters similar to our setup:
-https://askubuntu.com/questions/293816/in-virtualbox-how-do-i-set-up-host-only-virtual-machines-that-can-access-the-in<br>
+        <a target="_blank" href="https://askubuntu.com/questions/293816/in-virtualbox-how-do-i-set-up-host-only-virtual-machines-that-can-access-the-in">https://askubuntu.com/questions/293816/in-virtualbox-how-do-i-set-up-host-only-...</a><br>
       </li>
       <li>Installed and configured Samba service for the guest VM.&nbsp; The
         main config file lives in "/etc/samba/smb.conf".&nbsp; Some pointers
         here:
-https://help.ubuntu.com/community/How%20to%20Create%20a%20Network%20Share%20Via%20Samba%20Via%20CLI%20%28Command-line%20interface/Linux%20Terminal%29%20-%20Uncomplicated%2C%20Simple%20and%20Brief%20Way%21</li>
+        <a target="_blank" href="https://help.ubuntu.com/community/How%20to%20Create%20a%20Network%20Share%20Via%20Samba%20Via%20CLI%20%28Command-line%20interface/Linux%20Terminal%29%20-%20Uncomplicated%2C%20Simple%20and%20Brief%20Way%21">https://help.ubuntu.com/community/How%20to%20Create...</a></li>
+      <li><br>
+      </li>
     </ul>
     <p><br>
     </p>

diff --git a/readme.txt b/readme.txt
index ca3b745926850fed6a873ed75741dbbe2fd02423..aaa8283b77d290095a210d1b309b9797cd16beef 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -58,12 +58,15 @@ A couple of perl modules are required by some of the scripts (including the
 differ utility and the feisty meow customization system).  They can be
 installed with either apt-get or CPAN.
 
-Install using apt-get:
+Install using apt-get (on Ubuntu or Debian-based OS):
 # sudo apt-get install libfile-which-perl libtext-diff-perl
 
 or Install using perl's CPAN:
 # sudo cpan install Text::Diff File::Which
 
+or on Cygwin (MS-Windows), install with apt-cyg:
+# apt-cyg install perl-File-Which perl-Text-Diff
+
 ==============
 
 How to install the build dependencies for feisty meow

diff --git a/scripts/agenda/info_overload_report.sh b/scripts/agenda/info_overload_report.sh
index c6dbbafb01d003aa578677235c4cc89dca1068d3..1c7784aae368e7c39cfff19a84bdf0c1d91b04eb 100644 (file)
--- a/scripts/agenda/info_overload_report.sh
+++ b/scripts/agenda/info_overload_report.sh
@@ -133,6 +133,11 @@ analyze_hierarchy_and_report ~/cloud/disordered "unsorted files"
 # up our weight accounting considerably.
 analyze_hierarchy_and_report ~/cloud/reading "reading list (for a quiet afternoon)"
 
+####
+
+# vocation is a prefix for anything i consider part of my life's work.
+analyze_by_dir_patterns "life's work and other oddities" ~/cloud/vocation*
+
 # scan all the items declared as active projects.
 analyze_by_dir_patterns "active issues" ~/cloud/active*
 

diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 208728d9cb54e9ff718a367297f31fcfde68331b..40a72ba49f22903464a01799b25f2de0a1c3f2d1 100644 (file)
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -678,7 +678,7 @@ ifeq "$(OMIT_VERSIONS)" ""
   ifneq "$(VERSION_RC_ROOT)" ""
 # only redo the version resource if it or version.ini is out of date.
 %_version.rc: version.ini $(PARAMETER_FILE)
-       $(CATCHER)$(CLAM_BINARIES)/version_stamper$(EXE_END) . $(PARAMETER_FILE)
+       $(CATCHER)$(CLAM_BINARIES)/version_stamper$(EXE_END) . $(FEISTY_MEOW_GENERATED_STORE)/versions $(PARAMETER_FILE)
   endif
 endif
 
@@ -769,10 +769,11 @@ endif # no-deps.
 
 ############################################################################
 
-# examines the required variables and complains if they're missing.
+# examines the required variables and complains if they are missing.
 check_requirements:
        $(HIDESH) -c 'if [ -z "$(PROJECT)" ]; then echo the PROJECT variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi'
        $(HIDESH) -c 'if [ -z "$(TYPE)" ]; then echo the TYPE variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi'
+       $(HIDESH) -c 'if [ ! -d $(FEISTY_MEOW_GENERATED_STORE)/versions ]; then mkdir $(FEISTY_MEOW_GENERATED_STORE)/versions; fi'
  
 ############################################################################
 

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 60fcc7bc6bd43b30784cc53eddbabfd5e367f638..c9210586b8b3ab3003de4cdaca976ef3e966f3f0 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -228,7 +228,8 @@ export DYNAMIC_LIBRARY_DIR = $(TARGETS_STORE)
 export STATIC_LIBRARY_DIR = $(TARGETS_STORE)
 
 # "HEADER_SEARCH_PATH" is where the class interface files are to be found.
-#HEADER_SEARCH_PATH =
+# we add the generated store folder for the build version file.
+HEADER_SEARCH_PATH = $(FEISTY_MEOW_GENERATED_STORE)/versions
 
 # "HOOPLE_HEADERS" are locations where the HOOPLE headers can be found.
 ifeq "$(HOOPLE_HEADERS)" ""

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index daaabcb16cece5a745d7735421fbecfc1c4691f3..189dac016546307e7e665e05f816285e4389cbf9 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -488,9 +488,12 @@ if [ -z "$skip_all" ]; then
     pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null
     incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom")"
 
-    local fail_message="\nare the perl dependencies installed?  if you're on ubuntu or debian, try this:\n
-    $(grep "apt.*perl" $FEISTY_MEOW_APEX/readme.txt)\n"
-    
+    local fail_message="\n
+are the perl dependencies installed?  if you're on ubuntu or debian, try this:\n
+    $(grep "apt-get.*perl" $FEISTY_MEOW_APEX/readme.txt)\n
+or if you're on cygwin, then try this (if apt-cyg is available):\n
+    $(grep "apt-cyg.*perl" $FEISTY_MEOW_APEX/readme.txt)\n";
+
     #echo "the incongruous files list is: $incongruous_files"
     # disallow a single character result, since we get "*" as result when nothing exists yet.
     if [ ${#incongruous_files} -ge 2 ]; then

diff --git a/scripts/opensim/opensim_utils.sh b/scripts/opensim/opensim_utils.sh
index d9d9d654784b9732a893c233486cced77a157005..f10d6b95ea3e21446d39f9371ff665935968f8e1 100644 (file)
--- a/scripts/opensim/opensim_utils.sh
+++ b/scripts/opensim/opensim_utils.sh
@@ -37,9 +37,9 @@ function launch_screen()
   app_name="$1"; shift
   echo "$(date_stringer ' '): starting $screen_name now..."
 #hmmm: version check for if we're using old screen?  this -L change was a mistake though for the screen project owners on ubuntu.
-#local boguslog=$HOME/screen_junk_$(date_stringer).log
+local boguslog=$HOME/screen_junk_$(date_stringer).log
 #maybe they unbroke it in 17.10?
-  screen -L$boguslog -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono "$app_name" 
+  screen -L $boguslog -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono "$app_name" 
 
   echo "$(date_stringer ' '): $screen_name started."
   # only sleep if we are not at the last process that gets started.

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 75f344cf66ab8485f0e8b980f6b83c8eef924859..d74fe1bd67c43c713249809e0bcbf0a991cb4b0a 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -64,7 +64,7 @@ function do_checkin()
   if [ $nicedir == "." ]; then
     nicedir=$(\pwd)
   fi
-  local blatt="echo checking in '$nicedir'..."
+  local blatt="echo -n checking in '$nicedir'...  "
 
   do_update "$directory"
   test_or_die "repository update--this should be fixed before check-in."