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 /install | |
parent | 81636a2fb6f93863cdca3fdad8ff3df753b17d5e (diff) | |
download | pumpkin-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
-rw-r--r-- | install/install.cpp | 9 | ||||
-rw-r--r-- | install/install.rc | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/install/install.cpp b/install/install.cpp index 6fa4ae4..d11de03 100644 --- a/install/install.cpp +++ b/install/install.cpp | |||
@@ -1,67 +1,74 @@ | |||
1 | #include "resource.h" | 1 | #include "resource.h" |
2 | #include "../shared-code/install.h" | 2 | #include "../shared-code/install.h" |
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" |
6 | 7 | ||
7 | BOOL Install(void) | 8 | BOOL Install(void) |
8 | { | 9 | { |
9 | STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path"); | 10 | STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path"); |
10 | STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); | 11 | STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); |
11 | LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); | 12 | LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); |
12 | STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); | 13 | STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); |
13 | if(!path) | 14 | if(!path) |
14 | return NULL; | 15 | return NULL; |
15 | 16 | ||
16 | #ifdefK_ANNED | 17 | #ifdefK_ANNED |
17 | STRING sysDir(_MAX_PATH); | 18 | STRING sysDir(_MAX_PATH); |
18 | GetSystemDirectory(sysDir,_MAX_PATH); | 19 | GetSystemDirectory(sysDir,_MAX_PATH); |
19 | INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); | 20 | INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); |
20 | #endif | 21 | #endif |
21 | 22 | ||
22 | MAKE_PATH(path); | 23 | MAKE_PATH(path); |
23 | STRING shortPath = GET_SHORT_PATH(path); | 24 | STRING shortPath = GET_SHORT_PATH(path); |
24 | if(!shortPath){ | 25 | if(!shortPath){ |
25 | MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); | 26 | MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); |
26 | return FALSE; | 27 | return FALSE; |
27 | } | 28 | } |
28 | 29 | ||
29 | if(!( | 30 | if(!( |
30 | INSTALLFILE(SKINAME ".ex_",path,SKINAME ".exe") && | 31 | INSTALLFILE(SKINAME ".ex_",path,SKINAME ".exe") && |
31 | INSTALLFILE(SKINAME ".hl_",path,SKINAME ".hlp") && | 32 | INSTALLFILE(SKINAME ".hl_",path,SKINAME ".hlp") && |
32 | INSTALLFILE(SKINAME ".cn_",path,SKINAME ".cnt") | 33 | INSTALLFILE(SKINAME ".cn_",path,SKINAME ".cnt") |
33 | )){ | 34 | )){ |
34 | MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); | 35 | MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); |
35 | return FALSE; | 36 | return FALSE; |
36 | } | 37 | } |
37 | ADDMENU("Klever Group",SKINAME,path, SKINAME ".exe"); | 38 | ADDMENU("Klever Group",SKINAME,path, SKINAME ".exe"); |
38 | 39 | ||
39 | strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path); | 40 | strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path); |
40 | strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path); | 41 | strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path); |
41 | 42 | ||
42 | FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF"); | 43 | FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF"); |
43 | if(!inf){ | 44 | if(!inf){ |
44 | MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK); | 45 | MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK); |
45 | return FALSE; | 46 | return FALSE; |
46 | } | 47 | } |
47 | INF_FILE_HEADER(inf); | 48 | INF_FILE_HEADER(inf); |
48 | INF_FILE_SECTION(inf,"Uninstall"); | 49 | INF_FILE_SECTION(inf,"Uninstall"); |
49 | fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n"); | 50 | fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n"); |
50 | INF_FILE_SECTION(inf,"kFiles"); | 51 | INF_FILE_SECTION(inf,"kFiles"); |
51 | INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath); | 52 | INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath); |
52 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe"); | 53 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe"); |
53 | INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME); | 54 | INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME); |
54 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf"); | 55 | INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf"); |
55 | INF_FILE_SECTION(inf,"kReg"); | 56 | INF_FILE_SECTION(inf,"kReg"); |
56 | INF_UNINSTALL_REG(inf,SKINAME); | 57 | INF_UNINSTALL_REG(inf,SKINAME); |
57 | INF_FILE_SECTION(inf,"kMenu"); | 58 | INF_FILE_SECTION(inf,"kMenu"); |
58 | INF_MENU_GROUP(inf,1,"Klever Group"); | 59 | INF_MENU_GROUP(inf,1,"Klever Group"); |
59 | INF_MENU_ITEM(inf,1,SKINAME); | 60 | INF_MENU_ITEM(inf,1,SKINAME); |
60 | fclose(inf); | 61 | fclose(inf); |
61 | 62 | ||
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 | ||
64 | 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); | 71 | 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); |
65 | 72 | ||
66 | return TRUE; | 73 | return TRUE; |
67 | } | 74 | } |
diff --git a/install/install.rc b/install/install.rc index 30907ad..cc621ad 100644 --- a/install/install.rc +++ b/install/install.rc | |||
@@ -102,81 +102,81 @@ BEGIN | |||
102 | END | 102 | END |
103 | 103 | ||
104 | 2 TEXTINCLUDE DISCARDABLE | 104 | 2 TEXTINCLUDE DISCARDABLE |
105 | BEGIN | 105 | BEGIN |
106 | "#include ""afxres.h""\r\n" | 106 | "#include ""afxres.h""\r\n" |
107 | "\0" | 107 | "\0" |
108 | END | 108 | END |
109 | 109 | ||
110 | 3 TEXTINCLUDE DISCARDABLE | 110 | 3 TEXTINCLUDE DISCARDABLE |
111 | BEGIN | 111 | BEGIN |
112 | "#include ""custom.rch""\0" | 112 | "#include ""custom.rch""\0" |
113 | END | 113 | END |
114 | 114 | ||
115 | #endif // APSTUDIO_INVOKED | 115 | #endif // APSTUDIO_INVOKED |
116 | 116 | ||
117 | 117 | ||
118 | ///////////////////////////////////////////////////////////////////////////// | 118 | ///////////////////////////////////////////////////////////////////////////// |
119 | // | 119 | // |
120 | // Icon | 120 | // Icon |
121 | // | 121 | // |
122 | 122 | ||
123 | // Icon with lowest ID value placed first to ensure application icon | 123 | // Icon with lowest ID value placed first to ensure application icon |
124 | // remains consistent on all systems. | 124 | // remains consistent on all systems. |
125 | IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" | 125 | IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" |
126 | 126 | ||
127 | #ifndef _MAC | 127 | #ifndef _MAC |
128 | ///////////////////////////////////////////////////////////////////////////// | 128 | ///////////////////////////////////////////////////////////////////////////// |
129 | // | 129 | // |
130 | // Version | 130 | // Version |
131 | // | 131 | // |
132 | 132 | ||
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 |
137 | #ifdef _DEBUG | 137 | #ifdef _DEBUG |
138 | FILEFLAGS 0x1L | 138 | FILEFLAGS 0x1L |
139 | #else | 139 | #else |
140 | FILEFLAGS 0x0L | 140 | FILEFLAGS 0x0L |
141 | #endif | 141 | #endif |
142 | FILEOS 0x40004L | 142 | FILEOS 0x40004L |
143 | FILETYPE 0x1L | 143 | FILETYPE 0x1L |
144 | FILESUBTYPE 0x0L | 144 | FILESUBTYPE 0x0L |
145 | BEGIN | 145 | BEGIN |
146 | BLOCK "StringFileInfo" | 146 | BLOCK "StringFileInfo" |
147 | BEGIN | 147 | BEGIN |
148 | BLOCK "040904b0" | 148 | BLOCK "040904b0" |
149 | BEGIN | 149 | BEGIN |
150 | VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" | 150 | VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" |
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" |
156 | VALUE "OriginalFilename", "INSTALL.EXE\0" | 156 | VALUE "OriginalFilename", "INSTALL.EXE\0" |
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 |
160 | END | 160 | END |
161 | BLOCK "VarFileInfo" | 161 | BLOCK "VarFileInfo" |
162 | BEGIN | 162 | BEGIN |
163 | VALUE "Translation", 0x409, 1200 | 163 | VALUE "Translation", 0x409, 1200 |
164 | END | 164 | END |
165 | END | 165 | END |
166 | 166 | ||
167 | #endif // !_MAC | 167 | #endif // !_MAC |
168 | 168 | ||
169 | #endif // English (U.S.) resources | 169 | #endif // English (U.S.) resources |
170 | ///////////////////////////////////////////////////////////////////////////// | 170 | ///////////////////////////////////////////////////////////////////////////// |
171 | 171 | ||
172 | 172 | ||
173 | 173 | ||
174 | #ifndef APSTUDIO_INVOKED | 174 | #ifndef APSTUDIO_INVOKED |
175 | ///////////////////////////////////////////////////////////////////////////// | 175 | ///////////////////////////////////////////////////////////////////////////// |
176 | // | 176 | // |
177 | // Generated from the TEXTINCLUDE 3 resource. | 177 | // Generated from the TEXTINCLUDE 3 resource. |
178 | // | 178 | // |
179 | #include "custom.rch" | 179 | #include "custom.rch" |
180 | ///////////////////////////////////////////////////////////////////////////// | 180 | ///////////////////////////////////////////////////////////////////////////// |
181 | #endif // not APSTUDIO_INVOKED | 181 | #endif // not APSTUDIO_INVOKED |
182 | 182 | ||