1.1 --- a/app-manager/manifest.xml.in Fri Jun 01 17:19:01 2018 +0100
1.2 +++ b/app-manager/manifest.xml.in Tue Jun 05 17:21:56 2018 +0100
1.3 @@ -2,7 +2,7 @@
1.4 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
1.5 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
1.6 <assemblyIdentity
1.7 - version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
1.8 + version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
1.9 name="The plover development team.plover.app-manager" type="win32"
1.10 processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
1.11 <description>Application Manager</description>
2.1 --- a/app-manager/resources.rc.in Fri Jun 01 17:19:01 2018 +0100
2.2 +++ b/app-manager/resources.rc.in Tue Jun 05 17:21:56 2018 +0100
2.3 @@ -7,9 +7,9 @@
2.4
2.5 VS_VERSION_INFO VERSIONINFO
2.6 FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
2.7 - @PLOVER_MICRO_VERSION@,0
2.8 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
2.9 PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
2.10 - @PLOVER_MICRO_VERSION@,0
2.11 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
2.12 FILEOS VOS__WINDOWS32
2.13 FILETYPE VFT_APP
2.14 {
3.1 --- a/configure.ac Fri Jun 01 17:19:01 2018 +0100
3.2 +++ b/configure.ac Tue Jun 05 17:21:56 2018 +0100
3.3 @@ -34,24 +34,14 @@
3.4 ])
3.5 AM_INIT_AUTOMAKE(no-define parallel-tests)
3.6 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
3.7 -case $VERSION in
3.8 - *.*.*)
3.9 - AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]])
3.10 - AC_SUBST(PLOVER_MINOR_VERSION,
3.11 - [[`echo $VERSION | sed 's/[^.]*\.\([^.]*\)\..*/\1/'`]])
3.12 - AC_SUBST(PLOVER_MICRO_VERSION,[[`echo $VERSION | sed 's/.*\.\([^.]*\)/\1/'`]]) ;;
3.13 - *.*)
3.14 - AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]])
3.15 - AC_SUBST(PLOVER_MINOR_VERSION,
3.16 - [[`echo $VERSION | sed 's/[^.]*\.\([^.]*\)/\1/'`]])
3.17 - AC_SUBST(PLOVER_MICRO_VERSION,0)
3.18 - ;;
3.19 - *)
3.20 - AC_SUBST(PLOVER_MAJOR_VERSION,0)
3.21 - AC_SUBST(PLOVER_MINOR_VERSION,0)
3.22 - AC_SUBST(PLOVER_MICRO_VERSION,0)
3.23 - ;;
3.24 -esac
3.25 +AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | \
3.26 + sed -e 's/^[^.]*$/0/' -e 's/\..*//'`]])
3.27 +AC_SUBST(PLOVER_MINOR_VERSION,[[`echo $VERSION | \
3.28 + sed -e 's/.*/&.0.0/' -e 's/[^.]*\.\([^.]*\)\..*/\1/'`]])
3.29 +AC_SUBST(PLOVER_MICRO_VERSION,[[`echo $VERSION | \
3.30 + sed -e 's/.*/&.0.0.0/' -e 's/\([^.]*\.\)\{2\}\([^.]*\)\..*/\2/'`]])
3.31 +AC_SUBST(PLOVER_PATCH_LEVEL,[[`echo $VERSION | \
3.32 + sed -e 's/.*/&.0.0.0.0/' -e 's/\([^.]*\.\)\{3\}\([^.]*\)\..*/\2/'`]])
3.33 AC_CANONICAL_HOST
3.34 AC_SUBST(HOST_OS,$host_os)
3.35 AC_SUBST(HOST_CPU,$host_cpu)
4.1 --- a/plover-open/manifest.xml.in Fri Jun 01 17:19:01 2018 +0100
4.2 +++ b/plover-open/manifest.xml.in Tue Jun 05 17:21:56 2018 +0100
4.3 @@ -2,7 +2,7 @@
4.4 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
4.5 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
4.6 <assemblyIdentity
4.7 - version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
4.8 + version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
4.9 name="The plover development team.plover.plover-open" type="win32"
4.10 processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
4.11 <description>Package Handler</description>
5.1 --- a/plover-open/resources.rc.in Fri Jun 01 17:19:01 2018 +0100
5.2 +++ b/plover-open/resources.rc.in Tue Jun 05 17:21:56 2018 +0100
5.3 @@ -7,9 +7,9 @@
5.4
5.5 VS_VERSION_INFO VERSIONINFO
5.6 FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
5.7 - @PLOVER_MICRO_VERSION@,0
5.8 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
5.9 PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
5.10 - @PLOVER_MICRO_VERSION@,0
5.11 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
5.12 FILEOS VOS__WINDOWS32
5.13 FILETYPE VFT_APP
5.14 {
6.1 --- a/pre-inst/manifest.xml.in Fri Jun 01 17:19:01 2018 +0100
6.2 +++ b/pre-inst/manifest.xml.in Tue Jun 05 17:21:56 2018 +0100
6.3 @@ -2,7 +2,7 @@
6.4 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
6.5 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
6.6 <assemblyIdentity
6.7 - version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
6.8 + version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
6.9 name="The plover development team.plover.pre-inst" type="win32"
6.10 processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
6.11 <description>Plover pre-inst program</description>
7.1 --- a/pre-inst/resources.rc.in Fri Jun 01 17:19:01 2018 +0100
7.2 +++ b/pre-inst/resources.rc.in Tue Jun 05 17:21:56 2018 +0100
7.3 @@ -7,9 +7,9 @@
7.4
7.5 VS_VERSION_INFO VERSIONINFO
7.6 FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
7.7 - @PLOVER_MICRO_VERSION@,0
7.8 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
7.9 PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
7.10 - @PLOVER_MICRO_VERSION@,0
7.11 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
7.12 FILEOS VOS__WINDOWS32
7.13 FILETYPE VFT_APP
7.14 {
8.1 --- a/setup/manifest.xml.in Fri Jun 01 17:19:01 2018 +0100
8.2 +++ b/setup/manifest.xml.in Tue Jun 05 17:21:56 2018 +0100
8.3 @@ -2,7 +2,7 @@
8.4 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
8.5 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
8.6 <assemblyIdentity
8.7 - version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
8.8 + version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
8.9 name="The plover development team.plover.setup" type="win32"
8.10 processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
8.11 <description>Plover setup program</description>
9.1 --- a/setup/resources.rc.in Fri Jun 01 17:19:01 2018 +0100
9.2 +++ b/setup/resources.rc.in Tue Jun 05 17:21:56 2018 +0100
9.3 @@ -7,9 +7,9 @@
9.4
9.5 VS_VERSION_INFO VERSIONINFO
9.6 FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
9.7 - @PLOVER_MICRO_VERSION@,0
9.8 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
9.9 PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
9.10 - @PLOVER_MICRO_VERSION@,0
9.11 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
9.12 FILEOS VOS__WINDOWS32
9.13 FILETYPE VFT_APP
9.14 {
10.1 --- a/update/manifest.xml.in Fri Jun 01 17:19:01 2018 +0100
10.2 +++ b/update/manifest.xml.in Tue Jun 05 17:21:56 2018 +0100
10.3 @@ -2,7 +2,7 @@
10.4 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
10.5 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
10.6 <assemblyIdentity
10.7 - version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.0"
10.8 + version="@PLOVER_MAJOR_VERSION@.@PLOVER_MINOR_VERSION@.@PLOVER_MICRO_VERSION@.@PLOVER_PATCH_LEVEL@"
10.9 name="The plover development team.plover.update" type="win32"
10.10 processorArchitecture="ifelse([@HOST_CPU@],[x86_64],[ia64],[x86])" />
10.11 <description>Plover update program</description>
11.1 --- a/update/resources.rc.in Fri Jun 01 17:19:01 2018 +0100
11.2 +++ b/update/resources.rc.in Tue Jun 05 17:21:56 2018 +0100
11.3 @@ -7,9 +7,9 @@
11.4
11.5 VS_VERSION_INFO VERSIONINFO
11.6 FILEVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
11.7 - @PLOVER_MICRO_VERSION@,0
11.8 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
11.9 PRODUCTVERSION @PLOVER_MAJOR_VERSION@,@PLOVER_MINOR_VERSION@,
11.10 - @PLOVER_MICRO_VERSION@,0
11.11 + @PLOVER_MICRO_VERSION@,@PLOVER_PATCH_LEVEL@
11.12 FILEOS VOS__WINDOWS32
11.13 FILETYPE VFT_APP
11.14 {