summaryrefslogtreecommitdiffabout
path: root/install
authorMichael Krelin <hacker@klever.net>2005-08-06 13:56:39 (UTC)
committer Michael Krelin <hacker@klever.net>2005-08-06 13:56:39 (UTC)
commit68b019775510758b3175e4a8fb5498fe8a30f88d (patch) (unidiff)
tree3198a2b7aeb41fed63b7e9b16a827013ede65cda /install
parentbdbe0e4fff764357d0bb6236f22d6f1dcc0548ba (diff)
downloadklog-68b019775510758b3175e4a8fb5498fe8a30f88d.zip
klog-68b019775510758b3175e4a8fb5498fe8a30f88d.tar.gz
klog-68b019775510758b3175e4a8fb5498fe8a30f88d.tar.bz2
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
Diffstat (limited to 'install') (more/less context) (ignore whitespace changes)
-rw-r--r--install/install.cpp9
-rw-r--r--install/install.rc8
2 files changed, 12 insertions, 5 deletions
diff --git a/install/install.cpp b/install/install.cpp
index 81d5a7e..82811b9 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,10 +1,11 @@
1#include "resource.h" 1#include "resource.h"
2#include "../shared-code/install.h" 2#include "../shared-code/install.h"
3 3
4 #define KINAME"KLog 1.1.1-trunk" 4#define VERSION "1.2"
5 #define KINAME"KLog " VERSION
5 #define SKINAME"KLog" 6 #define SKINAME"KLog"
6 7
7BOOL Install(void) 8BOOL Install(void)
8{ 9{
9STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path"); 10STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path");
10STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); 11STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
@@ -60,11 +61,17 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
60 61
61 INF_FILE_SECTION(inf,"kMenu"); 62 INF_FILE_SECTION(inf,"kMenu");
62 INF_MENU_GROUP(inf,1,"Klever Group"); 63 INF_MENU_GROUP(inf,1,"Klever Group");
63 INF_MENU_ITEM(inf,1,SKINAME); 64 INF_MENU_ITEM(inf,1,SKINAME);
64 fclose(inf); 65 fclose(inf);
65 REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall"); 66 REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");
67 REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);
68 REG_UNINSTALL_COMMENT(SKINAME,"Klever " KINAME);
69 REG_UNINSTALL_VERSION(SKINAME,VERSION);
70 REG_UNINSTALL_LOCATION(SKINAME,path);
71 REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");
72 REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/klog/");
66 73
67 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); 74 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);
68 75
69 return TRUE; 76 return TRUE;
70} 77}
diff --git a/install/install.rc b/install/install.rc
index cee7f66..2de75ab 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -128,14 +128,14 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico
128///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
129// 129//
130// Version 130// Version
131// 131//
132 132
133VS_VERSION_INFO VERSIONINFO 133VS_VERSION_INFO VERSIONINFO
134 FILEVERSION 1,1,1,0 134 FILEVERSION 1,2,0,0
135 PRODUCTVERSION 1,1,1,0 135 PRODUCTVERSION 1,2,0,0
136 FILEFLAGSMASK 0x3fL 136 FILEFLAGSMASK 0x3fL
137#ifdef _DEBUG 137#ifdef _DEBUG
138 FILEFLAGS 0x1L 138 FILEFLAGS 0x1L
139#else 139#else
140 FILEFLAGS 0x0L 140 FILEFLAGS 0x0L
141#endif 141#endif
@@ -146,19 +146,19 @@ BEGIN
146 BLOCK "StringFileInfo" 146 BLOCK "StringFileInfo"
147 BEGIN 147 BEGIN
148 BLOCK "040904b0" 148 BLOCK "040904b0"
149 BEGIN 149 BEGIN
150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
151 VALUE "FileDescription", "INSTALL: KLog, logging daemon\0" 151 VALUE "FileDescription", "INSTALL: KLog, logging daemon\0"
152 VALUE "FileVersion", "1, 1, 1, 0\0" 152 VALUE "FileVersion", "1, 2, 0, 0\0"
153 VALUE "InternalName", "INSTALL\0" 153 VALUE "InternalName", "INSTALL\0"
154 VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0" 154 VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"
155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
156 VALUE "OriginalFilename", "INSTALL.EXE\0" 156 VALUE "OriginalFilename", "INSTALL.EXE\0"
157 VALUE "ProductName", "KLog\0" 157 VALUE "ProductName", "KLog\0"
158 VALUE "ProductVersion", "1, 1, 1, 0\0" 158 VALUE "ProductVersion", "1, 2, 0, 0\0"
159 END 159 END
160 END 160 END
161 BLOCK "VarFileInfo" 161 BLOCK "VarFileInfo"
162 BEGIN 162 BEGIN
163 VALUE "Translation", 0x409, 1200 163 VALUE "Translation", 0x409, 1200
164 END 164 END