XP uninstall fixed and 2.6 release ready

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@134 fe716a7a-6dde-0310-88d9-d003556173a8
author: Michael Krelin <hacker@klever.net> 2005-08-06 13:52:52 (UTC)
committer: Michael Krelin <hacker@klever.net> 2005-08-06 13:52:52 (UTC)
commit: 79e1fbc641b946452a37f2dbf845b0d86ccc3c53 (patch) (unidiff)
tree: 7bf6da3a4ac8dfbb1122e33273566d5c7d3f20d4
parent: 81636a2fb6f93863cdca3fdad8ff3df753b17d5e (diff)
download: pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.zip
pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.gz
pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.bz2
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 @@
-        #defineKINAME "PumpKIN 2.5.1-trunk"
+#define VERSION "2.6"
+        #defineKINAME "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
+ FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,5,1,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
+ FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,5,1,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
author	Michael Krelin <hacker@klever.net>	2005-08-06 13:52:52 (UTC)
committer	Michael Krelin <hacker@klever.net>	2005-08-06 13:52:52 (UTC)
commit	79e1fbc641b946452a37f2dbf845b0d86ccc3c53 (patch) (unidiff)
tree	7bf6da3a4ac8dfbb1122e33273566d5c7d3f20d4
parent	81636a2fb6f93863cdca3fdad8ff3df753b17d5e (diff)
download	pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.zip pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.gz pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.bz2

diff --git a/COPYING b/COPYING index e7ef42e..b830fe7 100644 --- a/COPYING +++ b/COPYING
@@ -1,2 +1,2 @@
1	Copyright (c) 1997-2004 Klever Group (http://www.klever.net/)	1	Copyright (c) 1997-2005 Klever Group (http://www.klever.net/)
2		2


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
4	help-news ./help/pumpkin.xml/<newsfor\s/	4	help-news ./help/pumpkin.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/pumpkin.xml b/help/pumpkin.xml index 2ccd23a..d283fcd 100644 --- a/help/pumpkin.xml +++ b/help/pumpkin.xml
@@ -7,3 +7,3 @@
7	<p><b><i>Enjoy!</i></b></p>	7	<p><b><i>Enjoy!</i></b></p>
8	<license years="1997-2004"/>	8	<license years="1997-2005"/>
9	<credist/>	9	<credist/>
@@ -11,2 +11,7 @@
11	<topic id="News" title="What's New">	11	<topic id="News" title="What's New">
		12	<newsfor version="2.6" date="August 6th, 2005">
		13	<ni>more robust solution to the backslash/slash dilemma</ni>
		14	<ni>A bit more elaborate error reporting</ni>
		15	<ni>Fixed uninstall procedure so that it works on XP</ni>
		16	</newfor>
12	<newsfor version="2.5" date="July 11th, 2004">	17	<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 @@
3		3
4	#defineKINAME "PumpKIN 2.5.1-trunk"	4	#define VERSION "2.6"
		5	#defineKINAME "PumpKIN " VERSION
5	#define SKINAME "PumpKIN"	6	#define SKINAME "PumpKIN"
@@ -62,2 +63,8 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
62	REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");	63	REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");
		64	REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);
		65	REG_UNINSTALL_COMMENT(SKINAME,"Klever PumpKIN");
		66	REG_UNINSTALL_VERSION(SKINAME,VERSION);
		67	REG_UNINSTALL_LOCATION(SKINAME,path);
		68	REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");
		69	REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/pumpkin/");
63		70


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
133	VS_VERSION_INFO VERSIONINFO	133	VS_VERSION_INFO VERSIONINFO
134	FILEVERSION 2,5,1,0	134	FILEVERSION 2,6,0,0
135	PRODUCTVERSION 2,5,1,0	135	PRODUCTVERSION 2,6,0,0
136	FILEFLAGSMASK 0x3fL	136	FILEFLAGSMASK 0x3fL
@@ -151,5 +151,5 @@ BEGIN
151	VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"	151	VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
152	VALUE "FileVersion", "2, 5, 1, 0\0"	152	VALUE "FileVersion", "2, 6, 0, 0\0"
153	VALUE "InternalName", "INSTALL\0"	153	VALUE "InternalName", "INSTALL\0"
154	VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net/)\0"	154	VALUE "LegalCopyright", "Copyright � 1997-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"
@@ -157,3 +157,3 @@ BEGIN
157	VALUE "ProductName", "PumpKIN\0"	157	VALUE "ProductName", "PumpKIN\0"
158	VALUE "ProductVersion", "2, 5, 1, 0\0"	158	VALUE "ProductVersion", "2, 6, 0, 0\0"
159	END	159	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
41	# PROP Target_Last_Scanned "Install - Win32 Canned"	41	# PROP Target_Last_Scanned "Install - Win32 Canned"
		42	CPP=cl.exe
42	RSC=rc.exe	43	RSC=rc.exe
43	MTL=mktyplib.exe	44	MTL=mktyplib.exe
44	CPP=cl.exe
45		45
@@ -79,3 +79,3 @@ CLEAN :
79	-@erase "$(INTDIR)\pumpkin.pch"	79	-@erase "$(INTDIR)\pumpkin.pch"
80	-@erase "$(INTDIR)\PumpKIN.res"	80	-@erase "$(INTDIR)\pumpkin.res"
81	-@erase "$(INTDIR)\PumpKINDlg.obj"	81	-@erase "$(INTDIR)\PumpKINDlg.obj"
@@ -104,3 +104,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
104	# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"	104	# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
105	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" /d "_AFXDLL"	105	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" /d "_AFXDLL"
106	BSC32=bscmake.exe	106	BSC32=bscmake.exe
@@ -123,3 +123,3 @@ LINK32_OBJS= \
123	"$(INTDIR)\PumpKIN.obj" \	123	"$(INTDIR)\PumpKIN.obj" \
124	"$(INTDIR)\PumpKIN.res" \	124	"$(INTDIR)\pumpkin.res" \
125	"$(INTDIR)\PumpKINDlg.obj" \	125	"$(INTDIR)\PumpKINDlg.obj" \
@@ -187,3 +187,3 @@ CLEAN :
187	-@erase "$(INTDIR)\pumpkin.pch"	187	-@erase "$(INTDIR)\pumpkin.pch"
188	-@erase "$(INTDIR)\PumpKIN.res"	188	-@erase "$(INTDIR)\pumpkin.res"
189	-@erase "$(INTDIR)\PumpKIN.sbr"	189	-@erase "$(INTDIR)\PumpKIN.sbr"
@@ -224,3 +224,3 @@ MTL_PROJ=/nologo /D "_DEBUG" /win32
224	# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"	224	# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
225	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "_DEBUG" /d "_AFXDLL"	225	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "_DEBUG" /d "_AFXDLL"
226	BSC32=bscmake.exe	226	BSC32=bscmake.exe
@@ -260,3 +260,3 @@ LINK32_OBJS= \
260	"$(INTDIR)\PumpKIN.obj" \	260	"$(INTDIR)\PumpKIN.obj" \
261	"$(INTDIR)\PumpKIN.res" \	261	"$(INTDIR)\pumpkin.res" \
262	"$(INTDIR)\PumpKINDlg.obj" \	262	"$(INTDIR)\PumpKINDlg.obj" \
@@ -318,3 +318,3 @@ CLEAN :
318	-@erase "$(INTDIR)\pumpkin.pch"	318	-@erase "$(INTDIR)\pumpkin.pch"
319	-@erase "$(INTDIR)\PumpKIN.res"	319	-@erase "$(INTDIR)\pumpkin.res"
320	-@erase "$(INTDIR)\PumpKINDlg.obj"	320	-@erase "$(INTDIR)\PumpKINDlg.obj"
@@ -342,3 +342,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
342	# ADD RSC /l 0x409 /d "NDEBUG"	342	# ADD RSC /l 0x409 /d "NDEBUG"
343	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG"	343	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG"
344	BSC32=bscmake.exe	344	BSC32=bscmake.exe
@@ -361,3 +361,3 @@ LINK32_OBJS= \
361	"$(INTDIR)\PumpKIN.obj" \	361	"$(INTDIR)\PumpKIN.obj" \
362	"$(INTDIR)\PumpKIN.res" \	362	"$(INTDIR)\pumpkin.res" \
363	"$(INTDIR)\PumpKINDlg.obj" \	363	"$(INTDIR)\PumpKINDlg.obj" \
@@ -463,3 +463,3 @@ INTDIR=.\Install\Pure
463		463
464	ALL : "$(OUTDIR)\Install.exe"	464	ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"
465		465
@@ -468,2 +468,4 @@ CLEAN :
468	-@erase "$(INTDIR)\Install.res"	468	-@erase "$(INTDIR)\Install.res"
		469	-@erase "$(INTDIR)\install.sbr"
		470	-@erase "$(OUTDIR)\Install.bsc"
469	-@erase "$(OUTDIR)\Install.exe"	471	-@erase "$(OUTDIR)\Install.exe"
@@ -474,7 +476,7 @@ CLEAN :
474	# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c	476	# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c
475	# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c	477	# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /c
476	CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\	478	CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
477	"_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c	479	"_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c
478	CPP_OBJS=.\Install\Pure/	480	CPP_OBJS=.\Install\Pure/
479	CPP_SBRS=.\.	481	CPP_SBRS=.\Install\Pure/
480	# ADD BASE MTL /nologo /D "NDEBUG" /win32	482	# ADD BASE MTL /nologo /D "NDEBUG" /win32
@@ -490,3 +492,9 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc"
490	BSC32_SBRS= \	492	BSC32_SBRS= \
491		493	"$(INTDIR)\install.sbr"
		494
		495	"$(OUTDIR)\Install.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
		496	$(BSC32) @<<
		497	$(BSC32_FLAGS) $(BSC32_SBRS)
		498	<<
		499
492	LINK32=link.exe	500	LINK32=link.exe
@@ -831,3 +839,3 @@ DEP_RSC_PUMPKIN=\
831		839
832	"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"	840	"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
833	$(RSC) $(RSC_PROJ) $(SOURCE)	841	$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -838,3 +846,3 @@ DEP_RSC_PUMPKIN=\
838		846
839	"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"	847	"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
840	$(RSC) $(RSC_PROJ) $(SOURCE)	848	$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -845,3 +853,3 @@ DEP_RSC_PUMPKIN=\
845		853
846	"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"	854	"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
847	$(RSC) $(RSC_PROJ) $(SOURCE)	855	$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -1399,5 +1407,11 @@ DEP_CPP_INSTAL=\
1399		1407
		1408	BuildCmds= \
		1409	$(CPP) $(CPP_PROJ) $(SOURCE) \
		1410
		1411
1400	"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"	1412	"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1401	$(CPP) $(CPP_PROJ) $(SOURCE)	1413	$(BuildCmds)
1402		1414
		1415	"$(INTDIR)\install.sbr" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
		1416	$(BuildCmds)
1403		1417


diff --git a/pumpkin.rc b/pumpkin.rc index 1bf0fd3..7dafe04 100644 --- a/pumpkin.rc +++ b/pumpkin.rc
@@ -84,5 +84,5 @@ BEGIN
84	ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20	84	ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
85	LTEXT "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,	85	LTEXT "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
86	SS_NOPREFIX	86	SS_NOPREFIX
87	LTEXT "Copyright � 1997-2004 Klever Group",IDC_STATIC,40,30,	87	LTEXT "Copyright � 1997-2005 Klever Group",IDC_STATIC,40,30,
88	170,8	88	170,8
@@ -289,4 +289,4 @@ END
289	VS_VERSION_INFO VERSIONINFO	289	VS_VERSION_INFO VERSIONINFO
290	FILEVERSION 2,5,1,0	290	FILEVERSION 2,6,0,0
291	PRODUCTVERSION 2,5,1,0	291	PRODUCTVERSION 2,6,0,0
292	FILEFLAGSMASK 0x3fL	292	FILEFLAGSMASK 0x3fL
@@ -307,5 +307,5 @@ BEGIN
307	VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"	307	VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
308	VALUE "FileVersion", "2, 5, 1, 0\0"	308	VALUE "FileVersion", "2, 6, 0, 0\0"
309	VALUE "InternalName", "PUMPKIN\0"	309	VALUE "InternalName", "PUMPKIN\0"
310	VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net)\0"	310	VALUE "LegalCopyright", "Copyright � 1997-2005 Klever Group (http://www.klever.net)\0"
311	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"	311	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
@@ -313,3 +313,3 @@ BEGIN
313	VALUE "ProductName", "PumpKIN\0"	313	VALUE "ProductName", "PumpKIN\0"
314	VALUE "ProductVersion", "2, 5, 1, 0\0"	314	VALUE "ProductVersion", "2, 6, 0, 0\0"
315	END	315	END