XP uninstall fixed and 2.6 release ready

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@134 fe716a7a-6dde-0310-88d9-d003556173a8

7 files changed, 61 insertions, 35 deletions

diff --git a/COPYING b/COPYING
index e7ef42e..b830fe7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,3 @@
-Copyright (c) 1997-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1997-2005 Klever Group (http://www.klever.net/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/KTAGS b/KTAGS
index 36d22e5..b27cd12 100644
--- a/KTAGS
+++ b/KTAGS
@@ -3,5 +3,5 @@ about-version	pumpkin.rc	/LTEXT\s\+"PumpKIN, Version /;"	kind:v
         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
         install-vsinfo-numeric-version  install/install.rc      /^\s\+FILEVERSION\s\+/;"kind:v
diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 2ccd23a..d283fcd 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -6,8 +6,13 @@
   <p/>

   <p><b><i>Enjoy!</i></b></p>

-  <license years="1997-2004"/>

+  <license years="1997-2005"/>

   <credist/>

  </topic>

  <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">

    <ni>Change of <a href="#About">license</a> and opening the source.</ni>

diff --git a/install/install.cpp b/install/install.cpp
index 6fa4ae4..d11de03 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -2,5 +2,6 @@
 #include "../shared-code/install.h"

 

-        #defineKINAME "PumpKIN 2.5.1-trunk"

+#define VERSION "2.6"

+        #defineKINAME "PumpKIN " VERSION

 #define SKINAME "PumpKIN"
 
@@ -61,4 +62,10 @@ 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/");

 

         MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);

diff --git a/install/install.rc b/install/install.rc
index 30907ad..cc621ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -132,6 +132,6 @@ 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

 #ifdef _DEBUG

@@ -150,11 +150,11 @@ BEGIN
             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             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"

             VALUE "OriginalFilename", "INSTALL.EXE\0"

             VALUE "ProductName", "PumpKIN\0"

-            VALUE "ProductVersion", "2, 5, 1, 0\0"

+            VALUE "ProductVersion", "2, 6, 0, 0\0"

         END

     END

diff --git a/pumpkin.mak b/pumpkin.mak
index 9a40fa2..bd466fe 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -40,7 +40,7 @@ NULL=nul
 # Begin Project

 # PROP Target_Last_Scanned "Install - Win32 Canned"

+CPP=cl.exe

 RSC=rc.exe

 MTL=mktyplib.exe

-CPP=cl.exe

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

@@ -78,5 +78,5 @@ CLEAN :
         -@erase "$(INTDIR)\PumpKIN.obj"

         -@erase "$(INTDIR)\pumpkin.pch"

-        -@erase "$(INTDIR)\PumpKIN.res"

+        -@erase "$(INTDIR)\pumpkin.res"

         -@erase "$(INTDIR)\PumpKINDlg.obj"

         -@erase "$(INTDIR)\RequestDlg.obj"

@@ -103,5 +103,5 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

 # 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

 # ADD BASE BSC32 /nologo

@@ -122,5 +122,5 @@ LINK32_OBJS= \
         "$(INTDIR)\PropsSounds.obj" \

         "$(INTDIR)\PumpKIN.obj" \

-        "$(INTDIR)\PumpKIN.res" \

+        "$(INTDIR)\pumpkin.res" \

         "$(INTDIR)\PumpKINDlg.obj" \

         "$(INTDIR)\RequestDlg.obj" \

@@ -186,5 +186,5 @@ CLEAN :
         -@erase "$(INTDIR)\PumpKIN.obj"

         -@erase "$(INTDIR)\pumpkin.pch"

-        -@erase "$(INTDIR)\PumpKIN.res"

+        -@erase "$(INTDIR)\pumpkin.res"

         -@erase "$(INTDIR)\PumpKIN.sbr"

         -@erase "$(INTDIR)\PumpKINDlg.obj"

@@ -223,5 +223,5 @@ MTL_PROJ=/nologo /D "_DEBUG" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

 # 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

 # ADD BASE BSC32 /nologo

@@ -259,5 +259,5 @@ LINK32_OBJS= \
         "$(INTDIR)\PropsSounds.obj" \

         "$(INTDIR)\PumpKIN.obj" \

-        "$(INTDIR)\PumpKIN.res" \

+        "$(INTDIR)\pumpkin.res" \

         "$(INTDIR)\PumpKINDlg.obj" \

         "$(INTDIR)\RequestDlg.obj" \

@@ -317,5 +317,5 @@ CLEAN :
         -@erase "$(INTDIR)\PumpKIN.obj"

         -@erase "$(INTDIR)\pumpkin.pch"

-        -@erase "$(INTDIR)\PumpKIN.res"

+        -@erase "$(INTDIR)\pumpkin.res"

         -@erase "$(INTDIR)\PumpKINDlg.obj"

         -@erase "$(INTDIR)\RequestDlg.obj"

@@ -341,5 +341,5 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

 # 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

 # ADD BASE BSC32 /nologo

@@ -360,5 +360,5 @@ LINK32_OBJS= \
         "$(INTDIR)\PropsSounds.obj" \

         "$(INTDIR)\PumpKIN.obj" \

-        "$(INTDIR)\PumpKIN.res" \

+        "$(INTDIR)\pumpkin.res" \

         "$(INTDIR)\PumpKINDlg.obj" \

         "$(INTDIR)\RequestDlg.obj" \

@@ -462,9 +462,11 @@ OUTDIR=.\Install\Pure
 INTDIR=.\Install\Pure

 

-ALL : "$(OUTDIR)\Install.exe"

+ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"

 

 CLEAN : 

         -@erase "$(INTDIR)\install.obj"

         -@erase "$(INTDIR)\Install.res"

+        -@erase "$(INTDIR)\install.sbr"

+        -@erase "$(OUTDIR)\Install.bsc"

         -@erase "$(OUTDIR)\Install.exe"

 

@@ -473,9 +475,9 @@ 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

 # ADD MTL /nologo /D "NDEBUG" /win32

@@ -489,5 +491,11 @@ BSC32=bscmake.exe
 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

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

@@ -830,5 +838,5 @@ DEP_RSC_PUMPKIN=\
 

 

-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

 

@@ -837,5 +845,5 @@ DEP_RSC_PUMPKIN=\
 

 

-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

 

@@ -844,5 +852,5 @@ DEP_RSC_PUMPKIN=\
 

 

-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

 

@@ -1398,7 +1406,13 @@ 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)

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Static"

diff --git a/pumpkin.rc b/pumpkin.rc
index 1bf0fd3..7dafe04 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -83,7 +83,7 @@ FONT 8, "MS Sans Serif"
 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

     DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP

@@ -288,6 +288,6 @@ 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

 #ifdef _DEBUG

@@ -306,11 +306,11 @@ BEGIN
             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             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"

             VALUE "OriginalFilename", "PUMPKIN.EXE\0"

             VALUE "ProductName", "PumpKIN\0"

-            VALUE "ProductVersion", "2, 5, 1, 0\0"

+            VALUE "ProductVersion", "2, 6, 0, 0\0"

         END

     END