From 68b019775510758b3175e4a8fb5498fe8a30f88d Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 06 Aug 2005 13:56:39 +0000
Subject: fixed XP uninstall and prepared for 1.2 release

git-svn-id: http://svn.klever.net/kin/klog/trunk@136 fe716a7a-6dde-0310-88d9-d003556173a8
---
diff --git a/KTAGS b/KTAGS
index 81b6fc2..9a783e1 100644
--- a/KTAGS
+++ b/KTAGS
@@ -2,7 +2,7 @@ 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
diff --git a/help/klog.rtf b/help/klog.rtf
index 0f72570..6be99a3 100644
--- a/help/klog.rtf
+++ b/help/klog.rtf
@@ -29,8 +29,9 @@ ${\footnote About KLog}
 \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
diff --git a/help/klog.xml b/help/klog.xml
index 08daf61..c5863a0 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -9,8 +9,9 @@
   <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>
diff --git a/install/install.cpp b/install/install.cpp
index 81d5a7e..82811b9 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,7 +1,8 @@
 #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)
@@ -63,6 +64,12 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
 	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);
 
diff --git a/install/install.rc b/install/install.rc
index cee7f66..2de75ab 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -131,8 +131,8 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 //
 
 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
@@ -149,13 +149,13 @@ BEGIN
         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"
diff --git a/klog.mak b/klog.mak
index 323d0a4..96fe85a 100644
--- a/klog.mak
+++ b/klog.mak
@@ -1198,29 +1198,41 @@ 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)
 
 
diff --git a/klog.rc b/klog.rc
index 6685059..2cb3ce7 100644
--- a/klog.rc
+++ b/klog.rc
@@ -83,7 +83,7 @@ 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
@@ -804,8 +804,8 @@ END
 //
 
 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
@@ -822,13 +822,13 @@ BEGIN
         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"
--
cgit v0.9.0.2