fixed XP uninstall and prepared for 1.2 releaseHEAD1.2master

git-svn-id: http://svn.klever.net/kin/klog/trunk@136 fe716a7a-6dde-0310-88d9-d003556173a8

7 files changed, 38 insertions, 17 deletions

diff --git a/KTAGS b/KTAGS
index 81b6fc2..9a783e1 100644
--- a/KTAGS
+++ b/KTAGS
@@ -1,12 +1,12 @@
 about-date	klog.rc	/LTEXT\s\+"Copyright /;"	kind:d
 about-version	klog.rc	/LTEXT\s\+"KLog, Version /;"	kind:v
 help-license-date	./help/klog.xml	/<license\s/;"	kind:d
 help-news	./help/klog.xml	/<newsfor\s/
-install-version	./install/install.cpp	/^#define\s\+KINAME\s\+"/;"	kind:v
+install-version	./install/install.cpp	/^#define\s\+VERSION\s\+"/;"	kind:v
 install-vsinfo-date	install/install.rc	/^\s\+VALUE\s\+"LegalCopyright",/;"	kind:d
 install-vsinfo-numeric-version	install/install.rc	/^\s\+FILEVERSION\s\+/;"	kind:v
 install-vsinfo-string-version	install/install.rc	/^\s\+VALUE\s\+"FileVersion",/;"	kind:v
 license-date	COPYING	:1;"	kind:d
 vsinfo-date	klog.rc	/VALUE\s\+"LegalCopyright",/;"	kind:d
 vsinfo-numeric-version	klog.rc	/^\s\+FILEVERSION\s\+/;"	kind:v
 vsinfo-string-version	klog.rc	/^\s\+VALUE\s\+"FileVersion",/;"	kind:v
diff --git a/help/klog.rtf b/help/klog.rtf
index 0f72570..6be99a3 100644
--- a/help/klog.rtf
+++ b/help/klog.rtf
@@ -20,26 +20,27 @@ ${\footnote About KLog}
 \par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2005 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

 \par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

 \par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

 \par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 }

 \par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")}

 \par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")}

 \page

 

 \pard\plain

 #{\footnote News}

 ${\footnote What's New}

-\par\pard\plain\f1\fs24\qc\cf2\b 1.1.1-trunk - 

+\par\pard\plain\f1\fs24\qc\cf2\b 1.2 - August 6th, 2005

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Added vertical resizability

+\par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed uninstall procedure so that it works on XP

 \par\pard\plain\f1\fs24\qc\cf2\b 1.1 - July 11th, 2004

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Change of license and opening the source code

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Minor changes in code, mostly bugfixes

 \page

 

 \pard\plain\keepn

 #{\footnote Using}

 ${\footnote Using KLog}

 { \f1\fs18\b\sb120 Using {\b KLog}}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 When you start {\b KLog} for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the {\uldb Main Window}{\v MainWindow} section.

 \page

 

diff --git a/help/klog.xml b/help/klog.xml
index 08daf61..c5863a0 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>

 <winhelp>

  <topic id="About" title="About KLog">

   <heading scroll="no">Abotu <kin>KLog</kin></heading>

   <p><kin>KLog</kin> is our <term>Win32</term> implementation of <product>*nix</product> <term>syslog</term> daemon to support remote logging of messages from <product>unix</product> servers, routers, terminal servers and other syslog-enabled devices/applications.</p>

   <p/>

   <p><b><i>Enjoy!</i></b></p>

   <license years="1998-2005"/>

   <credits/>

  </topic>

  <topic id="News" title="What's New">

-  <newsfor version="1.1.1-trunk">

+  <newsfor version="1.2" date="August 6th, 2005">

    <ni>Added vertical resizability</ni>

+   <ni>Fixed uninstall procedure so that it works on XP</ni>

   </newsfor>

   <newsfor version="1.1" date="July 11th, 2004">

    <ni>Change of license and opening the source code</ni>

    <ni>Minor changes in code, mostly bugfixes</ni>

   </newsfor>

  </topic>

  <topic id="Using" title="Using KLog">

   <heading scroll="no">Using <kin>KLog</kin></heading>

   <p>When you start <kin>KLog</kin> for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the <a href="#MainWindow">Main Window</a> section.</p>

  </topic>

  <topic id="MainWindow" title="Main Window">

   <heading scroll="no">Main Window</heading>

diff --git a/install/install.cpp b/install/install.cpp
index 81d5a7e..82811b9 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,16 +1,17 @@
 #include "resource.h"
 #include "../shared-code/install.h"
 

-#define	KINAME	"KLog 1.1.1-trunk"

+#define VERSION "1.2"

+#define	KINAME	"KLog " VERSION

 #define SKINAME	"KLog"

 
 BOOL Install(void)
 {
 STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path");

 STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");

 LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");

 STRING path = REQUESTPATH("  " KINAME,"\nEnter destination path:",qPath);

 	if(!path)

 		return NULL;

 #ifdef	K_ANNED

 STRING sysDir(_MAX_PATH);

@@ -54,17 +55,23 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
 	INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe");

 	INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME);

 	INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf");

 

 	INF_FILE_SECTION(inf,"kReg");

 	INF_UNINSTALL_REG(inf,SKINAME);

 

 	INF_FILE_SECTION(inf,"kMenu");

 	INF_MENU_GROUP(inf,1,"Klever Group");

 	INF_MENU_ITEM(inf,1,SKINAME);

 	fclose(inf);

 	REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");

+    REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);

+    REG_UNINSTALL_COMMENT(SKINAME,"Klever " KINAME);

+    REG_UNINSTALL_VERSION(SKINAME,VERSION);

+    REG_UNINSTALL_LOCATION(SKINAME,path);

+    REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");

+    REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/klog/");

 

 	MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu, move it to your Startup group or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);

 

 	return TRUE;

 }
diff --git a/install/install.rc b/install/install.rc
index cee7f66..2de75ab 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -122,49 +122,49 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico"

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,1,0

- PRODUCTVERSION 1,1,1,0

+ FILEVERSION 1,2,0,0

+ PRODUCTVERSION 1,2,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x40004L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "INSTALL: KLog, logging daemon\0"

-            VALUE "FileVersion", "1, 1, 1, 0\0"

+            VALUE "FileVersion", "1, 2, 0, 0\0"

             VALUE "InternalName", "INSTALL\0"

             VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "INSTALL.EXE\0"

             VALUE "ProductName", "KLog\0"

-            VALUE "ProductVersion", "1, 1, 1, 0\0"

+            VALUE "ProductVersion", "1, 2, 0, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

diff --git a/klog.mak b/klog.mak
index 323d0a4..96fe85a 100644
--- a/klog.mak
+++ b/klog.mak
@@ -1189,47 +1189,59 @@ DEP_RSC_INSTA=\
 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Install\install.cpp

 

 !IF  "$(CFG)" == "Install - Win32 Debug"

 

+DEP_CPP_INSTAL=\

+	".\shared-code\install.h"\

+	

 

-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

 

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Pure"

 

+DEP_CPP_INSTAL=\

+	".\shared-code\install.h"\

+	

 

-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

 

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Canned"

 

+DEP_CPP_INSTAL=\

+	".\shared-code\install.h"\

+	

 

-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

 

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Static"

 

+DEP_CPP_INSTAL=\

+	".\shared-code\install.h"\

+	

 

-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Project Dependency

 

 # Project_Dep_Name "KLog"

 

 !IF  "$(CFG)" == "Install - Win32 Debug"

diff --git a/klog.rc b/klog.rc
index 6685059..2cb3ce7 100644
--- a/klog.rc
+++ b/klog.rc
@@ -74,25 +74,25 @@ IDI_LOGPATTERN          ICON    DISCARDABLE     "res\\log-pattern.ico"
 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 70

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About KLog"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20

-    LTEXT           "KLog, Version 1.1.1-trunk",IDC_STATIC,40,16,119,8,SS_NOPREFIX

+    LTEXT           "KLog, Version 1.2",IDC_STATIC,40,16,119,8,SS_NOPREFIX

     LTEXT           "Copyright © 1998-2005 Klever Group",IDC_STATIC,40,31,

                     119,8

     DEFPUSHBUTTON   "OK",IDOK,178,13,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,125,49,85,14

 END

 

 IDD_KLOG_DIALOG DIALOGEX 0, 0, 293, 286

 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW

 CAPTION "KLog"

 FONT 8, "MS Sans Serif"

 BEGIN

@@ -795,49 +795,49 @@ BEGIN
                     BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22,

                     WS_EX_STATICEDGE

 END

 

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,1,0

- PRODUCTVERSION 1,1,0,0

+ FILEVERSION 1,2,0,0

+ PRODUCTVERSION 1,2,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "KLog, logging daemon\0"

-            VALUE "FileVersion", "1, 1, 1, 0\0"

+            VALUE "FileVersion", "1, 2, 0, 0\0"

             VALUE "InternalName", "KLOG\0"

             VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "KLOG.EXE\0"

             VALUE "ProductName", "KLog\0"

-            VALUE "ProductVersion", "1, 1, 1, 0\0"

+            VALUE "ProductVersion", "1, 2, 0, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 

 /////////////////////////////////////////////////////////////////////////////