summaryrefslogtreecommitdiffabout
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
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 (more/less context) (ignore whitespace changes)
-rw-r--r--KTAGS2
-rw-r--r--help/klog.rtf3
-rw-r--r--help/klog.xml3
-rw-r--r--install/install.cpp9
-rw-r--r--install/install.rc8
-rw-r--r--klog.mak20
-rw-r--r--klog.rc10
7 files changed, 38 insertions, 17 deletions
diff --git a/KTAGS b/KTAGS
index 81b6fc2..9a783e1 100644
--- a/KTAGS
+++ b/KTAGS
@@ -4,3 +4,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
diff --git a/help/klog.rtf b/help/klog.rtf
index 0f72570..6be99a3 100644
--- a/help/klog.rtf
+++ b/help/klog.rtf
@@ -31,4 +31,5 @@ ${\footnote About KLog}
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
diff --git a/help/klog.xml b/help/klog.xml
index 08daf61..c5863a0 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -11,4 +11,5 @@
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>
diff --git a/install/install.cpp b/install/install.cpp
index 81d5a7e..82811b9 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -3,3 +3,4 @@
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"
@@ -65,2 +66,8 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".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
diff --git a/install/install.rc b/install/install.rc
index cee7f66..2de75ab 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -133,4 +133,4 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico
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
@@ -151,3 +151,3 @@ BEGIN
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"
@@ -157,3 +157,3 @@ BEGIN
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
diff --git a/klog.mak b/klog.mak
index 323d0a4..96fe85a 100644
--- a/klog.mak
+++ b/klog.mak
@@ -1200,4 +1200,7 @@ SOURCE=.\Install\install.cpp
1200 1200
1201DEP_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)
@@ -1207,4 +1210,7 @@ SOURCE=.\Install\install.cpp
1207 1210
1211DEP_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)
@@ -1214,4 +1220,7 @@ SOURCE=.\Install\install.cpp
1214 1220
1221DEP_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)
@@ -1221,4 +1230,7 @@ SOURCE=.\Install\install.cpp
1221 1230
1231DEP_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)
diff --git a/klog.rc b/klog.rc
index 6685059..2cb3ce7 100644
--- a/klog.rc
+++ b/klog.rc
@@ -85,3 +85,3 @@ 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,
@@ -806,4 +806,4 @@ END
806VS_VERSION_INFO VERSIONINFO 806VS_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
@@ -824,3 +824,3 @@ BEGIN
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"
@@ -830,3 +830,3 @@ BEGIN
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