diff options
-rw-r--r-- | .hgignore | 3 | ||||
-rw-r--r-- | configure.ac | 15 | ||||
-rw-r--r-- | finch/Makefile.am | 23 | ||||
-rw-r--r-- | finch/finch_winres.rc.in | 31 | ||||
-rw-r--r-- | finch/libfinch_winres.rc.in | 31 | ||||
-rw-r--r-- | finch/libgnt/Makefile.am | 11 | ||||
-rw-r--r-- | finch/libgnt/libgnt_winres.rc.in | 30 | ||||
-rw-r--r-- | libpurple/win32/libpurplerc.rc.in | 2 | ||||
-rw-r--r-- | pidgin/Makefile.am | 3 | ||||
-rw-r--r-- | pidgin/win32/pidgin_dll_rc.rc.in | 2 | ||||
-rw-r--r-- | pidgin/win32/pidgin_exe_rc.rc.in | 2 |
11 files changed, 141 insertions, 12 deletions
@@ -132,6 +132,9 @@ pidgin/win32/nsis/pidgin-translations.nsh$ pidgin/win32/nsis/translations pidgin/win32/pidgin_dll_rc.rc$ pidgin/win32/pidgin_exe_rc.rc$ +finch/finch_winres.rc$ +finch/libfinch_winres.rc$ +finch/libgnt/libgnt_winres.rc$ po/Makefile.in.in po/POTFILES$ po/missing diff --git a/configure.ac b/configure.ac index 059c30de05..39b97daee8 100644 --- a/configure.ac +++ b/configure.ac @@ -52,10 +52,12 @@ m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) -m4_define([gnt_lt_current], [8]) +# the last version for Finch 2 was 2.8.10, +# the first version for Finch 3 was 2.9.0 +m4_define([gnt_lt_current], [9]) m4_define([gnt_major_version], [2]) -m4_define([gnt_minor_version], [8]) -m4_define([gnt_micro_version], [10]) +m4_define([gnt_minor_version], [9]) +m4_define([gnt_micro_version], [0]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) @@ -81,10 +83,12 @@ PURPLE_MAJOR_VERSION=purple_major_version PURPLE_MINOR_VERSION=purple_minor_version PURPLE_MICRO_VERSION=purple_micro_version PURPLE_VERSION=purple_display_version +PURPLE_API_VERSION=$((purple_lt_current - purple_minor_version)) AC_SUBST(PURPLE_MAJOR_VERSION) AC_SUBST(PURPLE_MINOR_VERSION) AC_SUBST(PURPLE_MICRO_VERSION) AC_SUBST(PURPLE_VERSION) +AC_SUBST(PURPLE_API_VERSION) PURPLE_LT_VERSION_INFO="purple_lt_current:purple_micro_version:purple_minor_version" AC_SUBST(PURPLE_LT_VERSION_INFO) @@ -93,10 +97,12 @@ GNT_MAJOR_VERSION=gnt_major_version GNT_MINOR_VERSION=gnt_minor_version GNT_MICRO_VERSION=gnt_micro_version GNT_VERSION=gnt_display_version +GNT_API_VERSION=$((gnt_lt_current - gnt_minor_version)) AC_SUBST(GNT_MAJOR_VERSION) AC_SUBST(GNT_MINOR_VERSION) AC_SUBST(GNT_MICRO_VERSION) AC_SUBST(GNT_VERSION) +AC_SUBST(GNT_API_VERSION) GNT_LT_VERSION_INFO="gnt_lt_current:gnt_micro_version:gnt_minor_version" AC_SUBST(GNT_LT_VERSION_INFO) @@ -3107,9 +3113,12 @@ AC_CONFIG_FILES([Makefile share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc + finch/finch_winres.rc + finch/libfinch_winres.rc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc + finch/libgnt/libgnt_winres.rc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in diff --git a/finch/Makefile.am b/finch/Makefile.am index f444b38178..7d56f3494a 100644 --- a/finch/Makefile.am +++ b/finch/Makefile.am @@ -71,7 +71,8 @@ libfinchinclude_HEADERS = \ $(libfinch_la_headers) libfinch_la_DEPENDENCIES = @LIBOBJS@ -libfinch_la_LDFLAGS = -export-dynamic -no-undefined +libfinch_la_LDFLAGS = -export-dynamic -no-undefined \ + -version-info $(PURPLE_LT_VERSION_INFO) libfinch_la_LIBADD = \ @LIBOBJS@ \ $(DBUS_LIBS) \ @@ -83,14 +84,26 @@ libfinch_la_LIBADD = \ ./libgnt/libgnt.la \ $(top_builddir)/libpurple/libpurple.la +finch_DEPENDENCIES = $(builddir)/libfinch.la +finch_LDFLAGS = -export-dynamic +finch_LDADD = $(builddir)/libfinch.la $(libfinch_la_LIBADD) + if IS_WIN32 libfinch_la_LIBADD += \ -lwinmm -endif -finch_DEPENDENCIES = $(builddir)/libfinch.la -finch_LDFLAGS = -export-dynamic -finch_LDADD = $(builddir)/libfinch.la $(libfinch_la_LIBADD) +.rc.o: %.rc + $(AM_V_GEN)$(WINDRES) -I$(top_srcdir)/libpurple -i $< -o $@ + +FINCH_WIN32RES = finch_winres.o +finch_DEPENDENCIES += $(FINCH_WIN32RES) +finch_LDFLAGS += -Wl,$(FINCH_WIN32RES) + +LIBFINCH_WIN32RES = libfinch_winres.o +libfinch_la_DEPENDENCIES += $(LIBFINCH_WIN32RES) +libfinch_la_LDFLAGS += -Wl,$(LIBFINCH_WIN32RES) + +endif AM_CPPFLAGS = \ -DSTANDALONE \ diff --git a/finch/finch_winres.rc.in b/finch/finch_winres.rc.in new file mode 100644 index 0000000000..59fb599456 --- /dev/null +++ b/finch/finch_winres.rc.in @@ -0,0 +1,31 @@ +#include <winver.h> +#include "version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0 + PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0 + FILEFLAGSMASK 0 + FILEFLAGS 0 + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "The Pidgin developer community" + VALUE "FileDescription", "Finch instant messenger" + VALUE "FileVersion", "@PURPLE_VERSION@" + VALUE "InternalName", "finch" + VALUE "LegalCopyright", "Copyright (C) 1998-2014 The Pidgin developer community (See the COPYRIGHT file in the source distribution)." + VALUE "OriginalFilename", "finch.exe" + VALUE "ProductName", "Finch" + VALUE "ProductVersion", "@PURPLE_VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END diff --git a/finch/libfinch_winres.rc.in b/finch/libfinch_winres.rc.in new file mode 100644 index 0000000000..5035c41f66 --- /dev/null +++ b/finch/libfinch_winres.rc.in @@ -0,0 +1,31 @@ +#include <winver.h> +#include "version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0 + PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0 + FILEFLAGSMASK 0 + FILEFLAGS 0 + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "The Pidgin developer community" + VALUE "FileDescription", "Finch UI library" + VALUE "FileVersion", "@PURPLE_VERSION@" + VALUE "InternalName", "libfinch" + VALUE "LegalCopyright", "Copyright (C) 1998-2014 The Pidgin developer community (See the COPYRIGHT file in the source distribution)." + VALUE "OriginalFilename", "libfinch-@PURPLE_API_VERSION@.dll" + VALUE "ProductName", "Finch" + VALUE "ProductVersion", "@PURPLE_VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am index c65637123a..00fd3b0c7f 100644 --- a/finch/libgnt/Makefile.am +++ b/finch/libgnt/Makefile.am @@ -91,6 +91,17 @@ libgnt_la_LIBADD = \ $(LIBXML_LIBS) \ $(PY_LIBS) +if IS_WIN32 + +.rc.o: %.rc + $(AM_V_GEN)$(WINDRES) -i $< -o $@ + +LIBGNT_WIN32RES = libgnt_winres.o +libgnt_la_DEPENDENCIES += $(LIBGNT_WIN32RES) +libgnt_la_LDFLAGS += -Wl,$(LIBGNT_WIN32RES) + +endif + AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GNT_CFLAGS) \ diff --git a/finch/libgnt/libgnt_winres.rc.in b/finch/libgnt/libgnt_winres.rc.in new file mode 100644 index 0000000000..55b831b947 --- /dev/null +++ b/finch/libgnt/libgnt_winres.rc.in @@ -0,0 +1,30 @@ +#include <winver.h> + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @GNT_MAJOR_VERSION@,@GNT_MINOR_VERSION@,@GNT_MICRO_VERSION@,0 + PRODUCTVERSION @GNT_MAJOR_VERSION@,@GNT_MINOR_VERSION@,@GNT_MICRO_VERSION@,0 + FILEFLAGSMASK 0 + FILEFLAGS 0 + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "The Pidgin developer community" + VALUE "FileDescription", "Glib ncurses toolkit" + VALUE "FileVersion", "@GNT_VERSION@" + VALUE "InternalName", "libgnt" + VALUE "LegalCopyright", "Copyright (C) 1998-2014 The Pidgin developer community (See the COPYRIGHT file in the source distribution)." + VALUE "OriginalFilename", "libgnt-@GNT_API_VERSION@.dll" + VALUE "ProductName", "libgnt" + VALUE "ProductVersion", "@GNT_VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END diff --git a/libpurple/win32/libpurplerc.rc.in b/libpurple/win32/libpurplerc.rc.in index 7a5299a201..d1cf51a76b 100644 --- a/libpurple/win32/libpurplerc.rc.in +++ b/libpurple/win32/libpurplerc.rc.in @@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileVersion", "@PURPLE_VERSION@" VALUE "InternalName", "libpurple" VALUE "LegalCopyright", "Copyright (C) 1998-2014 The Pidgin developer community (See the COPYRIGHT file in the source distribution)." - VALUE "OriginalFilename", "libpurple.dll" + VALUE "OriginalFilename", "libpurple-@PURPLE_API_VERSION@.dll" VALUE "ProductName", "libpurple" VALUE "ProductVersion", "@PURPLE_VERSION@" END diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am index a0bd63c92b..4b25a8105e 100644 --- a/pidgin/Makefile.am +++ b/pidgin/Makefile.am @@ -191,7 +191,8 @@ CLEANFILES = gtkdebug.html.h gtkdebug.c: gtkdebug.html.h libpidgin_la_DEPENDENCIES = @LIBOBJS@ $(LIBPIDGIN_WIN32RES) -libpidgin_la_LDFLAGS = -export-dynamic -no-undefined $(LIBPIDGIN_WIN32RES_LDFLAGS) +libpidgin_la_LDFLAGS = -export-dynamic -no-undefined \ + -version-info $(PURPLE_LT_VERSION_INFO) $(LIBPIDGIN_WIN32RES_LDFLAGS) libpidgin_la_LIBADD = \ @LIBOBJS@ \ $(GLIB_LIBS) \ diff --git a/pidgin/win32/pidgin_dll_rc.rc.in b/pidgin/win32/pidgin_dll_rc.rc.in index 9fd203e553..5b221c9223 100644 --- a/pidgin/win32/pidgin_dll_rc.rc.in +++ b/pidgin/win32/pidgin_dll_rc.rc.in @@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileVersion", "@PURPLE_VERSION@" VALUE "InternalName", "libpidgin" VALUE "LegalCopyright", "Copyright (C) 1998-2014 The Pidgin developer community (See the COPYRIGHT file in the source distribution)." - VALUE "OriginalFilename", "pidgin.dll" + VALUE "OriginalFilename", "libpidgin-@PURPLE_API_VERSION@.dll" VALUE "ProductName", "Pidgin" VALUE "ProductVersion", "@PURPLE_VERSION@" END diff --git a/pidgin/win32/pidgin_exe_rc.rc.in b/pidgin/win32/pidgin_exe_rc.rc.in index cfa34d15d4..f8511d4c18 100644 --- a/pidgin/win32/pidgin_exe_rc.rc.in +++ b/pidgin/win32/pidgin_exe_rc.rc.in @@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO BLOCK "040904B0" BEGIN VALUE "CompanyName", "The Pidgin developer community" - VALUE "FileDescription", "Pidgin" + VALUE "FileDescription", "Pidgin instant messenger" VALUE "FileVersion", "@PURPLE_VERSION@" VALUE "InternalName", "pidgin" VALUE "LegalCopyright", "Copyright (C) 1998-2014 The Pidgin developer community (See the COPYRIGHT file in the source distribution)." |