-rw-r--r-- | install/install.cpp | 2 | ||||
-rw-r--r-- | install/install.rc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/install/install.cpp b/install/install.cpp index c0e0bb8..81d5a7e 100644 --- a/install/install.cpp +++ b/install/install.cpp | |||
@@ -1,36 +1,36 @@ | |||
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" | 4 | #define KINAME"KLog 1.1.1-trunk" |
5 | #define SKINAME"KLog" | 5 | #define SKINAME"KLog" |
6 | 6 | ||
7 | BOOL Install(void) | 7 | BOOL Install(void) |
8 | { | 8 | { |
9 | STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path"); | 9 | 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"); | 10 | 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"); | 11 | LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); |
12 | STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); | 12 | STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); |
13 | if(!path) | 13 | if(!path) |
14 | return NULL; | 14 | return NULL; |
15 | #ifdefK_ANNED | 15 | #ifdefK_ANNED |
16 | STRING sysDir(_MAX_PATH); | 16 | STRING sysDir(_MAX_PATH); |
17 | GetSystemDirectory(sysDir,_MAX_PATH); | 17 | GetSystemDirectory(sysDir,_MAX_PATH); |
18 | INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); | 18 | INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | MAKE_PATH(path); | 21 | MAKE_PATH(path); |
22 | STRING shortPath = GET_SHORT_PATH(path); | 22 | STRING shortPath = GET_SHORT_PATH(path); |
23 | if(!shortPath){ | 23 | if(!shortPath){ |
24 | MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); | 24 | MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); |
25 | return FALSE; | 25 | return FALSE; |
26 | } | 26 | } |
27 | 27 | ||
28 | if(!( | 28 | if(!( |
29 | INSTALLFILE(SKINAME ".ex_",path, SKINAME ".exe") && | 29 | INSTALLFILE(SKINAME ".ex_",path, SKINAME ".exe") && |
30 | INSTALLFILE(SKINAME ".hl_",path, SKINAME ".hlp") && | 30 | INSTALLFILE(SKINAME ".hl_",path, SKINAME ".hlp") && |
31 | INSTALLFILE(SKINAME ".cn_",path, SKINAME ".cnt") | 31 | INSTALLFILE(SKINAME ".cn_",path, SKINAME ".cnt") |
32 | )){ | 32 | )){ |
33 | MessageBox(NULL,"Failed to install " KINAME "in specified directory",NULL,MB_ICONERROR|MB_OK); | 33 | MessageBox(NULL,"Failed to install " KINAME "in specified directory",NULL,MB_ICONERROR|MB_OK); |
34 | return FALSE; | 34 | return FALSE; |
35 | } | 35 | } |
36 | 36 | ||
diff --git a/install/install.rc b/install/install.rc index 6a3fd3e..cee7f66 100644 --- a/install/install.rc +++ b/install/install.rc | |||
@@ -102,81 +102,81 @@ BEGIN | |||
102 | END | 102 | END |
103 | 103 | ||
104 | 2 TEXTINCLUDE DISCARDABLE | 104 | 2 TEXTINCLUDE DISCARDABLE |
105 | BEGIN | 105 | BEGIN |
106 | "#include ""afxres.h""\r\n" | 106 | "#include ""afxres.h""\r\n" |
107 | "\0" | 107 | "\0" |
108 | END | 108 | END |
109 | 109 | ||
110 | 3 TEXTINCLUDE DISCARDABLE | 110 | 3 TEXTINCLUDE DISCARDABLE |
111 | BEGIN | 111 | BEGIN |
112 | "#include ""custom.rch""\0" | 112 | "#include ""custom.rch""\0" |
113 | END | 113 | END |
114 | 114 | ||
115 | #endif // APSTUDIO_INVOKED | 115 | #endif // APSTUDIO_INVOKED |
116 | 116 | ||
117 | 117 | ||
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,0,0 | 134 | FILEVERSION 1,1,1,0 |
135 | PRODUCTVERSION 1,1,0,0 | 135 | PRODUCTVERSION 1,1,1,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, 0, 0\0" | 152 | VALUE "FileVersion", "1, 1, 1, 0\0" |
153 | VALUE "InternalName", "INSTALL\0" | 153 | VALUE "InternalName", "INSTALL\0" |
154 | VALUE "LegalCopyright", "Copyright © 1998-2004 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, 0, 0\0" | 158 | VALUE "ProductVersion", "1, 1, 1, 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 |
175 | ///////////////////////////////////////////////////////////////////////////// | 175 | ///////////////////////////////////////////////////////////////////////////// |
176 | // | 176 | // |
177 | // Generated from the TEXTINCLUDE 3 resource. | 177 | // Generated from the TEXTINCLUDE 3 resource. |
178 | // | 178 | // |
179 | #include "custom.rch" | 179 | #include "custom.rch" |
180 | ///////////////////////////////////////////////////////////////////////////// | 180 | ///////////////////////////////////////////////////////////////////////////// |
181 | #endif // not APSTUDIO_INVOKED | 181 | #endif // not APSTUDIO_INVOKED |
182 | 182 | ||