From a457f7a3e153039f02d677f8f154c6a863da9b2c Mon Sep 17 00:00:00 2001 From: Stefan Gehn Date: Wed, 15 Sep 2010 16:14:11 +0000 Subject: [PATCH] INSTALL: Slightly update win32 build instructions ChangeLog: Add and clarify win32-related changes win32-resource.rc: Bump version number to 2.3.5 --- Changelog | 8 +++++--- INSTALL | 8 ++++---- server/win32-resource.rc | 6 +++--- src/win32-resource.rc | 6 +++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Changelog b/Changelog index e83c3c7..147ab4f 100644 --- a/Changelog +++ b/Changelog @@ -7,7 +7,8 @@ GKrellM Changelog g_debug(), g_warning(). - Replace sprintf() calls with snprintf(). - Use glib gstdio to replace unix calls: fopen()->g_fopen(), etc. - - Use glib mutex functions for portability. + - Use glib mutex functions for portability when building with + GnuTLS. - Fix IMAP login by escaping backslash and double-quotes in username, password and mailbox strings. - Fix initial sending of fstab entries in gkrellmd, fstab was only @@ -17,12 +18,13 @@ GKrellM Changelog - Makefile: Drop duplicating SMC_LIBS in "netbsd" targets by calling src/Makefile with "netbsd" target instead of using the generic "gkrellm" target. - - Make "-d" commandline option the short version for "--detach" - instead of for "--debug-level". + - gkrellmd: Make "-d" commandline option the short version + for "--detach" instead of for "--debug-level". - Enable IPv6-support on win32 if target os is windows xp or newer. - Support monitoring of active IPv6 TCP connections on windows vista or newer. - Fix building with mingw-w64 environment. + - Fix time formatting on win32 for monthly network statistics * Patch from Stefan Gehn: add searching for linux sensors directly below hwmon dir since kernel is putting newer devices there. * Patch from Hajimu Umemoto: FreeBSD memory usage calculation update. diff --git a/INSTALL b/INSTALL index 1162483..4ee8476 100644 --- a/INSTALL +++ b/INSTALL @@ -81,19 +81,19 @@ Note: install_solaris makes gkrellm setgid sys so it can be run non-root, ie: (see below for additional Solaris install notes) -Windows: 2000 SP4 / XP SP1 / Vista SP2 +Windows (needs Windows XP or newer) --------------------------------------- make windows make INSTALLROOT=C:\gkrellm install_windows See: - http://www.srcbox.net/projects/gkrellm/ + http://www.srcbox.net/projects/gkrellm/ Needed software for building gkrellm on win32 systems: - MinGW - - MSYS (gkrellm Makefiles are NOT compatible with cmd.exe) + - MSYS (gkrellm makefiles are NOT compatible with cmd.exe) - GTK >= 2.4 Development files (see http://www.gtk.org/download-windows.html) - - OpenSSL (optional), GnuTLS is not recommended on win32 + - OpenSSL or GnuTLS (optional) - libntlm (optional) Note: Installing gkrellm on windows needs INSTALLROOT set, the default path diff --git a/server/win32-resource.rc b/server/win32-resource.rc index 1dbdd00..258b1e3 100644 --- a/server/win32-resource.rc +++ b/server/win32-resource.rc @@ -11,7 +11,7 @@ // LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 VERSIONINFO - FILEVERSION 2,3,4,0 + FILEVERSION 2,3,5,0 PRODUCTVERSION 0,0,0,0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP @@ -22,12 +22,12 @@ BEGIN BEGIN VALUE "CompanyName", "" VALUE "FileDescription", "GKrellM Daemon" - VALUE "FileVersion", "2.3.4" + VALUE "FileVersion", "2.3.5" VALUE "InternalName", "gkrellmd" VALUE "LegalCopyright", "Copyright (C) 1999-2010 Bill Wilson" VALUE "OriginalFilename", "gkrellmd.exe" VALUE "ProductName", "GKrellM" - VALUE "ProductVersion", "2.3.4" + VALUE "ProductVersion", "2.3.5" END END BLOCK "VarFileInfo" diff --git a/src/win32-resource.rc b/src/win32-resource.rc index 6cf3835..d15b26f 100644 --- a/src/win32-resource.rc +++ b/src/win32-resource.rc @@ -18,7 +18,7 @@ IDI_ICON3 ICON "gkrellm.ico" // LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 VERSIONINFO - FILEVERSION 2,3,4,0 + FILEVERSION 2,3,5,0 PRODUCTVERSION 0,0,0,0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP @@ -29,12 +29,12 @@ BEGIN BEGIN VALUE "CompanyName", "" VALUE "FileDescription", "GKrellM" - VALUE "FileVersion", "2.3.4" + VALUE "FileVersion", "2.3.5" VALUE "InternalName", "gkrellm" VALUE "LegalCopyright", "Copyright (C) 1999-2010 Bill Wilson" VALUE "OriginalFilename", "gkrellm.exe" VALUE "ProductName", "GKrellM" - VALUE "ProductVersion", "2.3.4" + VALUE "ProductVersion", "2.3.5" END END BLOCK "VarFileInfo"