fixed XP uninstall and prepared 1.1.1 releaseHEAD1.1.1master

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

8 files changed, 30 insertions, 17 deletions

diff --git a/COPYING b/COPYING
index 9abe63f..b71fe11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,2 +1,2 @@
-Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1998-2005 Klever Group (http://www.klever.net/)
 
diff --git a/KTAGS b/KTAGS
index dfc79bb..25b6254 100644
--- a/KTAGS
+++ b/KTAGS
@@ -2,3 +2,3 @@ help-license-date	./help/kinsole.xml	/<license\s/;"	kind:d
 help-news	./help/kinsole.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
diff --git a/help/kinsole.rtf b/help/kinsole.rtf
index f0b6c8a..f3eeb2d 100644
--- a/help/kinsole.rtf
+++ b/help/kinsole.rtf
@@ -19,3 +19,3 @@ ${\footnote About KINSole}
 {

-\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2004 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\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:

@@ -32,2 +32,4 @@ ${\footnote What's new}
 { \f1\fs18\b\sb120 What's New}

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

+\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

diff --git a/help/kinsole.xml b/help/kinsole.xml
index c08aa01..c7f7dd8 100644
--- a/help/kinsole.xml
+++ b/help/kinsole.xml
@@ -7,3 +7,3 @@
   <p><b><i>Enjoy!</i></b></p>

-  <license years="1998-2004"/>

+  <license years="1998-2005"/>

   <credits/>

@@ -12,2 +12,5 @@
   <heading scroll="no">What's New</heading>

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

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

+  </newsfor>

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

diff --git a/install/install.cpp b/install/install.cpp
index aa474d5..bbc2b3b 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -3,3 +3,4 @@
 

-#define	KINAME	"KINSole 1.1"

+#define VERSION "1.1.1"

+#define	KINAME	"KINSole " VERSION

 #define	SKINAME	"KINSole"
@@ -60,2 +61,9 @@ FILE* inf=CREATE_INF_FILE(path, SKINAME ".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/kinsole/");

+

 

diff --git a/install/install.rc b/install/install.rc
index 04ae8f4..4b81d3e 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -133,4 +133,4 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,0,0

- PRODUCTVERSION 1,1,0,0

+ FILEVERSION 1,1,1,0

+ PRODUCTVERSION 1,1,1,0

  FILEFLAGSMASK 0x3fL

@@ -151,5 +151,5 @@ BEGIN
             VALUE "FileDescription", "INSTALL: KINSole, telnet client\0"

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

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

             VALUE "InternalName", "INSTALL\0"

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

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

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

@@ -157,3 +157,3 @@ BEGIN
             VALUE "ProductName", "KINSole\0"

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

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

         END

diff --git a/kinsole.cpp b/kinsole.cpp
index 01286f3..7fa3f8b 100644
--- a/kinsole.cpp
+++ b/kinsole.cpp
@@ -18,3 +18,3 @@
 #define	DAMN_KIN_NAME		"KINSole"

-#define	DAMN_KIN_VERSION	"1.1"

+#define	DAMN_KIN_VERSION	"1.1.1"

 

@@ -552,3 +552,3 @@ usagebye:
 		printf(

-			DAMN_KIN_NAME " " DAMN_KIN_VERSION ", Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)\n\n"

+			DAMN_KIN_NAME " " DAMN_KIN_VERSION ", Copyright (c) 1998-2005 Klever Group (http://www.klever.net/)\n\n"

 			"Usage:\t" DAMN_KIN_NAME " [<options> ]<host-name/ip-address>[ <port>]\n\n"

diff --git a/kinsole.rc b/kinsole.rc
index 6e45d44..531055e 100644
--- a/kinsole.rc
+++ b/kinsole.rc
@@ -65,4 +65,4 @@ END
 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,0,0

- PRODUCTVERSION 1,1,0,0

+ FILEVERSION 1,1,1,0

+ PRODUCTVERSION 1,1,1,0

  FILEFLAGSMASK 0x3fL

@@ -83,5 +83,5 @@ BEGIN
             VALUE "FileDescription", "KINSole, telnet client\0"

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

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

             VALUE "InternalName", "KINSOLE\0"

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

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

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

@@ -89,3 +89,3 @@ BEGIN
             VALUE "ProductName", "KINSole\0"

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

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

         END