Changeset 656

Timestamp:

May 5, 2007, 9:08:49 AM (19 years ago)

Author:

John Small

Message:

• Added a line to delete the FM/2 entry in OS2.INI upon de-installation.
• Added a line to delete obsolete files from a previous installation of

FM/2. if found (install.cmd, uninstal.cmd, install.dat)

• Changed the script to place the FM2 Utilities folder on the desktop

(instead of in the FM/2 folder). This prevents the de-installation of
FM/2 from deleting the FM/2 Utilities objects.

• Added a requirement for Warpin 0.9.20 or newer (to support revision

levels on PACKAGEID's).

• Made the default installation directories consistent by using the

WARPIN_DEFAULTTOOLSPATH.

File:

• trunk/warpin/fm2.wis (modified) (5 diffs)

trunk/warpin/fm2.wis

@@ -1 @@
-<WARPIN>
+<!--
+ WARPIN VERSION 0.9.20 is required for PACKAGEID's with revision levels.
+ WARPIN VERSION 0.9.9  is required for EXTRACTFROMPCK.
+-->
+<WARPIN VERSION 0.9.20>
 
 <!--
@@ -21 +25 @@
   PACKAGEID="Netlabs\FM2\Base\3\5\9\20070331"
   TITLE="FM/2 - File Manager/2 (Base package)"
-  TARGET="$(WARPIN_DEFAULTAPPSPATH)\FM2"
+  TARGET="$(WARPIN_DEFAULTTOOLSPATH)\FM2"
   SELECT
   BASE
@@ -51 +55 @@
   EXECUTE="$(1)\utilsmgr /UNATTENDED"
   EXECUTE="$(1)\utils\shadowmgr FM2"
+  EXECUTE="for %a in ($(1)\install.cmd $(1)\uninstal.cmd $(1)\install.dat) do if exist %a del %a"
   DEEXECUTE="$(1)\cfgmgr /DEINSTALL /UNATTENDED"
   DEEXECUTE="$(1)\utilsmgr /DELETE /UNATTENDED"
   DEEXECUTE="del $(1)\fm3.ini & del $(1)\fm3ini.bak"
+  CLEARPROFILE="USER\FM/2"
 
 
@@ -67 +73 @@
   TARGET="$(1)\Utils"
   SELECT
-  CREATEOBJECT="WPFolder|FM/2 Utilities|<FM3_Folder>|OBJECTID=<FM2_Utilities>;"
+  CREATEOBJECT="WPFolder|FM/2 Utilities|<WP_DESKTOP>|OBJECTID=<FM2_Utilities>;"
   CREATEOBJECT="WPProgram|Make Object|<FM2_Utilities>|EXENAME=$(7)\makeobj.cmd;PARAMETERS=%*;OBJECTID=<FM2MakeObj>;"
   CREATEOBJECT="WPProgram|Image Viewer|<FM2_Utilities>|EXENAME=$(7)\image.exe;PARAMETERS=%*;OBJECTID=<FM2Imageexe>;"
@@ -474 +480 @@
   CREATEOBJECT="WPProgram|Read Me|<FM3_Docs>|EXENAME=E.EXE;PROGTYPE=PM;PARAMETERS=$(1)\docs\readme;OBJECTID=<FM3Readme>;"
   CREATEOBJECT="WPProgram|Customizing^Resources|<FM3_Docs>|EXENAME=E.EXE;PROGTYPE=PM;PARAMETERS=$(1)\docs\customizingresources.txt;OBJECTID=<FM3CustRes>;"
-  CREATEOBJECT="WPProgram|FM/2 Utilities command line|<FM3_Tools>|EXENAME=?:\OS2\CMD.EXE;STARTUPDIR=?:\;PROGTYPE=WINDOWABLEVIO;PARAMETERS=/K $(1)\SETENV.CMD"
   CREATEOBJECT="WPProgram|FM/2 Utils Doc|<FM2_Utilities>|EXENAME=E.EXE;PROGTYPE=PM;PARAMETERS=$(7)\fm2utils.doc;OBJECTID=<FM2UtilsDoc>;"
 
-<README EXTRACTFROMPCK="7">fm2utils.doc</README>
 <WARPIN VERSION 1.0.15>