Merge pull request #29 from osmsc/2017-12-18-check_win_build

2017-12-18-windows_fix
SimVascular · Dec 18, 2017 · a5c8858 · a5c8858
2 parents 034b0f0 + c936109
commit a5c8858
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/BuildWithMake/CygwinHelpers/msvc_2010_x64 b/BuildWithMake/CygwinHelpers/msvc_2010_x64
@@ -4,12 +4,12 @@
 
 parse_reg_dir()
 {
-reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
+reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s/\r//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
 }
 
 parse_reg_dir_with_extra_space()
 {
-reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";$4="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
+reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s/\r//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";$4="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
 }
 
 export VS100COMNTOOLS=`parse_reg_dir HKLM\\\\SOFTWARE\\\\Wow6432Node\\\\Microsoft\\\\VisualStudio\\\\SxS\\\\VS7 10.0`/Common7/Tools
@@ -42,7 +42,7 @@ PATH=`cygpath "$WindowsSdkDir/bin/NETFX 4.0 Tools/x64"`\:`cygpath "$WindowsSdkDi
 
 INCLUDE=$WindowsSdkDir/include\;$INCLUDE
 LIB=$WindowsSdkDir/lib/x64\;$LIB
- 
+
 #PATH=$WindowsSdkDir/bin/x64:$PATH
 #INCLUDE=`cygpath -m "$WindowsSdkDir\Include"`\;$INCLUDE
 #echo $INCLUDE

diff --git a/BuildWithMake/CygwinHelpers/msvc_2013_x64 b/BuildWithMake/CygwinHelpers/msvc_2013_x64
@@ -4,12 +4,12 @@
 
 parse_reg_dir()
 {
-reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
+reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s/\r//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
 }
 
 parse_reg_dir_with_extra_space()
 {
-reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";$4="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
+reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s/\r//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";$4="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
 }
 
 export VisualStudioVersion=12.0

diff --git a/BuildWithMake/CygwinHelpers/parse_reg_dir.sh b/BuildWithMake/CygwinHelpers/parse_reg_dir.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -f
 # HKLM\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VS7
 
-reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
+reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s/\r//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
 
diff --git a/BuildWithMake/CygwinHelpers/parse_reg_dir_with_extra_space.sh b/BuildWithMake/CygwinHelpers/parse_reg_dir_with_extra_space.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -f
 
-reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";$4="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'
+reg query "$1" /v $2 | sed ':a;N;$!ba;s/\n//g;s/\r//g;s+\\+/+g' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}' | awk '{$1="";$2="";$3="";$4="";print}' | awk '{gsub(/^[ \t]+/,"",$0);gsub(/^[ \t]+$/,"",$0);print}'