summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2005-08-06 13:52:52 (UTC)
committer Michael Krelin <hacker@klever.net>2005-08-06 13:52:52 (UTC)
commit79e1fbc641b946452a37f2dbf845b0d86ccc3c53 (patch) (side-by-side diff)
tree7bf6da3a4ac8dfbb1122e33273566d5c7d3f20d4
parent81636a2fb6f93863cdca3fdad8ff3df753b17d5e (diff)
downloadpumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.zip
pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.gz
pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.bz2
XP uninstall fixed and 2.6 release ready
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@134 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--KTAGS2
-rw-r--r--help/pumpkin.xml7
-rw-r--r--install/install.cpp9
-rw-r--r--install/install.rc10
-rw-r--r--pumpkin.mak52
-rw-r--r--pumpkin.rc14
7 files changed, 61 insertions, 35 deletions
diff --git a/COPYING b/COPYING
index e7ef42e..b830fe7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,2 +1,2 @@
-Copyright (c) 1997-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1997-2005 Klever Group (http://www.klever.net/)
diff --git a/KTAGS b/KTAGS
index 36d22e5..b27cd12 100644
--- a/KTAGS
+++ b/KTAGS
@@ -4,3 +4,3 @@ help-license-date ./help/pumpkin.xml /<license\s/;" kind:d
help-news ./help/pumpkin.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/pumpkin.xml b/help/pumpkin.xml
index 2ccd23a..d283fcd 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -7,3 +7,3 @@
<p><b><i>Enjoy!</i></b></p>
- <license years="1997-2004"/>
+ <license years="1997-2005"/>
<credist/>
@@ -11,2 +11,7 @@
<topic id="News" title="What's New">
+ <newsfor version="2.6" date="August 6th, 2005">
+ <ni>more robust solution to the backslash/slash dilemma</ni>
+ <ni>A bit more elaborate error reporting</ni>
+ <ni>Fixed uninstall procedure so that it works on XP</ni>
+ </newfor>
<newsfor version="2.5" date="July 11th, 2004">
diff --git a/install/install.cpp b/install/install.cpp
index 6fa4ae4..d11de03 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -3,3 +3,4 @@
-#define KINAME "PumpKIN 2.5.1-trunk"
+#define VERSION "2.6"
+#define KINAME "PumpKIN " VERSION
#define SKINAME "PumpKIN"
@@ -62,2 +63,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 PumpKIN");
+ 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/pumpkin/");
diff --git a/install/install.rc b/install/install.rc
index 30907ad..cc621ad 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 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,6,0,0
+ PRODUCTVERSION 2,6,0,0
FILEFLAGSMASK 0x3fL
@@ -151,5 +151,5 @@ BEGIN
VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "INSTALL\0"
- VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net/)\0"
+ VALUE "LegalCopyright", "Copyright © 1997-2005 Klever Group (http://www.klever.net/)\0"
VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
@@ -157,3 +157,3 @@ BEGIN
VALUE "ProductName", "PumpKIN\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductVersion", "2, 6, 0, 0\0"
END
diff --git a/pumpkin.mak b/pumpkin.mak
index 9a40fa2..bd466fe 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -41,5 +41,5 @@ NULL=nul
# PROP Target_Last_Scanned "Install - Win32 Canned"
+CPP=cl.exe
RSC=rc.exe
MTL=mktyplib.exe
-CPP=cl.exe
@@ -79,3 +79,3 @@ CLEAN :
-@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKINDlg.obj"
@@ -104,3 +104,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" /d "_AFXDLL"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -123,3 +123,3 @@ LINK32_OBJS= \
"$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
@@ -187,3 +187,3 @@ CLEAN :
-@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKIN.sbr"
@@ -224,3 +224,3 @@ MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "_DEBUG" /d "_AFXDLL"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -260,3 +260,3 @@ LINK32_OBJS= \
"$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
@@ -318,3 +318,3 @@ CLEAN :
-@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKINDlg.obj"
@@ -342,3 +342,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD RSC /l 0x409 /d "NDEBUG"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG"
BSC32=bscmake.exe
@@ -361,3 +361,3 @@ LINK32_OBJS= \
"$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
@@ -463,3 +463,3 @@ INTDIR=.\Install\Pure
-ALL : "$(OUTDIR)\Install.exe"
+ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"
@@ -468,2 +468,4 @@ CLEAN :
-@erase "$(INTDIR)\Install.res"
+ -@erase "$(INTDIR)\install.sbr"
+ -@erase "$(OUTDIR)\Install.bsc"
-@erase "$(OUTDIR)\Install.exe"
@@ -474,7 +476,7 @@ CLEAN :
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /c
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
- "_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c
+ "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Install\Pure/
-CPP_SBRS=.\.
+CPP_SBRS=.\Install\Pure/
# ADD BASE MTL /nologo /D "NDEBUG" /win32
@@ -490,3 +492,9 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc"
BSC32_SBRS= \
-
+ "$(INTDIR)\install.sbr"
+
+"$(OUTDIR)\Install.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+ $(BSC32) @<<
+ $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
LINK32=link.exe
@@ -831,3 +839,3 @@ DEP_RSC_PUMPKIN=\
-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -838,3 +846,3 @@ DEP_RSC_PUMPKIN=\
-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -845,3 +853,3 @@ DEP_RSC_PUMPKIN=\
-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -1399,5 +1407,11 @@ DEP_CPP_INSTAL=\
+BuildCmds= \
+ $(CPP) $(CPP_PROJ) $(SOURCE) \
+
+
"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
+ $(BuildCmds)
+"$(INTDIR)\install.sbr" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
+ $(BuildCmds)
diff --git a/pumpkin.rc b/pumpkin.rc
index 1bf0fd3..7dafe04 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -84,5 +84,5 @@ BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
- LTEXT "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,
+ LTEXT "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
SS_NOPREFIX
- LTEXT "Copyright © 1997-2004 Klever Group",IDC_STATIC,40,30,
+ LTEXT "Copyright © 1997-2005 Klever Group",IDC_STATIC,40,30,
170,8
@@ -289,4 +289,4 @@ END
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,6,0,0
+ PRODUCTVERSION 2,6,0,0
FILEFLAGSMASK 0x3fL
@@ -307,5 +307,5 @@ BEGIN
VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
- VALUE "FileVersion", "2, 5, 1, 0\0"
+ VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "PUMPKIN\0"
- VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net)\0"
+ VALUE "LegalCopyright", "Copyright © 1997-2005 Klever Group (http://www.klever.net)\0"
VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
@@ -313,3 +313,3 @@ BEGIN
VALUE "ProductName", "PumpKIN\0"
- VALUE "ProductVersion", "2, 5, 1, 0\0"
+ VALUE "ProductVersion", "2, 6, 0, 0\0"
END