renamed win32_help folder, which seemed a bit misleading, to win32_helper.

added a better note about the one remaining binary we ship in there.

diff --git a/doc/binaries_note.txt b/doc/binaries_note.txt
index 522af189635398abcef0a0d2bc0c07977440979d..7c6b43552f42d4b86c03308e647b5b18d421112f 100644 (file)
--- a/doc/binaries_note.txt
+++ b/doc/binaries_note.txt
@@ -1,26 +1,12 @@
 
-There are a few pre-built binaries included with this code distribution.
-They originate from a few different sources.  Feel free to not trust them.
+There is one pre-built binary included with this code distribution
+in the production/win32_helper folder.  Feel free to not trust it.
 
-These apps are external to the feisty meow build...
+short_path.exe:
+  This tool is built by the feisty meow application bootstrapping process
+  (that is, by scripts/generator/bootstrap_build.sh), but unfortunately it is
+  needed *by* that process when your visual studio installation path has
+  spaces in it.  To fix this chicken & egg problem, you can manually change
+  your VC root variable (e.g. VS100COMNTOOLS) to the short path version (as
+  reported using "dir /x").
 
-production/win32_help hierarchy:
-  unzip.exe & zip.exe:
-    The zip and unzip tools are from the info-zip project.  They are somewhat
-    antiquated but still work great on the various 32-bit windows platforms.
-    These utilities are self-identified as: "Zip 2.3 (November 29th 1999)"
-    To get a more recent version of the zip utilities or build them yourself,
-    they can be found at the site: http://www.info-zip.org/
-
-  short_path.exe:
-    This tool is built by the code bootstrapping process (that is, by
-    scripts/generator/bootstrap_build.sh), but unfortunately it is
-    desperately needed for windows builds to work nicely with clam and
-    bash.  If you don't have it, and your visual studio installation path
-    has spaces in it, then you may have trouble bootstrapping.  You can
-    manually change your VC root variable to a short path version, as
-    reported by dir /x).  This tool can be replaced by any newer working
-    version created by a bootstrap build.
-
-  zap_process.exe
-    A win32 tool that kills any process containing the name provided.

diff --git a/production/win32_help/short_path.exe b/production/win32_help/short_path.exe
deleted file mode 100644 (file)
index c5b445f..0000000
Binary files a/production/win32_help/short_path.exe and /dev/null differ

diff --git a/production/win32_helper/short_path.exe b/production/win32_helper/short_path.exe
new file mode 100644 (file)
index 0000000..c5b445f
Binary files /dev/null and b/production/win32_helper/short_path.exe differ

diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh
index bb5dbc014b42339cd1deb84855a76f5773e5a240..670c04ca256c91b11b36da6048f3f3eab2cfc84e 100755 (executable)
--- a/scripts/generator/vis_stu_vars.sh
+++ b/scripts/generator/vis_stu_vars.sh
@@ -12,8 +12,8 @@ function print_usage {
   echo ""
 }
 
-chmod 755 $PRODUCTION_DIR/win32_help/*.exe
-export PATH=$PRODUCTION_DIR/win32_help:$PATH
+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).