-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
@@ -2,7 +2,7 @@ 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 |
diff --git a/help/klog.rtf b/help/klog.rtf index 0f72570..6be99a3 100644 --- a/help/klog.rtf +++ b/help/klog.rtf | |||
@@ -29,8 +29,9 @@ ${\footnote About KLog} | |||
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 |
diff --git a/help/klog.xml b/help/klog.xml index 08daf61..c5863a0 100644 --- a/help/klog.xml +++ b/help/klog.xml | |||
@@ -9,8 +9,9 @@ | |||
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> |
diff --git a/install/install.cpp b/install/install.cpp index 81d5a7e..82811b9 100644 --- a/install/install.cpp +++ b/install/install.cpp | |||
@@ -1,7 +1,8 @@ | |||
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) |
@@ -63,6 +64,12 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF"); | |||
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 | ||
diff --git a/install/install.rc b/install/install.rc index cee7f66..2de75ab 100644 --- a/install/install.rc +++ b/install/install.rc | |||
@@ -131,8 +131,8 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico | |||
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 |
@@ -149,13 +149,13 @@ BEGIN | |||
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" |
@@ -1198,29 +1198,41 @@ 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 | ||
@@ -83,7 +83,7 @@ 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 |
@@ -804,8 +804,8 @@ END | |||
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 |
@@ -822,13 +822,13 @@ BEGIN | |||
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" |