X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fvis_stu_vars.sh;h=546d86277be7708fcfc4a3a8f6189a1648b38701;hb=b6393801b03e81598e3ef6dfa58d473174f1e7b9;hp=3f9c50ecdff1c881293e8fc59f79193f78cb2a46;hpb=6e7051a6281e8c3bcdc275e7c6e4301ec59bd29b;p=feisty_meow.git

diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh
index 3f9c50ec..546d8627 100644
--- a/scripts/generator/vis_stu_vars.sh
+++ b/scripts/generator/vis_stu_vars.sh
@@ -19,9 +19,6 @@ fi
 
 function setup_visual_studio_variables()
 {
-  chmod 755 $PRODUCTION_DIR/win32_helper/*.exe
-  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).
   export VSxTOOLS="$VS100COMNTOOLS"
@@ -35,14 +32,14 @@ function setup_visual_studio_variables()
   if [ -z "$VSxTOOLS" ]; then
     return 33
   fi
-  export VSxTOOLS="$(short_path "$VSxTOOLS" | tr "A-Z" "a-z" | sed -e 's/\\/\//g' )"
+  export VSxTOOLS="$(cygpath -w -s "$VSxTOOLS" | tr "A-Z" "a-z" | sed -e 's/\\/\//g' )"
 #| sed -e 's/^\(.\):/\/\1/' )"
   
   export VIS_STU_ROOT="$(echo $VSxTOOLS | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )"
 #| sed -e 's/^\(.\):/\/\1/' )"
   export VSINSTALLDIR="$VIS_STU_ROOT"
   
-  export WINDIR="$(short_path "$WINDIR" | tr A-Z a-z | sed -e 's/\\/\//g' )"
+  export WINDIR="$(cygpath -w -s "$WINDIR" | tr A-Z a-z | sed -e 's/\\/\//g' )"
 #| sed -e 's/^\(.\):/\/\1/' )"
   
   export VCINSTALLDIR="$VSINSTALLDIR/VC"
@@ -57,10 +54,26 @@ function setup_visual_studio_variables()
   export PLATFORM_DIR="$VCINSTALLDIR/PlatformSDK"
   if [ ! -d "$PLATFORM_DIR" ]; then
 
-#on hold:    export PLATFORM_DIR="$(short_path "$PROGRAMFILES/Microsoft SDKs/Windows/v7.0A" | tr "A-Z" "a-z" | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )"
+#on hold:    export PLATFORM_DIR="$(cygpath -w -s "$PROGRAMFILES/Microsoft SDKs/Windows/v7.0A" | tr "A-Z" "a-z" | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )"
 ##| sed -e 's/^\(.\):/\/\1/' )"
 
-export PLATFORM_DIR="c:\progra~2\micros~1\windows\v7.0a"
+    # guess at where we can find this damned directory in its short form.
+#hmmm: this is needed until there's a replacement for short path, or we can build again.
+    export PLATFORM_DIR="c:/progra~2/micros~1/windows/v7.0a"
+    if [ ! -d "$PLATFORM_DIR" ]; then
+      PLATFORM_DIR="c:/progra~1/micros~1/windows/v7.0a"
+      if [ ! -d "$PLATFORM_DIR" ]; then
+        PLATFORM_DIR="c:/progra~1/micros~2/windows/v7.0a"
+        if [ ! -d "$PLATFORM_DIR" ]; then
+          PLATFORM_DIR="c:/progra~2/micros~2/windows/v7.0a"
+        fi
+      fi
+    fi
+
+    if [ ! -d "$PLATFORM_DIR" ]; then
+      echo "*** Failure to calculate the platform directory based on several attempts using c:\\program files\\microsoft sdks\\windows\\v7.0a as the basic pattern"
+    fi
+  
 
   fi
   export WindowsSdkDir="$PLATFORM_DIR"
@@ -83,19 +96,6 @@ export PLATFORM_DIR="c:\progra~2\micros~1\windows\v7.0a"
     # the redirection of stderr to null is to get around an obnoxious cygwin
     # warning that seems to be erroneously complaining about backslashes.
   
-  # convert all other relevant paths back to dos form, or visual studio barfs.
-  #export BUILD_SCRIPTS_DIR=$(unix_to_dos_path $BUILD_SCRIPTS_DIR)
-  #export BUILDING_HIERARCHY=$(unix_to_dos_path $BUILDING_HIERARCHY)
-  #export BUILDER_DIR=$(unix_to_dos_path $BUILDER_DIR)
-  #export BUILD_TOP=$(unix_to_dos_path $BUILD_TOP)
-  #export PRODUCTION_DIR=$(unix_to_dos_path $PRODUCTION_DIR)
-  #export LOGS_DIR=$(unix_to_dos_path $LOGS_DIR)
-  #export TOOL_SOURCES=$(unix_to_dos_path $TOOL_SOURCES)
-  #export BINARY_DIR=$(unix_to_dos_path $BINARY_DIR)
-  #export TARGETS_DIR=$(unix_to_dos_path $TARGETS_DIR)
-  #export INTERMEDIATE_EXE_DIR=$(unix_to_dos_path $INTERMEDIATE_EXE_DIR)
-  #export WASTE_DIR=$(unix_to_dos_path $WASTE_DIR)
-  
   ##############
   
   echo "calculated variables for dos/windoze builds:"