updates lurching towards functionality

[feisty_meow.git] / scripts / generator / produce_feisty_meow.sh

diff --git a/scripts/generator/produce_feisty_meow.sh b/scripts/generator/produce_feisty_meow.sh
index dbecd2637009bd8a0182397b5e9f7402f7e1f013..7466031b3cf0664d7776626805f417051e4ab89e 100644 (file)
--- a/scripts/generator/produce_feisty_meow.sh
+++ b/scripts/generator/produce_feisty_meow.sh
@@ -33,6 +33,7 @@ export INCLUDED_FROM_BOOTSTRAP=true
 export BUILD_SCRIPTS_PATH="$( \cd "$(\dirname "$0")" && /bin/pwd )"
 #echo build scripts dir initial value: $BUILD_SCRIPTS_PATH
 BUILD_SCRIPTS_PATH="$(echo $BUILD_SCRIPTS_PATH | tr '\\\\' '/' )"
+#hmmm: why four backslashes above?  trying two in our unix virtual root code below.
 #echo build scripts dir after chewing: $BUILD_SCRIPTS_PATH
 
 # load in feisty meow basic scripts, if not already loaded.
@@ -61,8 +62,26 @@ function prepare_binaries_dir()
     mkdir -p "$CLAM_BINARIES"
   fi
   if [ ! -f "$CLAM_BINARIES/paths.ini" ]; then
-    echo "copied paths.ini to binary dir."
     cp "$PRODUCTION_STORE/paths.ini" "$CLAM_BINARIES"
+    echo "copied paths.ini to binary dir."
+  fi
+  # set the cygwin root path if we're on cygwin.
+  whichable cygpath
+  if [ $? -eq 0 ]; then
+    # found cygpath, so run it now to get the dossy path of the root ('/' folder).
+    found_root="$(cygpath -w -m /)"
+    if [ $? -ne 0 ]; then
+      echo "Failure to find virtual Unix root folder with cygpath."
+      exit 1322
+    fi
+echo "found root as '$found_root'"
+    # translate any backslashes to forward thinking slashes.    
+    found_root=$(echo $found_root | tr '\\' '/')
+echo "processed root is now: '$found_root'"
+    # edit the entry in place to correct the default path.
+    sed -i -e "s%VirtualUnixRoot=.*%VirtualUnixRoot=$found_root%" "$CLAM_BINARIES/paths.ini" 
+echo "paths file now has:"
+cat "$CLAM_BINARIES/paths.ini" 
   fi
 }
 
@@ -179,14 +198,6 @@ if [ -z "$SAVE_BINARIES" ]; then
   done
 fi
 
-# make the clam shell scripts executable.
-#hmmm: why?  this should no longer be needed.
-#      and even if it's needed, the perms should be stored in the repo.
-#chmod 755 "$CLAM_SCRIPTS"/*.sh
-#chmod 755 "$CLAM_SCRIPTS"/cpp/*.sh
-#chmod 755 "$CLAM_SCRIPTS"/csharp/*.sh
-#chmod 755 "$FEISTY_MEOW_SCRIPTS/generator/wrapdoze.sh"
-
 # rebuild the dependency tool.  needed by everything, pretty much, but
 # since it's from the xfree project, it doesn't need any of our libraries.
 if [ ! -f "$CLAM_BINARIES/makedep$EXE_ENDING" ]; then