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

osmsc · web-flow · commit a5c88589f046 · 2017-12-18T13:57:26.000-08:00
2017-12-18-windows_fix
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}'
 

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`
`5`	`5`	`parse_reg_dir()`
`6`	`6`	`{`
`7`		`-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}'`
	`7`	`+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}'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`parse_reg_dir_with_extra_space()`
`11`	`11`	`{`
`12`		`-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}'`
	`12`	`+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}'`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	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
`42`	`42`
`43`	`43`	`INCLUDE=$WindowsSdkDir/include\;$INCLUDE`
`44`	`44`	`LIB=$WindowsSdkDir/lib/x64\;$LIB`
`45`		`-`
	`45`	`+`
`46`	`46`	`#PATH=$WindowsSdkDir/bin/x64:$PATH`
`47`	`47`	#INCLUDE=`cygpath -m "$WindowsSdkDir\Include"`\;$INCLUDE
`48`	`48`	`#echo $INCLUDE`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`#!/bin/sh -f`
`2`	`2`
`3`		`-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}'`
	`3`	`+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}'`
`4`	`4`