From 5996b046cc083ab3b11744e5c2c4b524da07cbdb Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 26 Mar 2012 22:06:33 -0400 Subject: [PATCH] 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. --- doc/binaries_note.txt | 32 +++++------------- .../short_path.exe | Bin scripts/generator/vis_stu_vars.sh | 4 +-- 3 files changed, 11 insertions(+), 25 deletions(-) rename production/{win32_help => win32_helper}/short_path.exe (100%) diff --git a/doc/binaries_note.txt b/doc/binaries_note.txt index 522af189..7c6b4355 100644 --- 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_helper/short_path.exe similarity index 100% rename from production/win32_help/short_path.exe rename to production/win32_helper/short_path.exe diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh index bb5dbc01..670c04ca 100755 --- 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). -- 2.34.1