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,65 +1,73 @@
 #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");

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

 STRING path = REQUESTPATH("  " KINAME,"Note: KINSole program file will be installed into your windows directory so that you can rely on it's presence in your search path\nEnter destination path:",qPath);

         if(!path)

                 return NULL;

 STRING winDir(_MAX_PATH);

 

         GetWindowsDirectory(winDir,_MAX_PATH);

         INSTALLFILE("KINSole.ex_",winDir,"KINSole.exe");

         MAKE_PATH(path);

 STRING shortPath = GET_SHORT_PATH(path);

         if(!shortPath){

                 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);

                 return FALSE;

         }

         if(!(

                 INSTALLFILE("KINSole.hl_",path,"KINSole.hlp") && 

                 INSTALLFILE("KINSole.cn_",path,"KINSole.cnt")

         )){

                 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);

                 return FALSE;

         }

         ADDMENU("Klever Group","KINSole Help",path,SKINAME ".hlp");

         strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path",path);

         strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);

 FILE* inf=CREATE_INF_FILE(path, SKINAME ".INF");

         if(!inf){

                 MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK);

                 return FALSE;

         }

         INF_FILE_HEADER(inf);

         INF_FILE_SECTION(inf,"Uninstall");

         fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");

 

         INF_FILE_SECTION(inf,"kFiles");

         INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath);

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

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

 

         INF_REMOVE_ROOT(inf,SKINAME "WFiles",winDir);

         INF_REMOVE_FILE(inf,SKINAME "WFiles",SKINAME ".exe");

 

         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,"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
@@ -86,97 +86,97 @@ BEGIN
         BOTTOMMARGIN, 66

         HORZGUIDE, 37

     END

 END

 #endif    // APSTUDIO_INVOKED

 

 

 #ifdef APSTUDIO_INVOKED

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

 //

 // TEXTINCLUDE

 //

 

 1 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "resource.h\0"

 END

 

 2 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

 3 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""custom.rch""\0"

 END

 

 #endif    // APSTUDIO_INVOKED

 

 

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

 //

 // Icon

 //

 

 // 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,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

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

 END

 

 #endif    // !_MAC

 

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

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

 

 

 

 #ifndef APSTUDIO_INVOKED

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

 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

 #include "custom.rch"

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

 #endif    // not APSTUDIO_INVOKED