X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fgenerator%2Fwrapdoze.sh;h=c28d0e722e68afe0e8b28f39f7bb85988ae3776c;hb=f8197f8c46475e04f678ea7832ab86157b9788d1;hp=3f133b96b5cbe82b1bcfc4c39bb77382bd778444;hpb=5c4418b98f330bb481c18ef623046a931d0bbd01;p=feisty_meow.git

diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh
index 3f133b96..c28d0e72 100755
--- a/scripts/generator/wrapdoze.sh
+++ b/scripts/generator/wrapdoze.sh
@@ -2,17 +2,50 @@
 
 source $FEISTY_MEOW_SCRIPTS/core/functions.sh
 
+#hmmm: make this support multiple vars as parameters.
+# replaces a specific environment variable with a dos approved equivalent.
+function dossify_environment_variable()
+{
+  local var="$1"; shift
+
+#cygpath doesn't handle multiple path variables properly and otherwise operates only on one path element.
+##  new_value="$(cygpath -p -d ${!var})"
+##  eval "export $var=\"$new_value\""
+##echo "hey now the var is '${!var}'"
+
+  old_value="${!var}"
+#echo "var is '$var' and old value is '$old_value'"
+  if [[ ! "$old_value" =~ \/cygdrive\/ ]]; then
+#echo didnt have a cygdrive in it: $old_value
+    return 0
+  fi
+
+  # replace single back-slashes with double ones.
+  local new_value="$(unix_to_dos_path "${old_value}")"
+
+  # remove any quote characters in the value.
+  new_value="${new_value//\"/}"
+
+echo "new value: '$var' = '$new_value'"
+  eval "export $var=\"$new_value\""
+}
+
+# for a windows build, this will replace any forward slashes
+# and other cygwin notation with the appropriate dos style paths.
 function dossify_and_run_commands()
 {
-  # we only mess with the command line on windows...
   if [ "$OS" != "Windows_NT" ]; then
     # for non windows, just run the commands straight up.
     eval "${@}"
     return $?
   fi
 
+  # force all slashes to be dossy.
+#  export SERIOUS_SLASH_TREATMENT=true
+
+  dossify_environment_variable INCLUDE
+
   declare -a darc_commands=()
-#hmmm: may need the serious slash treatment.
 
   for i in "$@"; do
     if [[ "$i" =~ ^-[a-zA-z][/\"].* ]]; then
@@ -21,6 +54,14 @@ function dossify_and_run_commands()
 #echo "first two chars are $flag"
 #echo "last after that are $filename"
       recombined="$flag$filename"
+#echo combined flag and file is $recombined
+      darc_commands+=("$recombined")
+    elif [[ "$i" =~ ^-libpath:.* ]]; then
+      flag="-libpath:"
+      filename="$(unix_to_dos_path ${i:9})"
+#echo "libflag flag is $flag"
+#echo "name after that is $filename"
+      recombined="$flag$filename"
 #echo combined flag and file is $recombined
       darc_commands+=("$recombined")
     else 
@@ -30,19 +71,40 @@ function dossify_and_run_commands()
 
   declare -a real_commands=()
   for i in "${darc_commands[@]}"; do
-    real_commands+=($(echo $i | sed -e 's/\\/\\\\/g'))
+    real_commands+=($(echo $i | sed -e 's/\//\\/g'))
   done
 
-#temp!
-  echo commands are now:
-  for i in "${real_commands[@]}"; do
-    echo -n "$i "
-  done
-  echo
-#end temp
+  if [ ! -z "$SHELL_DEBUG" ]; then
+    echo commands are now:
+    for i in "${real_commands[@]}"; do
+      echo -n "$i "
+    done
+    echo
+  fi
+
+# this nonsense is only necessary because cygwin is screwing up our carefully constructed
+# command line.  it can't seem to leave the dos style paths alone in some cases, and insists
+# on changing their form to use forward slashes, which breaks the windows compiler.
+# this is NOT what cygwin is supposed to be doing, according to their documentation that
+# claims all styles of paths are supported.  and of course this worked fine in msys.
 
   # now actually run the chewed command.
-  cmd /c "${real_commands[@]}"
+
+# old approach, not working since cygwin is hosing us on some paths.
+#cmd /c "${real_commands[@]}"
+
+#new approach that creates a cmd file.
+  cmdfile="$(mktemp $CLAM_TMP/build_cmds.XXXXXX)"
+  echo "${real_commands[@]}" >"$cmdfile"
+echo "** cmd file is: '$cmdfile')"
+#echo "** cmd file has: $(cat "$cmdfile")"
+  cmd /c $(cat "$cmdfile")
+  retval=$?
+  # leave the file for inspection if there was an error.
+  if [ $retval -eq 0 ]; then
+    \rm "$cmdfile"
+  fi
+  return $retval
 }
 
 dossify_and_run_commands "$@"