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

2 files changed, 14 insertions, 6 deletions

diff --git a/install/install.cpp b/install/install.cpp
index aa474d5..bbc2b3b 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,10 +1,11 @@
 #include "resource.h"
 #include "../shared-code/install.h"

 

-#define	KINAME	"KINSole 1.1"

+#define VERSION "1.1.1"

+#define	KINAME	"KINSole " VERSION

 #define	SKINAME	"KINSole"
 
 BOOL Install(void)
 {

 STRING tPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path");

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

@@ -55,11 +56,18 @@ FILE* inf=CREATE_INF_FILE(path, SKINAME ".INF");
 	INF_FILE_SECTION(inf,"kMenu");

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

 	INF_MENU_ITEM(inf,1,"KINSole Help");

 	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/kinsole/");

+

 

 	MessageBox(NULL,KINAME " installed successfully, you may now run it from command line, read documentation in 'Programs/Klever Group' menu or simply 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 04ae8f4..4b81d3e 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -128,14 +128,14 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 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

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

@@ -146,19 +146,19 @@ BEGIN
     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

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

             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"

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

             VALUE "ProductName", "KINSole\0"

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

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

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END