From: Chris Koeritz Date: Tue, 21 Nov 2017 05:32:20 +0000 (+0000) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.104^2~1^2~1 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=d1fd71327f5bff51e33f7fb0c1614e054d1f0e40;hp=ad9bd7e5fd963b7a7656d698df198eaca503c26c;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into dev --- diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat index 1f462d80..32f238a0 100644 --- 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 6a5519e1..e9fc8b23 100644 --- 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 6838adee..0fe559d2 100644 --- 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 ea90cd41..3313906d 100644 --- 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 bef8fcba..3beb8779 100644 --- 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 ¤t) 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 4afed778..6eb06ad2 100644 --- 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 9ebbd74e..19a79a96 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=101 +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 561e734a..8473cc27 100644 --- 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 @@

The cakelampvm VM:
Configuration and Usage

-

By Chris Koeritz

+

By Chris Koeritz
+ feisty meow® concerns ltd

Vintage: cakelampvm v002    - Updated: 2017-11-16 (rev E)

+ Updated: 2017-11-20 (rev F)

The cakelampvm project provides a Virtualbox VM that acts as an "internet - in a bottle".  The virtual machine provides DNS services (bind9), a Web server (Apache2), a full Ubuntu Linux desktop environment, - the Fluxbox X window manager, - and a suite of tools called the Feisty Meow® codebase .  - Together, these services provide you with a very flexible and powerful - testbed for web development, especially suited for CakePHP.

+ in a bottle", serving up your web sites securely and only to your local + host.  The virtual machine provides DNS services (bind9), a Web server + (Apache2), + a full Ubuntu + Linux + desktop environment, the Fluxbox + X + window manager, and a suite of tools called the Feisty + Meow® codebase .  Together, these services provide you with a + very flexible and powerful testbed for web development, especially suited + for CakePHP.  + This VM was built with the assistance of and was partially funded by Saco Design of Winterport, + Maine.

Commands preceded by an octothorpe ('#') below are intended to be typed into a bash shell running on the cakelampvm virtual machine.  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 & paste features work as expected.

Commands preceded by a greater-than symbol ('>') are intended to be - run on the Host PC in a Windows command prompt (or in a bash prompt running - on the Host PC).

+ run on the Host PC in a Windows command prompt (or in a bash prompt + running on the Host PC).

Guest VM Configuration

-

Powering up with the Feisty Meow® scripts

- The feisty meow scripts are a cohesive bash scripting environment for - getting a variety of tasks done.  The feisty meow scripts recently - incorporated the "avbash" collection from Saco Designs and added those - scripts to a new "site_avenger" collection of scripts.  The site - avenger scripts provide tools for bringing up CakePHP web sites and managing - the collection of repositories for those sites.  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.  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. -

The site avenger scripts are documented separately within the feisty meow - codebase.  Consult the feisty -meow - readme file first, as it provides some valuable information on - configuring the codebase initially.  The site avenger script commands - are documented in the feisty - meow command reference file.

-

(The feisty meow codebase is already configured for the developer account - on the cakelampvm virtual machine.)

How to set up virtualbox for your host PC

    -
  1. Download and install virtualbox: - https://www.virtualbox.org/wiki/Downloads
    2. +
  2. Download and install virtualbox: https://www.virtualbox.org/wiki/Downloads
  3. Install the extension pack for Virtualbox: This provides USB drivers and other features.  This is installed on Virtualbox itself (on the Host PC), not on the guests.
      4. -
    1. Download the extension pack at - https://www.virtualbox.org/wiki/Downloads
      2. +
    2. Download the extension pack (also) at https://www.virtualbox.org/wiki/Downloads
    3. Stop any running Virtualbox VMs.
    4. Close the Virtualbox control panel.
    5. Double-click on the downloaded extensions package (in a file @@ -95,11 +78,13 @@ meow

      Configure the Host-Only network on Virtualbox

      Configuring host-only networking for the VM makes the VM completely local to your machine.  The cakelampvm will not be accessible on the - internet or from the LAN, and can only be accessed by your host PC.

      + internet or from the LAN, and can only be accessed by your host PC.  + This is a key component of security for your VM and your host PC, and is + considered a crucial configuration step.

      Note: If the host-only or NAT network exist ahead of time, Virtualbox may complain about them even if they have the correct configuration.  - This can be corrected simply by opening the VM settings and selecting the - appropriate network names again.

      + This can be corrected simply by opening the cakelampvm settings and + selecting the appropriate network names again.

      To configure the host-only network, follow these steps:

      1. Go to virtual box "Preferences" (global preferences, not for a @@ -126,10 +111,11 @@ meow

        Configure the NAT Network on Virtualbox

        The NAT (Network Address Translation) network allows the VM to get off of the machine and onto the internet safely.  It will use this interface - for any communication off of the host machine.  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.

        + for any communication off of the host machine.  This is another + crucial component for the security of the VM and your host PC.  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.

        To set up the NAT network, follow these steps:

        1. Go to virtual box "Preferences" (global preferences, not for a @@ -148,47 +134,91 @@ meow

          Starting up the VM

          Using the Virtualbox interface, you should now be able to start your virtual machine.  Virtualbox will complain if it detects any - remaining configuration problems in the VM, but it should start - normally.  The Linux boot sequence will show many lines of text, - before bringing up a black console window with a login dialog.

          + remaining configuration problems in the VM.  The Linux boot sequence + will show many lines of text, before bringing up a black console window + with a login dialog.

          If Windows complains about the Virtualbox application slamming into its firewall, then allow the Virtualbox to get through.  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.

          + 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.

          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.  If the networking has been established properly, you should be able to do this with:

          - 
          ssh developer@cakelampvm.com  (or equivalent with your ssh client)
          + 
          # ssh developer@10.28.42.20   # or the equivalent with your ssh client

          And then provide the password to log in.

          -

          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.  This works right away on most Linux hosts, but can - also work on PCs with X window system installed.  The section below - describes how to set up Cygwin to run X server, which enable X forwarding - to your local display.

          -

          ...{insert that info}...

          +

          Once the DNS services are set up (discussed in detail below), you will be + able to run the much friendlier command:

          + 
          # ssh developer@cakelampvm.com

          Updating cakelampvm to the Latest Model

          -

          The cakelampvm is released with the intention to not be released - again.  Version 001 was not built with that explicit intention, which - then required the release of Version 002.  We hope to not need a v003 - release.

          +

          The cakelampvm v002 is released with the intention that it not need to be + released again.  Version 001 was not built with that explicit + intention, which then required the release of Version 002.  But we + hope to not need a v003 release...

          There is an update feature built into the VM that is quite easy to use.  The updates are driven by the feisty meow script repository in conjunction with a local scripted command.  To activate the "update - process" for your VM, run the following commands (without the initial '#' - symbol):

          -

          # rpuffer $FEISTY_MEOW_APEX   # updates to the latest version - of feisty meow
          - # revamp_cakelampvm    # enacts any configuration changes - needed, plus fixes web folder and other permissions.

          + process" for your VM, run the following commands on the VM (without the + initial '#' symbol):

          + 
          # rpuffer $FEISTY_MEOW_APEX   # updates to the latest version of feisty meow
+# revamp_cakelampvm           # enacts any configuration changes needed,
                                        # plus fixes web folder and other permissions.

          These two commands can be run at any time to patch up your VM to the latest.

          The first command ("rpuffer ...") is also useful on its own for getting - the latest version of the feisty meow code.  If there are bug fixes - you need for the scripts or you want updated cakelampvm documentation, - that is the command to use.

          + the latest version of the feisty meow code.  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.

          +

          First Tasks as the Developer User

          +

          Here are some first steps that will make the vm your own:

          +
            +
          1. Change your password for the developer account.  (This may + eventually be required and automatic.)  First, log into the VM with + ssh.  Then type this command:
            + 
            # passwd
            + The 'passwd' command will ask for your current password, and then for a + new password plus a verification of that new password.
            +  
            2. +
          2. Change your git configuration for the user and email address.  This + is how we've configured it so far:
            + 
            # git config --global user.email "developer@cakelampvm.com"
            + 
            # git config --global user.name "Developer J. Cakemo"
            + 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.  Just run the two commands again but with proper values.
            3. +
          +

          Powering up with the Feisty Meow® scripts

          + The feisty meow scripts are a cohesive bash scripting environment for + getting a variety of tasks done.  The feisty meow scripts recently + incorporated the "avbash" collection from Saco Design and added those + scripts to a new "site_avenger" collection of scripts.  The site + avenger scripts provide tools for bringing up CakePHP web sites and managing + the collection of repositories for those sites.  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.  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. +

          The site avenger scripts are documented separately within the feisty meow + codebase.  Consult the feisty +meow + readme file first, as it provides some valuable information on + configuring the codebase initially.  The site avenger script commands + are documented in the feisty + meow command reference file.

          +

          (The feisty meow codebase is already configured for the developer account + on the cakelampvm virtual machine.)

          +

          X11 applications launched from the VM

          +

          [incomplete section]

          +

          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.  This works right away on most Linux hosts, but can + also work on PCs with X window system installed.  This section + describes how to set up Cygwin to run X server, which enables X11 + forwarding to your local display.

          +

          ...{insert that info}...

          Using the guest VM's DNS services

          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

          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.  Note: ping on Linux - keeps going forever, so hit control-C when you are tired of seeing the pings:

          + keeps going forever, so hit control-C when you are tired of seeing the + pings:

          # ping cakelampvm.com
          # ping mapsdemo.cakelampvm.com

          Note that any other answer than 10.28.42.20 for the address is *bzzzt* wrong, and means something needs to be fixed.

          If these pings succeed (which hopefully they will!), then try accessing the websites of each domain:

          - 
          (browse to) http://cakelampvm.com
          - 
          (browse to) http://mapsdemo.cakelampvm.com
          + 
          (browse to) http://cakelampvm.com
          + 
          (browse to) http://mapsdemo.cakelampvm.com

          These should show local sites on the VM rather than sites on the internet.  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").

          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:

          + them (repeated from the section above about updating the cakelampvm):

          # revamp_cakelampvm

          Afterwards, the www folder and others should allow the developer user to create new folders at will.

          -

          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.

          Accessing files on the host PC from the guest VM

          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

          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.  The standup command is detailed in the feisty + target="_blank" title="useful commands" href="https://feistymeow.org/feisty_meow/documentation/feisty_meow_command_reference.txt">feisty meow command reference document.  These instructions are for situations when the domain or site is idiosyncratic in some way that standup doesn't support.

          @@ -418,9 +447,10 @@ meow it means the DNS is working.  If there are no responses or it's some other IP address talking back, check the instructions in the above DNS sections.

          -

          Once the DNS is working, try browsing to the site at "http://excalibur.tv".  - That should at least bring up the configured site storage path, even if - nothing is being served from that folder yet.

          +

          Once the DNS is working, try browsing to the site at "http://excalibur.tv".  That should + at least bring up the configured site storage path, even if nothing is + being served from that folder yet.

          If the new site is not showing up properly, try examining the apache logs for any error messages that can be corrected.  The log files are stored in "/var/log/apache2" and are named after the website (if @@ -428,8 +458,8 @@ meow

          Handy Techniques for Using cakelampvm

          Assorted Guides and Cheat-Sheets

          A Cheat sheet for the Vim editor (there are many of these available): https://vim.rtorr.com/

          -

          A git branching model that seems to work well: https://vim.rtorr.com/

          +

          A git branching model that seems to work well: http://nvie.com/posts/a-successful-git-branching-model/

          Get the network address on the guest vm

          Run this command: ifconfig

          @@ -447,8 +477,6 @@ meow 
          # sudo shutdown -h now

          Using these commands is kinder to the VM than just cycling the power from the Virtualbox control panel.

          -


          -

          Gritty Details of the Nitty Variety

          This is the lowest level of plumbing for your VM.  Hopefully you will not need to engage with this section.  The most useful doc @@ -503,23 +531,25 @@ meow

          • Downloaded and installed Virtualbox for host computer (where the vm image will be built).
            • -
          • Downloaded ubuntu server 16.04 iso. - (https://www.ubuntu.com/download/server)
            • +
          • Downloaded ubuntu server 16.04 iso. (https://www.ubuntu.com/download/server)
          • Created a new vm in Virtualbox, telling it to start from the ubuntu server iso.
            • -
          • Installed LAMP stack on guest VM.  Some help here: - http://howtoubuntu.org/how-to-install-lamp-on-ubuntu
            • -
          • Configured CAKE on the guest VM.  Useful link: - https://askubuntu.com/questions/628938/how-to-install-cakephp-in-ubuntu-14-04
            • +
          • Installed LAMP stack on guest VM.  Some help here: http://howtoubuntu.org/how-to-install-lamp-on-ubuntu
            • +
          • Configured CAKE on the guest VM.  Useful link: https://askubuntu.com/questions/628938/how-to-install-cakephp-in-ubuntu-14-04
          • Configured the two network adapters as needed (one for host-only network and one for nat network).  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
            + https://askubuntu.com/questions/293816/in-virtualbox-how-do-i-set-up-host-only-...
          • Installed and configured Samba service for the guest VM.  The main config file lives in "/etc/samba/smb.conf".  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
            • + https://help.ubuntu.com/community/How%20to%20Create... +

          • +


          diff --git a/readme.txt b/readme.txt index ca3b7459..aaa8283b 100644 --- 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 c6dbbafb..1c7784aa 100644 --- 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 208728d9..40a72ba4 100644 --- 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 60fcc7bc..c9210586 100644 --- 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 daaabcb1..189dac01 100644 --- 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 d9d9d654..f10d6b95 100644 --- 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 75f344cf..d74fe1bd 100644 --- 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."