Record the result of Build in configuration.xml.

diff --git a/winbuild/BuildAll.ps1 b/winbuild/BuildAll.ps1
index 39e695f644df244f686cbe22a1ed00adcd656a92..c719c39177377e1466d83d3b9e98d32a2ee3dcea 100755 (executable)
--- a/winbuild/BuildAll.ps1
+++ b/winbuild/BuildAll.ps1
@@ -260,18 +260,39 @@ if ($Toolset -eq $WSDK71Set) {
    $env:TARGET_CPU=""
 }
 
+$recordResult = $true
+try {
 #
 #  build 32bit dlls
 #
-if ($Platform -ieq "Win32" -or $Platform -ieq "both") {
-   buildPlatform $configInfo.Configuration.x86 "Win32"
-}
-
+   if ($Platform -ieq "Win32" -or $Platform -ieq "both") {
+       buildPlatform $configInfo.Configuration.x86 "Win32"
+       if ($LastExitCode -ne 0) {
+           $recordResult = $false
+       }
+   }
 #
 #  build 64bit dlls
 #
-if ($Platform -ieq "x64" -or $Platform -ieq "both") {
-   buildPlatform $configInfo.Configuration.x64 "x64"
+   if ($Platform -ieq "x64" -or $Platform -ieq "both") {
+       buildPlatform $configInfo.Configuration.x64 "x64"
+       if ($LastExitCode -ne 0) {
+           $recordResult = $false
+       }
+   }
+#
+#  Write the result to configuration xml
+#
+   if ($recordResult) {    
+       $configInfo.Configuration.BuildResult.Date=[string](Get-Date)
+       $configInfo.Configuration.BuildResult.VisualStudioVersion=$VisualStudioVersion
+       $configInfo.Configuration.BuildResult.PlatformToolset=$Toolset
+       $configInfo.Configuration.BuildResult.ToolsVersion=$MSToolsVersion
+       $configInfo.Configuration.BuildResult.Platform=$Platform
+       SaveConfiguration $configInfo
+   }
+} catch {
+   $error[0] | Format-List -Force 
 }
 
 Write-Host "ToolsVersion=$MSToolsVersion VisualStudioVersion=$VisualStudioVersion PlatformToolset=$Toolset"

diff --git a/winbuild/configuration.ps1 b/winbuild/configuration.ps1
index 0daabd2d7ac47eb4bb88f318c845f02bddd3781f..02a9584c444ae27f48a12308a3399ae7a0da0cb4 100755 (executable)
--- a/winbuild/configuration.ps1
+++ b/winbuild/configuration.ps1
@@ -19,7 +19,7 @@ function InitConfiguration($savePath = $configurationXmlPath)
 function global:GetConfiguration($loadPath = $configurationXmlPath)
 {
    $configInfo =  [xml] (Get-Content "$loadPath")
-   set-variable -name xmlFormatVersion -value "0.2" -option constant
+   set-variable -name xmlFormatVersion -value "0.3" -option constant
    if ($configInfo.Configuration.formatVersion -ne $xmlFormatVersion)
    {
            $xmlDoc2 = [xml](Get-Content "$configurationTemplatePath")

diff --git a/winbuild/configuration_template.xml b/winbuild/configuration_template.xml
index 8b9c58265874cf2cfaa2fa9f058f4659ab58d6a9..9f4fb0b52b741317ad9b2e5f7d24ab00120cc499 100755 (executable)
--- a/winbuild/configuration_template.xml
+++ b/winbuild/configuration_template.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<Configuration version="09.03.0200" formatVersion="0.1" vcversion="" toolset="">\r
+<Configuration version="09.03.0200" formatVersion="0.3" vcversion="" toolset="">\r
+  <title></title>\r
   <x86 disabled="no" use_libpq="yes" use_sspi="no" use_gss="no">\r
     <libpq version="">\r
       <include>default</include>\r
@@ -36,4 +37,11 @@
     <setvcvars></setvcvars>\r
     <build_macros></build_macros>\r
   </x64>\r
+  <BuildResult>\r
+    <Date></Date>\r
+    <VisualStudioVersion></VisualStudioVersion>\r
+    <PlatformToolset></PlatformToolset>\r
+    <ToolsVersion></ToolsVersion>\r
+    <Platform></Platform>\r
+  </BuildResult>\r
 </Configuration>\r