X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fvis_stu_vars.sh;h=1989f7566bc54d0b9165076e461a0de8e0829354;hb=c957a4bb5861666f963dc1334046427132afcc52;hp=7dce596746f8f44983521f7ed9f0a939fc3575e2;hpb=1f85195f3855fab2055b537708d8fb3b966eddd0;p=feisty_meow.git

diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh
index 7dce5967..1989f756 100644
--- a/scripts/generator/vis_stu_vars.sh
+++ b/scripts/generator/vis_stu_vars.sh
@@ -12,9 +12,8 @@ function print_usage {
   echo ""
 }
 
-if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
-  export PATH=$PRODUCTION_DIR/win32_help:$PATH
-fi
+chmod 755 $PRODUCTION_DIR/win32_helper/*.exe
+export 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).
@@ -30,18 +29,12 @@ if [ -z "$VSxTOOLS" ]; then
   print_usage
   return 33
 fi
-#echo "common tools dir is \"$VSxTOOLS\""
 export VSxTOOLS="$(short_path "$VSxTOOLS" | tr "A-Z" "a-z" | sed -e 's/\\/\//g' | sed -e 's/^\(.\):/\/\1/' )"
-#echo cleaned comn tools is $VSxTOOLS 
 
 export VIS_STU_ROOT="$(echo $VSxTOOLS | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' | sed -e 's/^\(.\):/\/\1/' )"
 export VSINSTALLDIR="$VIS_STU_ROOT"
-#echo root of visual studio is $VSINSTALLDIR
 
 export WINDIR="$(short_path "$WINDIR" | sed -e 's/\\/\//g' | sed -e 's/^\(.\):/\/\1/' )"
-#echo cleaned windir is $WINDIR
-
-#echo "prior path is $PATH"
 
 export VCINSTALLDIR="$VSINSTALLDIR/VC"
 export VSCOMMONROOT="$VSINSTALLDIR/Common7"
@@ -57,7 +50,6 @@ if [ ! -d "$PLATFORM_DIR" ]; then
   export PLATFORM_DIR="$(short_path "$PROGRAMFILES/Microsoft SDKs/Windows/v7.0A" | tr "A-Z" "a-z" | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' | sed -e 's/^\(.\):/\/\1/' )"
 fi
 export WindowsSdkDir="$PLATFORM_DIR"
-#echo platform dir is $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"
@@ -70,9 +62,31 @@ export LIB="$VCINSTALLDIR/ATLMFC/LIB:$VCINSTALLDIR/LIB:$PLATFORM_DIR/lib"
 #:$FrameworkSDKDir/lib"
 
 # convert framework dir back or things yell like hell.
-export FrameworkDir="$(echo $FrameworkDir | sed -e 's/^\/\(.\)[\\\/]\(.*\)$/\1:\\\2/' | tr "/" "\\" 2>/dev/null )"
+export FrameworkDir=$(unix_to_dos_path $FrameworkDir)
   # the redirection of stderr to null is to get around an obnoxious cygwin
   # warning that seems to be erroneously bitching 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 "common tools dir is \"$VSxTOOLS\""
+#echo cleaned windir is $WINDIR
+#echo cleaned comn tools is $VSxTOOLS 
+#echo root of visual studio is $VSINSTALLDIR
+#echo platform dir is $PLATFORM_DIR
 #echo framedir now $FrameworkDir
 
+##############