Changeset 2481

Timestamp:

Apr 28, 2012, 10:56:40 PM (13 years ago)

Author:

Andreas Schnellbacher

Message:

• Renamed NLSETUP.EXE to POSTWPI.EXE.
• Moved the relevant code to POSTWPI2.CMD for easier debugging.

Location:

trunk/src

Files:

• netlabs/install/applyico.cmd (modified) (1 diff)
• netlabs/install/cleanup.cmd (modified) (2 diffs)
• netlabs/install/dyncfg.cmd (modified) (1 diff)
• netlabs/install/expobj.cmd (modified) (1 diff)
• netlabs/install/initreg.cmd (modified) (1 diff)
• netlabs/install/instenv.cmd (modified) (1 diff)
• netlabs/install/postwpi2.cmd (copied) (copied from trunk/src/rexx/nlsetup.cmd ) (2 diffs)
• netlabs/install/recrobj.cmd (modified) (3 diffs)
• netlabs/install/remepm.cmd (modified) (1 diff)
• netlabs/install/renudirs.cmd (modified) (1 diff)
• netlabs/install/usertree.cmd (modified) (1 diff)
• rexx/makefile (modified) (4 diffs)
• rexx/postwpi.cmd (added)
• wis/nepmd.wis (modified) (2 diffs)

trunk/src/netlabs/install/applyico.cmd ¶

@@ -4 +4 @@
 *
 * Helper batch for to attach operating system dependant icons to the folders
-* of the NEPMD, as WarpIn can currently not determine the operating system
+* of the NEPMD, as WarpIN can currently not determine the operating system
 * version (Warp 3/Warp 4/eComStation) during installation.
 *
-* This program is intended to be called only by NLSETUP.EXE during NEPMD
+* This program is intended to be called only by POSTWPI2.CMD during NEPMD
 * installation or by RECROBJ.CMD.
 *

trunk/src/netlabs/install/cleanup.cmd ¶

@@ -5 +5 @@
 * Helper batch for to remove obsolete objects.
 *
-* This program is intended to be called only by NLSETUP.EXE during NEPMD
+* This program is intended to be called only by POSTWPI2.CMD during NEPMD
 * installation or by RECROBJ.CMD.
 *
@@ -111 +111 @@
    rcx = SysDestroyObject( NetlabsDir'\install\epmdefassocs.cmd')
    rcx = SysDestroyObject( NetlabsDir'\install\epmnewsamewindow.cmd')
+   rcx = SysDestroyObject( NetlabsDir'\install\special.cmd')
+   rcx = SysDestroyObject( NetlabsDir'\install\nlsetup.exe')
    rcx = SysDestroyObject( NetlabsDir'\macros\drawkey.e')
    rcx = SysDestroyObject( NetlabsDir'\macros\menuacel.e')

trunk/src/netlabs/install/dyncfg.cmd ¶

@@ -21 +21 @@
 * start and corrects it if it doesn't point to %NEPMD_USERDIR%\bin\nepmd.ini
 *
-* This program is intended to be called only by NLSETUP.EXE during NEPMD
+* This program is intended to be called only by POSTWPI2.CMD during NEPMD
 * installation or by RECROBJ.CMD.
 *

trunk/src/netlabs/install/expobj.cmd ¶

@@ -7 +7 @@
 * of the installation.
 *
-* This program is intended to be called only by NLSETUP.EXE during NEPMD
+* This program is intended to be called only by POSTWPI2.CMD during NEPMD
 * installation.
 *

trunk/src/netlabs/install/initreg.cmd ¶

@@ -10 +10 @@
 * DEFAULTS.DAT.
 *
-* This program is intended to be called only by NLSETUP.EXE during NEPMD
+* This program is intended to be called only by POSTWPI2.CMD during NEPMD
 * installation.
 *

trunk/src/netlabs/install/instenv.cmd ¶

@@ -314 +314 @@
 
 /* ErrorMessage may contain data, even if rc from that is ignored. */
-/* NLSETUP ignores messages if rc = 0. */
+/* POSTWPI ignores messages if rc = 0. */
 IF ErrorMessage <> '' THEN
    CALL SayErrorText

trunk/src/netlabs/install/postwpi2.cmd ¶

@@ -1 +1 @@
 /****************************** Module Header *******************************
 *
-* Module Name: nlsetup.cmd
+* Module Name: postwpi2.cmd
 *
-* Syntax: nlsetup [NEPMD [UNINSTALL | APPLYICO]]
+* Syntax: postwpi2 [NEPMD [UNINSTALL | APPLYICO]]
 *
 * Frame batch for to call all required CMD files when setting up additional
 * directories and files in the user directory tree.
 *
-* This module is called by the WarpIN package directly. In order to prevent
-* a VIO window opening for this REXX script, this (and only this script) is
-* compiled to a PM executable.
+* This module is called by the WarpIN package via POSTWPI.EXE. POSTWPI.EXE
+* is used only to prevent a VIO window opening for this REXX script.
 *
 * This program is intended to be called only during installation of the
@@ -72 +71 @@
 ErrorTitle = 'Netlabs EPM Distribution Installation'
 
-/* Parse parameters */
+/* Parse args */
 fNepmd     = FALSE
 fUninstall = FALSE
 fApplyIco  = FALSE
-ARG Parms
-DO WHILE Parms <> ''
-   PARSE VAR Parms ThisParm Parms
-   ThisParm = STRIP( ThisParm)
+ARG UpArgs
+Rest = UpArgs
+DO WHILE Rest <> ''
+   PARSE VAR Rest ThisArg Rest
+   ThisArg = STRIP( ThisArg)
 
    SELECT
-      WHEN ThisParm = '' THEN
+      WHEN ThisArg = '' THEN
          LEAVE
-      WHEN ThisParm = 'NEPMD' THEN
+      WHEN ThisArg = 'NEPMD' THEN
          fNepmd = TRUE
-      WHEN ThisParm = 'UNINSTALL' THEN
+      WHEN ThisArg = 'UNINSTALL' THEN
          fUninstall = TRUE
-      WHEN ThisParm = 'APPLYICO' THEN
+      WHEN ThisArg = 'APPLYICO' THEN
          fApplyIco = TRUE
    OTHERWISE

trunk/src/netlabs/install/recrobj.cmd ¶

@@ -14 +14 @@
 * The WarpIN database entries will not be recreated.
 *
-* This Cmd is not called by NLSETUP.EXE. It can be called directly.
+* This Cmd is not called by POSTWPI2.CMD. It can be called directly.
 *
 * Copyright (c) Netlabs EPM Distribution Project 2008
@@ -210 +210 @@
    IF (next = '') THEN ITERATE
 
-   SearchString = 'nlsetup.exe NEPMD'
+   SearchString = 'postwpi.exe NEPMD'
    IF (TRANSLATE( RIGHT( next, LENGTH( SearchString))) = TRANSLATE( SearchString)) THEN
    DO 1
@@ -220 +220 @@
         rcx = DIRECTORY( SUBSTR( WorkDir, 1, 2))
 
-      /* Keep in sync with NLSETUP.CMD/.EXE */
+      /* Keep in sync with POSTWPI2.CMD */
       'CALL INSTENV';           IF (rc \= 0) THEN LEAVE
       'CALL USERTREE';          IF (rc \= 0) THEN LEAVE

trunk/src/netlabs/install/remepm.cmd ¶

@@ -13 +13 @@
 * old files will be deleted.
 *
-* This Cmd is not called by NLSETUP.EXE. It can be called directly. It was
+* This Cmd is not called by POSTWPI2.CMD. It can be called directly. It was
 * left in here, because one would like to uninstall all EPM 5 files of
 * Warp 3. Note that this is not required. NEPMD can be used with the EPMBBS

trunk/src/netlabs/install/renudirs.cmd ¶

@@ -35 +35 @@
 * may be copied to the new empty directories.
 *
-* This program is intended to be called only by NLSETUP.EXE during NEPMD
+* This program is intended to be called only by POSTWPI2.CMD during NEPMD
 * installation.
 *

trunk/src/netlabs/install/usertree.cmd ¶

@@ -9 +9 @@
 * and also applies help panels to make F1 show help for objects.
 *
-* This program is intended to be called only by NLSETUP.EXE during NEPMD
+* This program is intended to be called only by POSTWPI2.CMD during NEPMD
 * installation or by RECROBJ.CMD.
 *

trunk/src/rexx/makefile ¶

@@ -3 +3 @@
 # Module Name: makefile
 #
-# makefile for creating an exe out of nlsetup.cmd
+# makefile for creating an exe out of postwpi.cmd
 #
 # Copyright (c) Netlabs EPM Distibution Project 2002
@@ -30 +30 @@
 
 FILESTOCLEAN= \
- $(CMPINSTDIR)\nlsetup.exe \
- $(CMPDIR)\nlsetup.log
+ $(CMPINSTDIR)\postwpi.exe \
+ $(CMPDIR)\postwpi.log
 
 # --- private extension of suffix list
@@ -44 +44 @@
 # --- pseudotargets
 
-ALL: NLSETUP
+ALL: POSTWPI
 
 # ---
@@ -54 +54 @@
 # ---
 
-NLSETUP: $(CMPINSTDIR)\nlsetup.exe
+POSTWPI: $(CMPINSTDIR)\postwpi.exe
 
 # ---- create EXE versions of frame REXX batchfiles
 
-$(CMPINSTDIR)\nlsetup.exe: nlsetup.cmd
+$(CMPINSTDIR)\postwpi.exe: postwpi.cmd
 

trunk/src/wis/nepmd.wis ¶

@@ -122 +122 @@
      NODESELECT
      TITLE="%PCK_1_TITLE%"
-     EXECUTE="$(1)\netlabs\install\nlsetup.exe NEPMD"
-     DEEXECUTE="$(1)\netlabs\install\nlsetup.exe NEPMD UNINSTALL"
+     EXECUTE="$(1)\netlabs\install\postwpi.exe NEPMD"
+     DEEXECUTE="$(1)\netlabs\install\postwpi.exe NEPMD UNINSTALL"
 
      CLEARPROFILE="USER\NEPMD\Language"
@@ -169 +169 @@
      REQUIRES="OS/2 Netlabs\WarpIN\Base\%ID_VERSION_REQ_WARPIN%"
      SELECT
-     EXECUTE="$(1)\netlabs\install\nlsetup.exe NEPMD APPLYICO"
+     EXECUTE="$(1)\netlabs\install\postwpi.exe NEPMD APPLYICO"
      TITLE="%PCK_2_TITLE%"