From 923e93f0becf36ae02d6807c47670760685ea22f Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Wed, 21 Sep 2016 20:20:44 -0400 Subject: [PATCH] how did these changes get lost before? they are needed for the windows builds. --- .../whole_build_package/whole_build_manifest.txt | 10 +++++----- scripts/archival/snarf_feisty_meow.pl | 2 +- scripts/clam/cpp/ms_root_dir.sh | 4 ++-- scripts/generator/vis_stu_vars.sh | 10 +++++----- scripts/winders/locate_function_in_lib.sh | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/production/setup_src/whole_build_package/whole_build_manifest.txt b/production/setup_src/whole_build_package/whole_build_manifest.txt index 4b817791..e6e16e30 100644 --- a/production/setup_src/whole_build_package/whole_build_manifest.txt +++ b/production/setup_src/whole_build_package/whole_build_manifest.txt @@ -28,7 +28,7 @@ setup_src=t binaries=t clam_bin=t packages=t -win32_helper=t +#win32_helper=t ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -171,8 +171,8 @@ source=$RUNTIME_DIR/packages target=$TARGET/runtime/packages recurse=1 -[win32_helper] -source=$PRODUCTION_DIR/win32_helper -target=$TARGET/production/win32_helper -recurse=1 +#[win32_helper] +#source=$PRODUCTION_DIR/win32_helper +#target=$TARGET/production/win32_helper +#recurse=1 diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl index 11172d0c..5afe131e 100644 --- a/scripts/archival/snarf_feisty_meow.pl +++ b/scripts/archival/snarf_feisty_meow.pl @@ -59,7 +59,7 @@ local($root) = &canonicalize("$HOME/feisty_meow"); &backup_hierarchy($snarf_file_base, $number, "$root", "production/assign_bases"); &backup_hierarchy($snarf_file_base, $number, "$root", "production/check_versions"); &backup_hierarchy($snarf_file_base, $number, "$root", "production/setup_src"); -&backup_hierarchy($snarf_file_base, $number, "$root", "production/win32_helper"); +#old &backup_hierarchy($snarf_file_base, $number, "$root", "production/win32_helper"); # now rename the file so only the unpacker can access it. &rename_archive($snarf_file); diff --git a/scripts/clam/cpp/ms_root_dir.sh b/scripts/clam/cpp/ms_root_dir.sh index 3b5e0723..6f7d21e3 100755 --- a/scripts/clam/cpp/ms_root_dir.sh +++ b/scripts/clam/cpp/ms_root_dir.sh @@ -2,7 +2,7 @@ # spits out the root directory of visual studio, calculated from the common # tools directory that always seems to be reliably set. -# code stolen from vis_stu_vars... +# code snagged from vis_stu_vars... if [ -z "$VSxTOOLS" ]; then export VSxTOOLS="$VS90COMNTOOLS" if [ -z "$VSxTOOLS" ]; then @@ -15,5 +15,5 @@ if [ -z "$VSxTOOLS" ]; then exit 33 fi -short_path "$VSxTOOLS" | sed -e 's/\\/\//g' | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' +cygpath -w -s "$VSxTOOLS" | sed -e 's/\\/\//g' | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh index 2ab5ba08..12f8a4aa 100644 --- a/scripts/generator/vis_stu_vars.sh +++ b/scripts/generator/vis_stu_vars.sh @@ -19,8 +19,8 @@ fi function setup_visual_studio_variables() { - chmod 755 $PRODUCTION_DIR/win32_helper/*.exe - export PATH="$(dos_to_unix_path $PRODUCTION_DIR)/win32_helper:$PATH" +# 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). @@ -35,14 +35,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,7 +57,7 @@ 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/' )" # guess at where we can find this damned directory in its short form. diff --git a/scripts/winders/locate_function_in_lib.sh b/scripts/winders/locate_function_in_lib.sh index be502853..6a49c1e5 100644 --- a/scripts/winders/locate_function_in_lib.sh +++ b/scripts/winders/locate_function_in_lib.sh @@ -3,7 +3,7 @@ filename="$1"; shift function_name="$1"; shift -good_path="$(short_path $filename)" +good_path="$(cygpath -w -s $filename)" #/exports dumpbin /all $good_path | grep -q -i "$function_name" -- 2.34.1