author | Michael Krelin <hacker@klever.net> | 2005-08-06 13:56:39 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-08-06 13:56:39 (UTC) |
commit | 68b019775510758b3175e4a8fb5498fe8a30f88d (patch) (unidiff) | |
tree | 3198a2b7aeb41fed63b7e9b16a827013ede65cda | |
parent | bdbe0e4fff764357d0bb6236f22d6f1dcc0548ba (diff) | |
download | klog-master.zip klog-master.tar.gz klog-master.tar.bz2 |
git-svn-id: http://svn.klever.net/kin/klog/trunk@136 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | KTAGS | 2 | ||||
-rw-r--r-- | help/klog.rtf | 3 | ||||
-rw-r--r-- | help/klog.xml | 3 | ||||
-rw-r--r-- | install/install.cpp | 9 | ||||
-rw-r--r-- | install/install.rc | 8 | ||||
-rw-r--r-- | klog.mak | 20 | ||||
-rw-r--r-- | klog.rc | 10 |
7 files changed, 38 insertions, 17 deletions
@@ -1,12 +1,12 @@ | |||
1 | about-date klog.rc /LTEXT\s\+"Copyright /;"kind:d | 1 | about-date klog.rc /LTEXT\s\+"Copyright /;"kind:d |
2 | about-version klog.rc /LTEXT\s\+"KLog, Version /;"kind:v | 2 | about-version klog.rc /LTEXT\s\+"KLog, Version /;"kind:v |
3 | help-license-date ./help/klog.xml /<license\s/;"kind:d | 3 | help-license-date ./help/klog.xml /<license\s/;"kind:d |
4 | help-news ./help/klog.xml/<newsfor\s/ | 4 | help-news ./help/klog.xml/<newsfor\s/ |
5 | install-version ./install/install.cpp /^#define\s\+KINAME\s\+"/;"kind:v | 5 | install-version ./install/install.cpp /^#define\s\+VERSION\s\+"/;"kind:v |
6 | install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d | 6 | install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d |
7 | install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v | 7 | install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v |
8 | install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v | 8 | install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v |
9 | license-date COPYING :1;"kind:d | 9 | license-date COPYING :1;"kind:d |
10 | vsinfo-date klog.rc /VALUE\s\+"LegalCopyright",/;"kind:d | 10 | vsinfo-date klog.rc /VALUE\s\+"LegalCopyright",/;"kind:d |
11 | vsinfo-numeric-version klog.rc /^\s\+FILEVERSION\s\+/;"kind:v | 11 | vsinfo-numeric-version klog.rc /^\s\+FILEVERSION\s\+/;"kind:v |
12 | vsinfo-string-version klog.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v | 12 | vsinfo-string-version klog.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v |
diff --git a/help/klog.rtf b/help/klog.rtf index 0f72570..6be99a3 100644 --- a/help/klog.rtf +++ b/help/klog.rtf | |||
@@ -16,34 +16,35 @@ ${\footnote About KLog} | |||
16 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b KLog} is our {\i Win32} implementation of {\b\cf6 *nix}{\i syslog} daemon to support remote logging of messages from {\b\cf6 unix} servers, routers, terminal servers and other syslog-enabled devices/applications. | 16 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b KLog} is our {\i Win32} implementation of {\b\cf6 *nix}{\i syslog} daemon to support remote logging of messages from {\b\cf6 unix} servers, routers, terminal servers and other syslog-enabled devices/applications. |
17 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 | 17 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 |
18 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}} | 18 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}} |
19 | { | 19 | { |
20 | \par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2005 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")} | 20 | \par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2005 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")} |
21 | \par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | 21 | \par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: |
22 | \par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | 22 | \par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. |
23 | \par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 23 | \par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
24 | } | 24 | } |
25 | \par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")} | 25 | \par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")} |
26 | \par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")} | 26 | \par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")} |
27 | \page | 27 | \page |
28 | 28 | ||
29 | \pard\plain | 29 | \pard\plain |
30 | #{\footnote News} | 30 | #{\footnote News} |
31 | ${\footnote What's New} | 31 | ${\footnote What's New} |
32 | \par\pard\plain\f1\fs24\qc\cf2\b 1.1.1-trunk - | 32 | \par\pard\plain\f1\fs24\qc\cf2\b 1.2 - August 6th, 2005 |
33 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Added vertical resizability | 33 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Added vertical resizability |
34 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP | ||
34 | \par\pard\plain\f1\fs24\qc\cf2\b 1.1 - July 11th, 2004 | 35 | \par\pard\plain\f1\fs24\qc\cf2\b 1.1 - July 11th, 2004 |
35 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source code | 36 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source code |
36 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Minor changes in code, mostly bugfixes | 37 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Minor changes in code, mostly bugfixes |
37 | \page | 38 | \page |
38 | 39 | ||
39 | \pard\plain\keepn | 40 | \pard\plain\keepn |
40 | #{\footnote Using} | 41 | #{\footnote Using} |
41 | ${\footnote Using KLog} | 42 | ${\footnote Using KLog} |
42 | { \f1\fs18\b\sb120 Using {\b KLog}} | 43 | { \f1\fs18\b\sb120 Using {\b KLog}} |
43 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 When you start {\b KLog} for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the {\uldb Main Window}{\v MainWindow} section. | 44 | \par\sa120\sb120\qj\pard \f1\fs18\sb120 When you start {\b KLog} for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the {\uldb Main Window}{\v MainWindow} section. |
44 | \page | 45 | \page |
45 | 46 | ||
46 | \pard\plain\keepn | 47 | \pard\plain\keepn |
47 | #{\footnote MainWindow} | 48 | #{\footnote MainWindow} |
48 | ${\footnote Main Window} | 49 | ${\footnote Main Window} |
49 | { \f1\fs18\b\sb120 Main Window} | 50 | { \f1\fs18\b\sb120 Main Window} |
diff --git a/help/klog.xml b/help/klog.xml index 08daf61..c5863a0 100644 --- a/help/klog.xml +++ b/help/klog.xml | |||
@@ -1,29 +1,30 @@ | |||
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | <winhelp> | 2 | <winhelp> |
3 | <topic id="About" title="About KLog"> | 3 | <topic id="About" title="About KLog"> |
4 | <heading scroll="no">Abotu <kin>KLog</kin></heading> | 4 | <heading scroll="no">Abotu <kin>KLog</kin></heading> |
5 | <p><kin>KLog</kin> is our <term>Win32</term> implementation of <product>*nix</product> <term>syslog</term> daemon to support remote logging of messages from <product>unix</product> servers, routers, terminal servers and other syslog-enabled devices/applications.</p> | 5 | <p><kin>KLog</kin> is our <term>Win32</term> implementation of <product>*nix</product> <term>syslog</term> daemon to support remote logging of messages from <product>unix</product> servers, routers, terminal servers and other syslog-enabled devices/applications.</p> |
6 | <p/> | 6 | <p/> |
7 | <p><b><i>Enjoy!</i></b></p> | 7 | <p><b><i>Enjoy!</i></b></p> |
8 | <license years="1998-2005"/> | 8 | <license years="1998-2005"/> |
9 | <credits/> | 9 | <credits/> |
10 | </topic> | 10 | </topic> |
11 | <topic id="News" title="What's New"> | 11 | <topic id="News" title="What's New"> |
12 | <newsfor version="1.1.1-trunk"> | 12 | <newsfor version="1.2" date="August 6th, 2005"> |
13 | <ni>Added vertical resizability</ni> | 13 | <ni>Added vertical resizability</ni> |
14 | <ni>Fixed uninstall procedure so that it works on XP</ni> | ||
14 | </newsfor> | 15 | </newsfor> |
15 | <newsfor version="1.1" date="July 11th, 2004"> | 16 | <newsfor version="1.1" date="July 11th, 2004"> |
16 | <ni>Change of license and opening the source code</ni> | 17 | <ni>Change of license and opening the source code</ni> |
17 | <ni>Minor changes in code, mostly bugfixes</ni> | 18 | <ni>Minor changes in code, mostly bugfixes</ni> |
18 | </newsfor> | 19 | </newsfor> |
19 | </topic> | 20 | </topic> |
20 | <topic id="Using" title="Using KLog"> | 21 | <topic id="Using" title="Using KLog"> |
21 | <heading scroll="no">Using <kin>KLog</kin></heading> | 22 | <heading scroll="no">Using <kin>KLog</kin></heading> |
22 | <p>When you start <kin>KLog</kin> for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the <a href="#MainWindow">Main Window</a> section.</p> | 23 | <p>When you start <kin>KLog</kin> for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the <a href="#MainWindow">Main Window</a> section.</p> |
23 | </topic> | 24 | </topic> |
24 | <topic id="MainWindow" title="Main Window"> | 25 | <topic id="MainWindow" title="Main Window"> |
25 | <heading scroll="no">Main Window</heading> | 26 | <heading scroll="no">Main Window</heading> |
26 | <p>Essentially, main window is a tabbed collection of 'Destinations'. For each destination you can set the destination itself, events criteria and sound <kin>KLog</kin> will produce when triggered by event matching criteria.</p> | 27 | <p>Essentially, main window is a tabbed collection of 'Destinations'. For each destination you can set the destination itself, events criteria and sound <kin>KLog</kin> will produce when triggered by event matching criteria.</p> |
27 | <p>Each tab consists of following fields:</p> | 28 | <p>Each tab consists of following fields:</p> |
28 | <ul> | 29 | <ul> |
29 | <li><b>Short description</b> - short descriptive text appearing on the tab on top of window.</li> | 30 | <li><b>Short description</b> - short descriptive text appearing on the tab on top of window.</li> |
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 |
@@ -1185,55 +1185,67 @@ DEP_RSC_INSTA=\ | |||
1185 | 1185 | ||
1186 | "$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" | 1186 | "$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" |
1187 | $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ | 1187 | $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ |
1188 | "_AFXDLL" /d "STATI_K" $(SOURCE) | 1188 | "_AFXDLL" /d "STATI_K" $(SOURCE) |
1189 | 1189 | ||
1190 | 1190 | ||
1191 | !ENDIF | 1191 | !ENDIF |
1192 | 1192 | ||
1193 | # End Source File | 1193 | # End Source File |
1194 | ################################################################################ | 1194 | ################################################################################ |
1195 | # Begin Source File | 1195 | # Begin Source File |
1196 | 1196 | ||
1197 | SOURCE=.\Install\install.cpp | 1197 | SOURCE=.\Install\install.cpp |
1198 | 1198 | ||
1199 | !IF "$(CFG)" == "Install - Win32 Debug" | 1199 | !IF "$(CFG)" == "Install - Win32 Debug" |
1200 | 1200 | ||
1201 | DEP_CPP_INSTAL=\ | ||
1202 | ".\shared-code\install.h"\ | ||
1203 | |||
1201 | 1204 | ||
1202 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" | 1205 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" |
1203 | $(CPP) $(CPP_PROJ) $(SOURCE) | 1206 | $(CPP) $(CPP_PROJ) $(SOURCE) |
1204 | 1207 | ||
1205 | 1208 | ||
1206 | !ELSEIF "$(CFG)" == "Install - Win32 Pure" | 1209 | !ELSEIF "$(CFG)" == "Install - Win32 Pure" |
1207 | 1210 | ||
1211 | DEP_CPP_INSTAL=\ | ||
1212 | ".\shared-code\install.h"\ | ||
1213 | |||
1208 | 1214 | ||
1209 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" | 1215 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" |
1210 | $(CPP) $(CPP_PROJ) $(SOURCE) | 1216 | $(CPP) $(CPP_PROJ) $(SOURCE) |
1211 | 1217 | ||
1212 | 1218 | ||
1213 | !ELSEIF "$(CFG)" == "Install - Win32 Canned" | 1219 | !ELSEIF "$(CFG)" == "Install - Win32 Canned" |
1214 | 1220 | ||
1221 | DEP_CPP_INSTAL=\ | ||
1222 | ".\shared-code\install.h"\ | ||
1223 | |||
1215 | 1224 | ||
1216 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" | 1225 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" |
1217 | $(CPP) $(CPP_PROJ) $(SOURCE) | 1226 | $(CPP) $(CPP_PROJ) $(SOURCE) |
1218 | 1227 | ||
1219 | 1228 | ||
1220 | !ELSEIF "$(CFG)" == "Install - Win32 Static" | 1229 | !ELSEIF "$(CFG)" == "Install - Win32 Static" |
1221 | 1230 | ||
1231 | DEP_CPP_INSTAL=\ | ||
1232 | ".\shared-code\install.h"\ | ||
1233 | |||
1222 | 1234 | ||
1223 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" | 1235 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" |
1224 | $(CPP) $(CPP_PROJ) $(SOURCE) | 1236 | $(CPP) $(CPP_PROJ) $(SOURCE) |
1225 | 1237 | ||
1226 | 1238 | ||
1227 | !ENDIF | 1239 | !ENDIF |
1228 | 1240 | ||
1229 | # End Source File | 1241 | # End Source File |
1230 | ################################################################################ | 1242 | ################################################################################ |
1231 | # Begin Project Dependency | 1243 | # Begin Project Dependency |
1232 | 1244 | ||
1233 | # Project_Dep_Name "KLog" | 1245 | # Project_Dep_Name "KLog" |
1234 | 1246 | ||
1235 | !IF "$(CFG)" == "Install - Win32 Debug" | 1247 | !IF "$(CFG)" == "Install - Win32 Debug" |
1236 | 1248 | ||
1237 | "KLog - Win32 Debug" : | 1249 | "KLog - Win32 Debug" : |
1238 | $(MAKE) /$(MAKEFLAGS) /F ".\klog.mak" CFG="KLog - Win32 Debug" | 1250 | $(MAKE) /$(MAKEFLAGS) /F ".\klog.mak" CFG="KLog - Win32 Debug" |
1239 | 1251 | ||
@@ -70,33 +70,33 @@ IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico" | |||
70 | IDI_PREPLAY ICON DISCARDABLE "shared-data/play-icon.ico" | 70 | IDI_PREPLAY ICON DISCARDABLE "shared-data/play-icon.ico" |
71 | IDI_KLOG ICON DISCARDABLE "res\\klog-icon.ico" | 71 | IDI_KLOG ICON DISCARDABLE "res\\klog-icon.ico" |
72 | IDI_KLOG_TRIGGERED ICON DISCARDABLE "res\\klog-triggered-icon.ico" | 72 | IDI_KLOG_TRIGGERED ICON DISCARDABLE "res\\klog-triggered-icon.ico" |
73 | IDI_LOGPATTERN ICON DISCARDABLE "res\\log-pattern.ico" | 73 | IDI_LOGPATTERN ICON DISCARDABLE "res\\log-pattern.ico" |
74 | 74 | ||
75 | ///////////////////////////////////////////////////////////////////////////// | 75 | ///////////////////////////////////////////////////////////////////////////// |
76 | // | 76 | // |
77 | // Dialog | 77 | // Dialog |
78 | // | 78 | // |
79 | 79 | ||
80 | IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 70 | 80 | IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 70 |
81 | STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | 81 | STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU |
82 | CAPTION "About KLog" | 82 | CAPTION "About KLog" |
83 | FONT 8, "MS Sans Serif" | 83 | FONT 8, "MS Sans Serif" |
84 | BEGIN | 84 | BEGIN |
85 | ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 | 85 | ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 |
86 | LTEXT "KLog, Version 1.1.1-trunk",IDC_STATIC,40,16,119,8,SS_NOPREFIX | 86 | LTEXT "KLog, Version 1.2",IDC_STATIC,40,16,119,8,SS_NOPREFIX |
87 | LTEXT "Copyright © 1998-2005 Klever Group",IDC_STATIC,40,31, | 87 | LTEXT "Copyright © 1998-2005 Klever Group",IDC_STATIC,40,31, |
88 | 119,8 | 88 | 119,8 |
89 | DEFPUSHBUTTON "OK",IDOK,178,13,32,14,WS_GROUP | 89 | DEFPUSHBUTTON "OK",IDOK,178,13,32,14,WS_GROUP |
90 | PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,125,49,85,14 | 90 | PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,125,49,85,14 |
91 | END | 91 | END |
92 | 92 | ||
93 | IDD_KLOG_DIALOG DIALOGEX 0, 0, 293, 286 | 93 | IDD_KLOG_DIALOG DIALOGEX 0, 0, 293, 286 |
94 | STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | 94 | STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME |
95 | EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW | 95 | EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW |
96 | CAPTION "KLog" | 96 | CAPTION "KLog" |
97 | FONT 8, "MS Sans Serif" | 97 | FONT 8, "MS Sans Serif" |
98 | BEGIN | 98 | BEGIN |
99 | CTEXT "Short de&scription:",IDC_STATIC,11,48,78,8,SS_NOTIFY | 99 | CTEXT "Short de&scription:",IDC_STATIC,11,48,78,8,SS_NOTIFY |
100 | EDITTEXT IDC_DESC,91,46,187,13,ES_AUTOHSCROLL,WS_EX_STATICEDGE | 100 | EDITTEXT IDC_DESC,91,46,187,13,ES_AUTOHSCROLL,WS_EX_STATICEDGE |
101 | CONTROL "Log to &File",IDC_TYPE_FILE,"Button",BS_AUTORADIOBUTTON | | 101 | CONTROL "Log to &File",IDC_TYPE_FILE,"Button",BS_AUTORADIOBUTTON | |
102 | BS_PUSHLIKE | WS_GROUP,11,60,87,19,WS_EX_STATICEDGE | 102 | BS_PUSHLIKE | WS_GROUP,11,60,87,19,WS_EX_STATICEDGE |
@@ -791,57 +791,57 @@ BEGIN | |||
791 | LTEXT "All host address lookups are performed in a blocking mode, so KLog may temporarily stop responding until host address is resolved or operation failed.", | 791 | LTEXT "All host address lookups are performed in a blocking mode, so KLog may temporarily stop responding until host address is resolved or operation failed.", |
792 | IDC_STATIC,46,7,142,35 | 792 | IDC_STATIC,46,7,142,35 |
793 | CONTROL "Enough is said, no need to remind me again. Thanks.", | 793 | CONTROL "Enough is said, no need to remind me again. Thanks.", |
794 | IDC_WARNBLOCKING,"Button",BS_AUTOCHECKBOX | BS_RIGHT | | 794 | IDC_WARNBLOCKING,"Button",BS_AUTOCHECKBOX | BS_RIGHT | |
795 | BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22, | 795 | BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22, |
796 | WS_EX_STATICEDGE | 796 | WS_EX_STATICEDGE |
797 | END | 797 | END |
798 | 798 | ||
799 | 799 | ||
800 | #ifndef _MAC | 800 | #ifndef _MAC |
801 | ///////////////////////////////////////////////////////////////////////////// | 801 | ///////////////////////////////////////////////////////////////////////////// |
802 | // | 802 | // |
803 | // Version | 803 | // Version |
804 | // | 804 | // |
805 | 805 | ||
806 | VS_VERSION_INFO VERSIONINFO | 806 | VS_VERSION_INFO VERSIONINFO |
807 | FILEVERSION 1,1,1,0 | 807 | FILEVERSION 1,2,0,0 |
808 | PRODUCTVERSION 1,1,0,0 | 808 | PRODUCTVERSION 1,2,0,0 |
809 | FILEFLAGSMASK 0x3fL | 809 | FILEFLAGSMASK 0x3fL |
810 | #ifdef _DEBUG | 810 | #ifdef _DEBUG |
811 | FILEFLAGS 0x1L | 811 | FILEFLAGS 0x1L |
812 | #else | 812 | #else |
813 | FILEFLAGS 0x0L | 813 | FILEFLAGS 0x0L |
814 | #endif | 814 | #endif |
815 | FILEOS 0x4L | 815 | FILEOS 0x4L |
816 | FILETYPE 0x1L | 816 | FILETYPE 0x1L |
817 | FILESUBTYPE 0x0L | 817 | FILESUBTYPE 0x0L |
818 | BEGIN | 818 | BEGIN |
819 | BLOCK "StringFileInfo" | 819 | BLOCK "StringFileInfo" |
820 | BEGIN | 820 | BEGIN |
821 | BLOCK "040904b0" | 821 | BLOCK "040904b0" |
822 | BEGIN | 822 | BEGIN |
823 | VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" | 823 | VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" |
824 | VALUE "FileDescription", "KLog, logging daemon\0" | 824 | VALUE "FileDescription", "KLog, logging daemon\0" |
825 | VALUE "FileVersion", "1, 1, 1, 0\0" | 825 | VALUE "FileVersion", "1, 2, 0, 0\0" |
826 | VALUE "InternalName", "KLOG\0" | 826 | VALUE "InternalName", "KLOG\0" |
827 | VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0" | 827 | VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0" |
828 | VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" | 828 | VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" |
829 | VALUE "OriginalFilename", "KLOG.EXE\0" | 829 | VALUE "OriginalFilename", "KLOG.EXE\0" |
830 | VALUE "ProductName", "KLog\0" | 830 | VALUE "ProductName", "KLog\0" |
831 | VALUE "ProductVersion", "1, 1, 1, 0\0" | 831 | VALUE "ProductVersion", "1, 2, 0, 0\0" |
832 | END | 832 | END |
833 | END | 833 | END |
834 | BLOCK "VarFileInfo" | 834 | BLOCK "VarFileInfo" |
835 | BEGIN | 835 | BEGIN |
836 | VALUE "Translation", 0x409, 1200 | 836 | VALUE "Translation", 0x409, 1200 |
837 | END | 837 | END |
838 | END | 838 | END |
839 | 839 | ||
840 | #endif // !_MAC | 840 | #endif // !_MAC |
841 | 841 | ||
842 | 842 | ||
843 | ///////////////////////////////////////////////////////////////////////////// | 843 | ///////////////////////////////////////////////////////////////////////////// |
844 | // | 844 | // |
845 | // DESIGNINFO | 845 | // DESIGNINFO |
846 | // | 846 | // |
847 | 847 | ||