ow-build: update readme to be up-to-date

remove CDROM related residual items update info about WWINHELP environment variable
winspool · Jun 7, 2024 · c3985d2 · c3985d2
1 parent 7fbe3bb
commit c3985d2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/bld/docstxt/readme.sp b/bld/docstxt/readme.sp
@@ -47,37 +47,30 @@ on the host platform (DOS, OS/2, Win32). The common variables are:
  - LIB       - points to directories containing library files; note that
                Open Watcom linker is able to locate Open Watcom runtime
                libraries without this variable
- - ...HELP   - points to the directory on the CDROM drive where help files
-               are located. This may minimize hard disk space requirements
+ - ...HELP   - points to the directory where help files are located.
+               Note this is not needed if the help files are installed on
+               the hard disk.
 
 DOS specifics
 
  - PATH      - only needs to point to the binw directory
- - WWINHELP  - points to the directory on the CDROM drive where help files
-               are located. This minimizes hard disk space. Note this is not
-               needed if the help files are installed on the hard disk
+ - WWINHELP  - points to the directory where help files are located.
 
 Win16 specifics
 
  - PATH      - only needs to point to the binw directory
- - WWINHELP  - points to the directory on the CDROM drive where help files
-               are located. This minimizes hard disk space. Note this is not
-               needed if the help files are installed on the hard disk
+ - WWINHELP  - points to the directory where help files are located.
 
 Win32 specifics
 
  - PATH      - must point to binnt and binw directories, in that order
- - WWINHELP  - points to the directory on the CDROM drive where help files
-               are located. This minimizes hard disk space. Note this is not
-               needed if the help files are installed on the hard disk
+ - WWINHELP  - points to the directory where help files are located.
 
 Win64 specifics
 
  - PATH      - must point to binnt64 and binnt directories, in that order
- - WHTMLHELP - points to the directory on the CDROM drive where Windows html
-               help files are located. This minimizes hard disk space.
-               Note this is not needed if the help files are installed on
-               the hard disk.
+ - WHTMLHELP - points to the directory where Windows html help files are
+               located.
 
 OS/2 specifics
 
@@ -94,10 +87,12 @@ OS/2 specifics
 Linux 32-bit specifics
 
  - PATH      - must point to binl directory
+ - WWINHELP  - points to the directory where help files are located.
 
 Linux 64-bit specifics
 
  - PATH      - must point to binl64 and binl directory, in that order
+ - WWINHELP  - points to the directory where help files are located.
 
 These environment variables can be either set up in your startup files (which
 is the most convenient method if Open Watcom is the only compiler you use)
@@ -125,7 +120,7 @@ SET EDPATH=%WATCOM%\EDDAT
 SET INCLUDE=%WATCOM%\H
 :endsegment
 REM SET LIB=
-REM SET WWINHELP=D:\BINW
+REM SET WWINHELP=%WATCOM%\BINW
 ---------------------------------------------------------------------------
 
 Win16 BAT file:
@@ -138,7 +133,7 @@ SET EDPATH=%WATCOM%\EDDAT
 SET INCLUDE=%WATCOM%\H;%WATCOM%\H\WIN
 :endsegment
 REM SET LIB=
-REM SET WWINHELP=D:\BINW
+REM SET WWINHELP=%WATCOM%\BINW
 ---------------------------------------------------------------------------
 
 Win32 BAT file:
@@ -151,7 +146,7 @@ SET EDPATH=%WATCOM%\EDDAT
 SET INCLUDE=%WATCOM%\H;%WATCOM%\H\NT
 :endsegment
 REM SET LIB=
-REM SET WWINHELP=D:\BINW
+REM SET WWINHELP=%WATCOM%\BINNT
 ---------------------------------------------------------------------------
 
 Win64 BAT file:
@@ -164,7 +159,7 @@ SET EDPATH=%WATCOM%\EDDAT
 SET INCLUDE=%WATCOM%\H;%WATCOM%\H\NT
 :endsegment
 REM SET LIB=
-REM SET WHTMLHELP=D:\BINNT\HELP
+REM SET WHTMLHELP=%WATCOM%\BINNT\HELP
 ---------------------------------------------------------------------------
 
 OS/2 CMD file:
@@ -191,6 +186,7 @@ export EDPATH=$WATCOM/eddat
 export INCLUDE=$WATCOM/lh
 :endsegment
 #export LIB=
+#export WWINHELP=%WATCOM%/binw
 ---------------------------------------------------------------------------
 
 Linux 64-bit shell script:
@@ -202,4 +198,5 @@ export EDPATH=$WATCOM/eddat
 export INCLUDE=$WATCOM/lh
 :endsegment
 #export LIB=
+#export WWINHELP=%WATCOM%/binw
 ---------------------------------------------------------------------------
diff --git a/bld/setupgui/c/utils.c b/bld/setupgui/c/utils.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -2697,7 +2697,6 @@ bool InitInfo( const VBUF *inf_name, const VBUF *src_path )
     int                 ret;
 
     SetVariableByName_vbuf( "SrcDir", src_path );
-    SetVariableByName_vbuf( "SrcDir2", src_path );
 //    VbufSplitpath( inf_name, drive, dir, NULL, NULL );
 
     ret = SimInit( inf_name );

diff --git a/distrib/ow/common.inf b/distrib/ow/common.inf
@@ -4,7 +4,6 @@ supplemental=winsys
 supplemental=windir
 winsys=%winsystemdir%
 MinimalInstall=false
-CDDir=%SrcDir2%
 DoCreateIcons=1
 DoCreateHelpIcons=1
 DoModifyAuto=1
@@ -19,7 +18,7 @@ UninstallCompany=openwatcom.org
 UninstallHelpURL=http://www.openwatcom.org
 UninstallMajorVersion=2
 UninstallMinorVersion=0
-ToolHelp=%CDDir%\binw\toolhelp.dll
+#ToolHelp=%CDDir%\binw\toolhelp.dll
 GenerateBatchFile=1
 BatchFileName=%DstDir%/owsetenv
 BatchFileCaption=Open Watcom Build Environment
@@ -111,6 +110,7 @@ env=WATCOM=%DstDir%,                            IsOS2 IsOS2DosBox IsDOS IsWin16
 env=EDPATH=%DstDir%\EDDAT,                      IsOS2 IsOS2DosBox IsDOS IsWin16 IsWin32 IsWin64 | | | | |
 env=EDPATH=%DstDir%/eddat,                      IsLinux32 IsLinux64 |
 env=WWINHELP=%DstDir%\BINW,                     IsDOS IsWin16 IsWin32 | |
+env=WWINHELP=%DstDir%/binw,                     IsLinux32 IsLinux64 |
 env=WHTMLHELP=%DstDir%\BINNT\HELP,              IsWin32 IsWin64 |
 env=WIPFC=%DstDir%\WIPFC,                       IsOS2 IsOS2DosBox IsDOS IsWin16 IsWin32 IsWin64 | | | | |
 env=WIPFC=%DstDir%/wipfc,                       IsLinux32 IsLinux64 |

diff --git a/distrib/ow/helpfile.dlg b/distrib/ow/helpfile.dlg
@@ -22,8 +22,8 @@ check_box=os2_helpfiles,,\
         //1"&OS/2 ホスト・ヘルプファイル"\
         //-1
 check_box=whelp_helpfiles,,\
-        //0"&DOS Hosted Help Files"\
-        //1"&DOS ホスト・ヘルプファイル"\
+        //0"&Character mode Help Files"\
+        //1"&Character mode Help Files"\
         //-1
 check_box=pdf_helpfiles,,\
         //0"&PDF Help Files"\

diff --git a/distrib/ow/readme.1st b/distrib/ow/readme.1st
@@ -72,7 +72,7 @@ mh                  - 16-bit huge memory model
 samples             - Miscellaneous sample source code
 win16_helpfiles     - Windows 3.x help files
 win32_helpfiles     - Win32 help files
-whelp_helpfiles     - WHELP format help files
+whelp_helpfiles     - Character mode WHELP format help files
 os2_helpfiles       - OS/2 help files
 pdf_helpfiles       - PDF help files