Merge pull request #50 from karooma/patch-1

Joachim Marder · web-flow · commit 8a1078a1fcc3 · 2016-07-21T19:07:36.000+02:00
Update Generate.Ribbon.Markup.pas.ps1
diff --git a/Designer/Bin/Generate.Ribbon.Markup.pas.ps1 b/Designer/Bin/Generate.Ribbon.Markup.pas.ps1
@@ -73,6 +73,12 @@ function FindFileInLocation($pLocation, $pFileName)
     {
         return "${env:ProgramFiles(x86)}\Windows Kits\8.1\bin\x86\$pFileName"
     }    
+# begin modification: add the path to windows 10 sdk.
+    elseif (Test-Path "${env:ProgramFiles(x86)}\Windows Kits\10\bin\$pFileName")
+    {
+        return "${env:ProgramFiles(x86)}\Windows Kits\10\bin\x86\$pFileName"
+    }    
+# end modification.
     elseif (Test-Path "$PSScriptRoot\$pFileName")
     {
         return "$PSScriptRoot\$pFileName"
@@ -229,4 +235,4 @@ end.
 
 $pasFile.WriteLine($FileEndPart)
 $pasFile.Close()
-write-host "Ribbon pascal markup file generation successful: '$pasFilePath'"
+write-host "Ribbon pascal markup file generation successful: '$pasFilePath'"

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,12 @@ function FindFileInLocation($pLocation, $pFileName)`
`73`	`73`	`{`
`74`	`74`	`return "${env:ProgramFiles(x86)}\Windows Kits\8.1\bin\x86\$pFileName"`
`75`	`75`	`}`
	`76`	`+# begin modification: add the path to windows 10 sdk.`
	`77`	`+ elseif (Test-Path "${env:ProgramFiles(x86)}\Windows Kits\10\bin\$pFileName")`
	`78`	`+ {`
	`79`	`+ return "${env:ProgramFiles(x86)}\Windows Kits\10\bin\x86\$pFileName"`
	`80`	`+ }`
	`81`	`+# end modification.`
`76`	`82`	`elseif (Test-Path "$PSScriptRoot\$pFileName")`
`77`	`83`	`{`
`78`	`84`	`return "$PSScriptRoot\$pFileName"`
`@@ -229,4 +235,4 @@ end.`
`229`	`235`
`230`	`236`	`$pasFile.WriteLine($FileEndPart)`
`231`	`237`	`$pasFile.Close()`
`232`		`-write-host "Ribbon pascal markup file generation successful: '$pasFilePath'"`
	`238`	`+write-host "Ribbon pascal markup file generation successful: '$pasFilePath'"`