derive build and revision numbers from micro version number, for Windows versioning

diff --git a/windows/build/graphviz.wxs.in b/windows/build/graphviz.wxs.in
index 177b968248be5f03fa9204dd2034d76aa2bc848c..f4d40ce39b8d4c841d23448d719f51c1cdc42a0d 100755 (executable)
--- a/windows/build/graphviz.wxs.in
+++ b/windows/build/graphviz.wxs.in
@@ -4,7 +4,7 @@
                Id="*"
                Name="Graphviz"
                Language="1033"
-               Version="@VERSION@"
+               Version="@GRAPHVIZ_VERSION_MAJOR@.@GRAPHVIZ_VERSION_MINOR@.@GRAPHVIZ_VERSION_BUILD@.@GRAPHVIZ_VERSION_REVISION@"
                Manufacturer="AT&T"
                UpgradeCode="AF1FC8C2-70F0-449C-AF20-B43545CC68D1">
                <!-- Product Id is autogenerated, so every build is a "major upgrade" -->
@@ -28,7 +28,7 @@
                <Upgrade Id="AF1FC8C2-70F0-449C-AF20-B43545CC68D1">
                        <!-- don't install over same or newer versions -->
                        <UpgradeVersion
-                               Minimum="@VERSION@"
+                               Minimum="@GRAPHVIZ_VERSION_MAJOR@.@GRAPHVIZ_VERSION_MINOR@.@GRAPHVIZ_VERSION_BUILD@.@GRAPHVIZ_VERSION_REVISION@"
                                IncludeMinimum="yes"
                                OnlyDetect="yes"
                                Language="1033"
@@ -37,7 +37,7 @@
                        <UpgradeVersion
                                Minimum="0.0.0.0"
                                IncludeMinimum="yes"
-                               Maximum="@VERSION@"
+                               Maximum="@GRAPHVIZ_VERSION_MAJOR@.@GRAPHVIZ_VERSION_MINOR@.@GRAPHVIZ_VERSION_BUILD@.@GRAPHVIZ_VERSION_REVISION@"
                                IncludeMaximum="no"
                                Language="1033"
                                Property="UPGRADEFOUND" />