nice changes unified a bunch of things, although of course windows
authorChris Koeritz <fred@gruntose.com>
Fri, 8 Nov 2013 06:27:34 +0000 (01:27 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 8 Nov 2013 06:27:34 +0000 (01:27 -0500)
builds still don't work right or possibly at all.

13 files changed:
nucleus/library/loggers/program_wide_logger.cpp
nucleus/tools/simple_utilities/create_guid.cpp
nucleus/tools/simple_utilities/playsound.cpp
nucleus/tools/simple_utilities/short_path.cpp
nucleus/tools/simple_utilities/sleep_ms.cpp
nucleus/tools/simple_utilities/zap_process.cpp
scripts/archival/snarf_feisty_meow.pl
scripts/buildor/cygwinize.sh [deleted file]
scripts/core/bootstrap_shells.sh
scripts/core/variables.sh
scripts/generator/build_variables.sh
scripts/generator/vis_stu_vars.sh
scripts/generator/wrapdoze.sh [changed mode: 0755->0644]

index c91d97713a6118db54b84fd049c75c4348e663c5..f5f6e374dde17b66cbbdb86d3a174d24c2ef899c 100644 (file)
@@ -12,6 +12,7 @@
 * Please send any updates to: fred@gruntose.com                               *
 \*****************************************************************************/
 
+#include "console_logger.h"
 #include "program_wide_logger.h"
 
 using namespace basis;
@@ -19,7 +20,7 @@ using namespace loggers;
 
 namespace loggers {
 
-standard_log_base *program_wide_logger::c_the_wide_log = new null_logger;
+standard_log_base *program_wide_logger::c_the_wide_log = new console_logger();
 
 standard_log_base &program_wide_logger::get() { return *c_the_wide_log; }
 
index e23dfe7163fe12dc6371c8e04cf33e23d99e9bfb..e359804e9cc201dc587e5b2e21f9f45261f959c6 100644 (file)
@@ -103,9 +103,11 @@ HOOPLE_MAIN(create_guid, )
   // static dependencies found by buildor_gen_deps.sh:
   #include <application/application_shell.cpp>
   #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>
index c1ddf4b2cfdad31708d7a0bb01fce702d43861a6..d5fa793ec4d31a4d3e9a252cd210fb63af535fd5 100644 (file)
@@ -60,14 +60,32 @@ int main(int argc, char *argv[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
+  #include <configuration/application_configuration.cpp>
+  #include <configuration/configurator.cpp>
+  #include <configuration/ini_configurator.cpp>
+  #include <configuration/ini_parser.cpp>
+  #include <configuration/table_configurator.cpp>
+  #include <configuration/variable_tokenizer.cpp>
+  #include <filesystem/byte_filer.cpp>
+  #include <filesystem/directory.cpp>
+  #include <filesystem/filename.cpp>
   #include <loggers/console_logger.cpp>
+  #include <loggers/program_wide_logger.cpp>
+  #include <structures/checksums.cpp>
   #include <structures/object_packers.cpp>
   #include <structures/static_memory_gremlin.cpp>
+  #include <structures/string_hasher.cpp>
+  #include <structures/string_table.cpp>
+  #include <structures/version_record.cpp>
   #include <textual/parser_bits.cpp>
+  #include <timely/earth_time.cpp>
+  #include <timely/time_stamp.cpp>
 #endif // __BUILD_STATIC_APPLICATION__
 
index b9582492b6c65163c04c32d8f6b09afad8ce9c1c..acc899b7fc38f0f3c2df02b14b6a603dd1a02e17 100644 (file)
@@ -50,9 +50,32 @@ int main(int argc, char *argv[])
 
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
+  #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
+  #include <basis/utf_conversion.cpp>
+  #include <configuration/application_configuration.cpp>
+  #include <configuration/configurator.cpp>
+  #include <configuration/ini_configurator.cpp>
+  #include <configuration/ini_parser.cpp>
+  #include <configuration/table_configurator.cpp>
+  #include <configuration/variable_tokenizer.cpp>
+  #include <filesystem/byte_filer.cpp>
+  #include <filesystem/directory.cpp>
+  #include <filesystem/filename.cpp>
+  #include <loggers/console_logger.cpp>
+  #include <loggers/program_wide_logger.cpp>
+  #include <structures/checksums.cpp>
+  #include <structures/object_packers.cpp>
   #include <structures/static_memory_gremlin.cpp>
+  #include <structures/string_hasher.cpp>
+  #include <structures/string_table.cpp>
+  #include <structures/version_record.cpp>
+  #include <textual/parser_bits.cpp>
+  #include <timely/earth_time.cpp>
+  #include <timely/time_stamp.cpp>
 #endif // __BUILD_STATIC_APPLICATION__
 
index 3b3d87ed4661ec26f8cebc07c1e8a6f747e9affe..352bb08d7cc8a2883199bef2ff14c27ed2d37e06 100644 (file)
@@ -48,9 +48,11 @@ int main(int argc, char *argv[])
 #ifdef __BUILD_STATIC_APPLICATION__
   // static dependencies found by buildor_gen_deps.sh:
   #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>
@@ -62,6 +64,7 @@ int main(int argc, char *argv[])
   #include <filesystem/byte_filer.cpp>
   #include <filesystem/directory.cpp>
   #include <filesystem/filename.cpp>
+  #include <loggers/console_logger.cpp>
   #include <loggers/program_wide_logger.cpp>
   #include <structures/checksums.cpp>
   #include <structures/object_packers.cpp>
index 70473765f4c67b47834521f9628ec6a00cc76d05..a398c0d23fa889cfefeb1da5637fced7541ed1f7 100644 (file)
@@ -86,9 +86,11 @@ int main(int argc, char *argv[])
   // static dependencies found by buildor_gen_deps.sh:
   #include <application/application_shell.cpp>
   #include <application/command_line.cpp>
+  #include <application/windoze_helper.cpp>
   #include <basis/astring.cpp>
   #include <basis/common_outcomes.cpp>
   #include <basis/environment.cpp>
+  #include <basis/guards.cpp>
   #include <basis/mutex.cpp>
   #include <basis/utf_conversion.cpp>
   #include <configuration/application_configuration.cpp>
index 24c8f0bd57f35380a16a6da4f48b0a073bba25f6..87a5c54670a9ba47fc9c78e885868f96b5799898 100644 (file)
@@ -54,8 +54,12 @@ local($root) = &canonicalize("$HOME/feisty_meow");
 &backup_hierarchy($snarf_file_base, $number, $root, "webby");
 
 # grab the production assets.
-&backup_files($snarf_file_base, $number, $root, "production", ("*.ini", "make*"));
+&backup_files($snarf_file_base, $number, $root, "production", ("*.ini", "make*", ".gitignore"));
+&backup_hierarchy($snarf_file_base, $number, "$root", "production/3rdparty");
+&backup_hierarchy($snarf_file_base, $number, "$root", "production/assign_bases");
+&backup_hierarchy($snarf_file_base, $number, "$root", "production/check_versions");
 &backup_hierarchy($snarf_file_base, $number, "$root", "production/setup_src");
+&backup_hierarchy($snarf_file_base, $number, "$root", "production/win32_helper");
 
 # now rename the file so only the unpacker can access it.
 &rename_archive($snarf_file);
diff --git a/scripts/buildor/cygwinize.sh b/scripts/buildor/cygwinize.sh
deleted file mode 100644 (file)
index a9660dd..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/cygdrive/c/utilities/firefox:$PATH
-
-bash 
-
-
index 0f7ad4a68bf4910d0a1c1b98550716fa0619e764..d2d56e48aec53543a822d402fe8e99707424edd1 100644 (file)
@@ -16,7 +16,9 @@ THIS_TOOL_NAME="$(basename "$0")"
 # set up the feisty_meow dir.
 pushd "$CORE_SCRIPTS_DIR/../.." &>/dev/null
 source "$CORE_SCRIPTS_DIR/functions.sh"
-export FEISTY_MEOW_DIR="$(pwd)"
+
+###unset SERIOUS_SLASH_TREATMENT
+export FEISTY_MEOW_DIR="$(unix_to_dos_path $(\pwd) )"
 popd &>/dev/null
 
 export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts"
@@ -40,7 +42,7 @@ for i in FEISTY_MEOW_DIR FEISTY_MEOW_SCRIPTS FEISTY_MEOW_GENERATED; do
   echo "export $i=${!i}" >>"$GENERATED_FEISTY_MEOW_VARIABLES"
 done
 
-# load our variables so we get a useful PERLLIB variable.
+# load our variables so we can run our perl scripts successfully.
 source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
 
 # create our common aliases.
index 9f6f61cca5b31d7c212305092051269f955044a1..ac708df3f2ae9de03e7a428ff8dcdbc3329f986e 100644 (file)
@@ -100,10 +100,8 @@ if [ -z "$NECHUNG" ]; then
   
   # variables for perl.
   
-  export PERLLIB
-  if [ "$OS" != "Windows_NT" ]; then
-    PERLLIB+="/usr/lib/perl5"
-  else
+  export PERLLIB+="/usr/lib/perl5"
+  if [ "$OS" == "Windows_NT" ]; then
     export PERLIO=:perlio
       # choose perl's IO over the ms-windows version so we can handle file
       # bytes properly.
@@ -116,7 +114,7 @@ if [ -z "$NECHUNG" ]; then
       # check if there is a perl file present; add the folder to PERLLIB if so.
       ls $i/*.pl &>/dev/null
       if [ $? -eq 0 ]; then
-        PERLLIB+=":$i"
+        PERLLIB+=":$(dos_to_unix_path $i)"
       fi
     fi
   done
@@ -156,9 +154,9 @@ if [ -z "$NECHUNG" ]; then
       # up the path to it here based on the operating system.
       export BINDIR=$FEISTY_MEOW_DIR/production/binaries
       # add binaries created within build to the path.
-      export PATH="$BINDIR:$PATH"
+      export PATH="$(dos_to_unix_path $BINDIR):$PATH"
       # Shared libraries are located via this variable.
-      export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BINDIR"
+      export LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $BINDIR)"
     fi
   }
   
@@ -179,7 +177,7 @@ if [ -z "$NECHUNG" ]; then
   
   # add to the PATH variables used for locating applications.  this step is taken after any
   # potential overrides from the user.
-  export PATH="$FEISTY_MEOW_GENERATED:$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin"
+  export PATH="$(dos_to_unix_path $FEISTY_MEOW_GENERATED):$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin"
   
   ##############
 
index c21f1b781302592de3851d42ecd116dc6fb1ee51..9281730febe0be3e14427bb2e484a2b5ed214b15 100644 (file)
@@ -88,10 +88,10 @@ if [ ! -z "$SHELL_DEBUG" ]; then
   echo "[FEISTY_MEOW_DIR is $FEISTY_MEOW_DIR]"
 fi
 
-if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
-  # harsh on the paths and make them use backwards slashes.
-  export SERIOUS_SLASH_TREATMENT=true
-fi
+#if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
+#  # harsh on the paths and make them use backwards slashes.
+#  export SERIOUS_SLASH_TREATMENT=true
+#fi
 
 # new BUILD_TOP variable points at the utter top-most level of any files
 # in the building hierarchy.
@@ -193,7 +193,7 @@ if [ -z "$got_bad" ]; then
   
   # we should have established our internal variables now, so let's try
   # using them.
-  export PATH=$BINARY_DIR:$PATH
+  export PATH=$(dos_to_unix_path $BINARY_DIR):$PATH
   
   # load up the helper variables for visual studio on winders.
   if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
index 9f00b080f28405b0be270d1b645b5f230be60233..6d42e4c92a3ab73a3f22c5286f23858c68c191a4 100644 (file)
@@ -20,7 +20,7 @@ fi
 function setup_visual_studio_variables()
 {
   chmod 755 $PRODUCTION_DIR/win32_helper/*.exe
-  export PATH=$PRODUCTION_DIR/win32_helper:$PATH
+  export PATH="$(dos_to_unix_path $PRODUCTION_DIR)/win32_helper:$PATH"
 
   # we try to use the most recent compiler location, and work backwards as
   # needed for the supported range (10 = vs 2010, 9 = vs 2008, 8 = vs 2005).
@@ -40,7 +40,7 @@ function setup_visual_studio_variables()
   export VIS_STU_ROOT="$(echo $VSxTOOLS | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' | sed -e 's/^\(.\):/\/\1/' )"
   export VSINSTALLDIR="$VIS_STU_ROOT"
   
-  export WINDIR="$(short_path "$WINDIR" | sed -e 's/\\/\//g' | sed -e 's/^\(.\):/\/\1/' )"
+  export WINDIR="$(short_path "$WINDIR" | tr A-Z a-z | sed -e 's/\\/\//g' | sed -e 's/^\(.\):/\/\1/' )"
   
   export VCINSTALLDIR="$VSINSTALLDIR/VC"
   export VSCOMMONROOT="$VSINSTALLDIR/Common7"
@@ -58,7 +58,10 @@ function setup_visual_studio_variables()
   export WindowsSdkDir="$PLATFORM_DIR"
   
   #echo "path before is $PATH"
-  export PATH="$DevEnvDir:$VCINSTALLDIR/BIN:$VSxTOOLS:$VSxTOOLS/bin:$FrameworkDir/$FrameworkVersion:$FrameworkDir/v3.5:$VCINSTALLDIR/VCPackages:$VSINSTALLDIR/Common7/Tools:$PLATFORM_DIR/bin:$PATH"
+  local filena
+  for filena in "$DevEnvDir" "$VCINSTALLDIR/BIN" "$VSxTOOLS" "$VSxTOOLS/bin" "$FrameworkDir/$FrameworkVersion" "$FrameworkDir/v3.5" "$VCINSTALLDIR/VCPackages" "$VSINSTALLDIR/Common7/Tools" "$PLATFORM_DIR/bin"; do 
+    export PATH="$PATH:$(dos_to_unix_path $filena)"
+  done
   #echo "path after is $PATH"
   
   export INCLUDE="$VCINSTALLDIR/ATLMFC/INCLUDE:$VCINSTALLDIR/INCLUDE:$PLATFORM_DIR/include"
old mode 100755 (executable)
new mode 100644 (file)
index d743283..0ce27c3
@@ -4,6 +4,13 @@ source $FEISTY_MEOW_SCRIPTS/core/functions.sh
 
 function dossify_and_run_commands()
 {
+
+
+eval "${@}"
+return $?
+
+
+#all primordial gunk.  try above first.
   # we only mess with the command line on windows...
   if [ "$OS" != "Windows_NT" ]; then
     # for non windows, just run the commands straight up.