-rw-r--r-- | install/install.cpp | 9 | ||||
-rw-r--r-- | install/install.rc | 8 |
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,20 +1,21 @@ | |||
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 | ||
7 | BOOL Install(void) | 8 | BOOL Install(void) |
8 | { | 9 | { |
9 | STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path"); | 10 | STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path"); |
10 | STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); | 11 | STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); |
11 | LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); | 12 | LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); |
12 | STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); | 13 | STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); |
13 | if(!path) | 14 | if(!path) |
14 | return NULL; | 15 | return NULL; |
15 | #ifdefK_ANNED | 16 | #ifdefK_ANNED |
16 | STRING sysDir(_MAX_PATH); | 17 | STRING sysDir(_MAX_PATH); |
17 | GetSystemDirectory(sysDir,_MAX_PATH); | 18 | GetSystemDirectory(sysDir,_MAX_PATH); |
18 | INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); | 19 | INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); |
19 | #endif | 20 | #endif |
20 | 21 | ||
@@ -50,21 +51,27 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF"); | |||
50 | fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n"); | 51 | fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n"); |
51 | 52 | ||
52 | INF_FILE_SECTION(inf,"kFiles"); | 53 | INF_FILE_SECTION(inf,"kFiles"); |
53 | INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath); | 54 | INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath); |
54 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe"); | 55 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe"); |
55 | INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME); | 56 | INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME); |
56 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf"); | 57 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf"); |
57 | 58 | ||
58 | INF_FILE_SECTION(inf,"kReg"); | 59 | INF_FILE_SECTION(inf,"kReg"); |
59 | INF_UNINSTALL_REG(inf,SKINAME); | 60 | INF_UNINSTALL_REG(inf,SKINAME); |
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 | |||
@@ -118,57 +118,57 @@ END | |||
118 | ///////////////////////////////////////////////////////////////////////////// | 118 | ///////////////////////////////////////////////////////////////////////////// |
119 | // | 119 | // |
120 | // Icon | 120 | // Icon |
121 | // | 121 | // |
122 | 122 | ||
123 | // Icon with lowest ID value placed first to ensure application icon | 123 | // Icon with lowest ID value placed first to ensure application icon |
124 | // remains consistent on all systems. | 124 | // remains consistent on all systems. |
125 | IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" | 125 | IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" |
126 | 126 | ||
127 | #ifndef _MAC | 127 | #ifndef _MAC |
128 | ///////////////////////////////////////////////////////////////////////////// | 128 | ///////////////////////////////////////////////////////////////////////////// |
129 | // | 129 | // |
130 | // Version | 130 | // Version |
131 | // | 131 | // |
132 | 132 | ||
133 | VS_VERSION_INFO VERSIONINFO | 133 | VS_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 |
142 | FILEOS 0x40004L | 142 | FILEOS 0x40004L |
143 | FILETYPE 0x1L | 143 | FILETYPE 0x1L |
144 | FILESUBTYPE 0x0L | 144 | FILESUBTYPE 0x0L |
145 | BEGIN | 145 | 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 |
165 | END | 165 | END |
166 | 166 | ||
167 | #endif // !_MAC | 167 | #endif // !_MAC |
168 | 168 | ||
169 | #endif // English (U.S.) resources | 169 | #endif // English (U.S.) resources |
170 | ///////////////////////////////////////////////////////////////////////////// | 170 | ///////////////////////////////////////////////////////////////////////////// |
171 | 171 | ||
172 | 172 | ||
173 | 173 | ||
174 | #ifndef APSTUDIO_INVOKED | 174 | #ifndef APSTUDIO_INVOKED |