# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1528215716 -3600
# Node ID 9f4b672bd85c66feb629086bedc98fdceb419870
# Parent  bd272d15bea44a1509b609475683e35298379666
Fix bug with patch levels in version numbers

diff -r bd272d15bea4 -r 9f4b672bd85c app-manager/manifest.xml.in
--- a/app-manager/manifest.xml.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/app-manager/manifest.xml.in	Tue Jun 05 17:21:56 2018 +0100
@@ -2,7 +2,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
-    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
+    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
     name="The plover development team.plover.app-manager" type="win32"
     processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
   <description>Application Manager</description>
diff -r bd272d15bea4 -r 9f4b672bd85c app-manager/resources.rc.in
--- a/app-manager/resources.rc.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/app-manager/resources.rc.in	Tue Jun 05 17:21:56 2018 +0100
@@ -7,9 +7,9 @@
 
 VS_VERSION_INFO VERSIONINFO
     FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     FILEOS VOS__WINDOWS32
     FILETYPE VFT_APP
     {
diff -r bd272d15bea4 -r 9f4b672bd85c configure.ac
--- a/configure.ac	Fri Jun 01 17:19:01 2018 +0100
+++ b/configure.ac	Tue Jun 05 17:21:56 2018 +0100
@@ -34,24 +34,14 @@
 ])
 AM_INIT_AUTOMAKE(no-define parallel-tests)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-case $VERSION in
-  *.*.*)
-    AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]])
-    AC_SUBST(PLOVER_MINOR_VERSION,
-      [[`echo $VERSION | sed 's/[^.]*\.\([^.]*\)\..*/\1/'`]])
-    AC_SUBST(PLOVER_MICRO_VERSION,[[`echo $VERSION | sed 's/.*\.\([^.]*\)/\1/'`]])      ;;
-  *.*)
-    AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]])
-    AC_SUBST(PLOVER_MINOR_VERSION,
-      [[`echo $VERSION | sed 's/[^.]*\.\([^.]*\)/\1/'`]])
-    AC_SUBST(PLOVER_MICRO_VERSION,0)
-    ;;
-  *)
-    AC_SUBST(PLOVER_MAJOR_VERSION,0)
-    AC_SUBST(PLOVER_MINOR_VERSION,0)
-    AC_SUBST(PLOVER_MICRO_VERSION,0)
-    ;;
-esac
+AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | \
+  sed -e 's/^[^.]*$/0/' -e 's/\..*//'`]])
+AC_SUBST(PLOVER_MINOR_VERSION,[[`echo $VERSION | \
+  sed -e 's/.*/&.0.0/' -e 's/[^.]*\.\([^.]*\)\..*/\1/'`]])
+AC_SUBST(PLOVER_MICRO_VERSION,[[`echo $VERSION | \
+  sed -e 's/.*/&.0.0.0/' -e 's/\([^.]*\.\)\{2\}\([^.]*\)\..*/\2/'`]])
+AC_SUBST(PLOVER_PATCH_LEVEL,[[`echo $VERSION | \
+  sed -e 's/.*/&.0.0.0.0/' -e 's/\([^.]*\.\)\{3\}\([^.]*\)\..*/\2/'`]])
 AC_CANONICAL_HOST
 AC_SUBST(HOST_OS,$host_os)
 AC_SUBST(HOST_CPU,$host_cpu)
diff -r bd272d15bea4 -r 9f4b672bd85c plover-open/manifest.xml.in
--- a/plover-open/manifest.xml.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/plover-open/manifest.xml.in	Tue Jun 05 17:21:56 2018 +0100
@@ -2,7 +2,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
-    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
+    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
     name="The plover development team.plover.plover-open" type="win32"
     processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
   <description>Package Handler</description>
diff -r bd272d15bea4 -r 9f4b672bd85c plover-open/resources.rc.in
--- a/plover-open/resources.rc.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/plover-open/resources.rc.in	Tue Jun 05 17:21:56 2018 +0100
@@ -7,9 +7,9 @@
 
 VS_VERSION_INFO VERSIONINFO
     FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     FILEOS VOS__WINDOWS32
     FILETYPE VFT_APP
     {
diff -r bd272d15bea4 -r 9f4b672bd85c pre-inst/manifest.xml.in
--- a/pre-inst/manifest.xml.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/pre-inst/manifest.xml.in	Tue Jun 05 17:21:56 2018 +0100
@@ -2,7 +2,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
-    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
+    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
     name="The plover development team.plover.pre-inst" type="win32"
     processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
   <description>Plover pre-inst program</description>
diff -r bd272d15bea4 -r 9f4b672bd85c pre-inst/resources.rc.in
--- a/pre-inst/resources.rc.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/pre-inst/resources.rc.in	Tue Jun 05 17:21:56 2018 +0100
@@ -7,9 +7,9 @@
 
 VS_VERSION_INFO VERSIONINFO
     FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     FILEOS VOS__WINDOWS32
     FILETYPE VFT_APP
     {
diff -r bd272d15bea4 -r 9f4b672bd85c setup/manifest.xml.in
--- a/setup/manifest.xml.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/setup/manifest.xml.in	Tue Jun 05 17:21:56 2018 +0100
@@ -2,7 +2,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
-    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
+    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
     name="The plover development team.plover.setup" type="win32"
     processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
   <description>Plover setup program</description>
diff -r bd272d15bea4 -r 9f4b672bd85c setup/resources.rc.in
--- a/setup/resources.rc.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/setup/resources.rc.in	Tue Jun 05 17:21:56 2018 +0100
@@ -7,9 +7,9 @@
 
 VS_VERSION_INFO VERSIONINFO
     FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     FILEOS VOS__WINDOWS32
     FILETYPE VFT_APP
     {
diff -r bd272d15bea4 -r 9f4b672bd85c update/manifest.xml.in
--- a/update/manifest.xml.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/update/manifest.xml.in	Tue Jun 05 17:21:56 2018 +0100
@@ -2,7 +2,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
-    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
+    version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
     name="The plover development team.plover.update" type="win32"
     processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
   <description>Plover update program</description>
diff -r bd272d15bea4 -r 9f4b672bd85c update/resources.rc.in
--- a/update/resources.rc.in	Fri Jun 01 17:19:01 2018 +0100
+++ b/update/resources.rc.in	Tue Jun 05 17:21:56 2018 +0100
@@ -7,9 +7,9 @@
 
 VS_VERSION_INFO VERSIONINFO
     FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
-      @PLOVER_MICRO_VERSION@,0
+      @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
     FILEOS VOS__WINDOWS32
     FILETYPE VFT_APP
     {