diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-06-27 07:09:31 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-07-04 11:17:28 -0400 |
| commit | c3975c6e987708c296e172f1018bccb9b66f6d11 (patch) | |
| tree | 9d5f9bab15ff3aa55829a8c12fe570f90e489f0b | |
| parent | b64dab6fe71cbbb5d250abe2fdfef9773c858415 (diff) | |
| download | pango-c3975c6e987708c296e172f1018bccb9b66f6d11.tar.gz | |
Windows: Fix up version resource
Make sure the version variables are correct in the resource file template,
and make up for those that we did not put in to pango_conf in meson.build.
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | pango2/pango.rc.in | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 4634faa7..24a220b6 100644 --- a/meson.build +++ b/meson.build @@ -35,6 +35,7 @@ endif pango_interface_age = pango_minor_version.is_odd() ? 0 : pango_micro_version pango_binary_age = api_minor * 100 + pango_micro_version +pango_current_age = pango_binary_age - pango_interface_age + 1 pango_api_version = '@0@.0'.format(api_major) pango_api_name = 'pango2-@0@'.format(pango_api_version) @@ -42,7 +43,9 @@ pango_api_path = join_paths(pango_api_name, 'pango2') pango_conf = configuration_data() +pango_conf.set('PANGO2_API_VERSION', pango_api_version) pango_conf.set('PANGO2_BINARY_AGE', pango_binary_age) +pango_conf.set('PANGO_CURRENT_MINUS_AGE', pango_current_age) pango_conf.set('PANGO2_INTERFACE_AGE', pango_interface_age) pango_conf.set('PANGO2_VERSION_MAJOR', pango_major_version) pango_conf.set('PANGO2_VERSION_MINOR', pango_minor_version) @@ -51,8 +54,7 @@ pango_conf.set('PANGO2_VERSION_MICRO', pango_micro_version) # Maintain version scheme with libtool pango_soversion = 0 pango_libversion = '@0@.@1@.@2@'.format(pango_soversion, (pango_binary_age - pango_interface_age), pango_interface_age) -osx_current = pango_binary_age - pango_interface_age + 1 -pango_osxversion = [osx_current, '@0@.@1@.0'.format(osx_current, pango_interface_age)] +pango_osxversion = [pango_current_age, '@0@.@1@.0'.format(pango_current_age, pango_interface_age)] cc = meson.get_compiler('c') cxx = meson.get_compiler('cpp') diff --git a/pango2/pango.rc.in b/pango2/pango.rc.in index 3af81445..ffb774ea 100644 --- a/pango2/pango.rc.in +++ b/pango2/pango.rc.in @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0 - PRODUCTVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0 + FILEVERSION @PANGO2_VERSION_MAJOR@,@PANGO2_VERSION_MINOR@,@PANGO2_VERSION_MICRO@,0 + PRODUCTVERSION @PANGO2_VERSION_MAJOR@,@PANGO2_VERSION_MINOR@,@PANGO2_VERSION_MICRO@,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -14,13 +14,13 @@ VS_VERSION_INFO VERSIONINFO BLOCK "040904B0" BEGIN VALUE "CompanyName", "Red Hat Software" - VALUE "FileDescription", "Pango" - VALUE "FileVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@.0" - VALUE "InternalName", "pango-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@" + VALUE "FileDescription", "Pango2" + VALUE "FileVersion", "@PANGO2_VERSION_MAJOR@.@PANGO2_VERSION_MINOR@.@PANGO2_VERSION_MICRO@.0" + VALUE "InternalName", "pango2-@PANGO2_API_VERSION@-@PANGO2_CURRENT_MINUS_AGE@" VALUE "LegalCopyright", "Copyright 1999 Red Hat Software." - VALUE "OriginalFilename", "pango-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll" - VALUE "ProductName", "Pango" - VALUE "ProductVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@" + VALUE "OriginalFilename", "pango2-@PANGO2_API_VERSION@-@PANGO2_CURRENT_MINUS_AGE@.dll" + VALUE "ProductName", "Pango2" + VALUE "ProductVersion", "@PANGO2_VERSION_MAJOR@.@PANGO2_VERSION_MINOR@.@PANGO2_VERSION_MICRO@" END END BLOCK "VarFileInfo" |