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) (side-by-side diff)
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) (show 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
help-news ./help/klog.xml /<newsfor\s/
-install-version ./install/install.cpp /^#define\s\+KINAME\s\+"/;" kind:v
+install-version ./install/install.cpp /^#define\s\+VERSION\s\+"/;" kind:v
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}
${\footnote What's New}
-\par\pard\plain\f1\fs24\qc\cf2\b 1.1.1-trunk -
+\par\pard\plain\f1\fs24\qc\cf2\b 1.2 - August 6th, 2005
\par\pard\plain\fi0\li0\f1\fs18 \bullet Added vertical resizability
+\par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP
\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 @@
<topic id="News" title="What's New">
- <newsfor version="1.1.1-trunk">
+ <newsfor version="1.2" date="August 6th, 2005">
<ni>Added vertical resizability</ni>
+ <ni>Fixed uninstall procedure so that it works on XP</ni>
</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 @@
-#define KINAME "KLog 1.1.1-trunk"
+#define VERSION "1.2"
+#define KINAME "KLog " VERSION
#define SKINAME "KLog"
@@ -65,2 +66,8 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");
+ REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);
+ REG_UNINSTALL_COMMENT(SKINAME,"Klever " KINAME);
+ REG_UNINSTALL_VERSION(SKINAME,VERSION);
+ REG_UNINSTALL_LOCATION(SKINAME,path);
+ REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");
+ REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/klog/");
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
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
- PRODUCTVERSION 1,1,1,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
FILEFLAGSMASK 0x3fL
@@ -151,3 +151,3 @@ BEGIN
VALUE "FileDescription", "INSTALL: KLog, logging daemon\0"
- VALUE "FileVersion", "1, 1, 1, 0\0"
+ VALUE "FileVersion", "1, 2, 0, 0\0"
VALUE "InternalName", "INSTALL\0"
@@ -157,3 +157,3 @@ BEGIN
VALUE "ProductName", "KLog\0"
- VALUE "ProductVersion", "1, 1, 1, 0\0"
+ VALUE "ProductVersion", "1, 2, 0, 0\0"
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
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1207,4 +1210,7 @@ SOURCE=.\Install\install.cpp
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
+
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1214,4 +1220,7 @@ SOURCE=.\Install\install.cpp
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1221,4 +1230,7 @@ SOURCE=.\Install\install.cpp
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
+
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(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
ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
- LTEXT "KLog, Version 1.1.1-trunk",IDC_STATIC,40,16,119,8,SS_NOPREFIX
+ LTEXT "KLog, Version 1.2",IDC_STATIC,40,16,119,8,SS_NOPREFIX
LTEXT "Copyright © 1998-2005 Klever Group",IDC_STATIC,40,31,
@@ -806,4 +806,4 @@ END
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
FILEFLAGSMASK 0x3fL
@@ -824,3 +824,3 @@ BEGIN
VALUE "FileDescription", "KLog, logging daemon\0"
- VALUE "FileVersion", "1, 1, 1, 0\0"
+ VALUE "FileVersion", "1, 2, 0, 0\0"
VALUE "InternalName", "KLOG\0"
@@ -830,3 +830,3 @@ BEGIN
VALUE "ProductName", "KLog\0"
- VALUE "ProductVersion", "1, 1, 1, 0\0"
+ VALUE "ProductVersion", "1, 2, 0, 0\0"
END