NetWare update from Ananth Kesari.

p4raw-id: //depot/perl@17033

5 files changed, 33 insertions, 79 deletions

diff --git a/NetWare/bat/Buildtype.bat b/NetWare/bat/Buildtype.bat
index 9f39da7241..7ea8cb5afe 100644
--- a/NetWare/bat/Buildtype.bat
+++ b/NetWare/bat/Buildtype.bat
@@ -17,7 +17,7 @@ if "%1" == "R" goto set_type_rel
 if "%1" == "d" goto set_type_dbg
 if "%1" == "D" goto set_type_dbg
 
-Rem Invalid input, display help message
+Rem Invalid input and so display the help message
 goto Usage
  
 :set_type_rel
@@ -39,14 +39,14 @@ goto exit
 
 :now
 if "%MAKE_TYPE%" == "" echo MAKE_TYPE is not set, hence it defaults to Release build
-if not "%MAKE_TYPE%"  == "" echo Current build type is - %MAKE_TYPE%
+if not "%MAKE_TYPE%" == "" echo Current build type is - %MAKE_TYPE%
 call ToggleD2 /now
 goto exit
 
 :Usage
  @echo on
  @echo "Usage: buildtype r/R|d/D [on/off]"  
- @echo      on/off - Toggling D2 flag for debug build
+ @echo      on/off - Toggling only for D2 flag during debug build
  @echo "Usage: buildtype /now"  - To display current setting
  @echo Ex. buildtype d on
 
diff --git a/NetWare/bat/SetCodeWar.bat b/NetWare/bat/SetCodeWar.bat
index c70ff02839..19ca59c3e4 100644
--- a/NetWare/bat/SetCodeWar.bat
+++ b/NetWare/bat/SetCodeWar.bat
@@ -41,46 +41,3 @@ goto exit
  @echo Ex. setCodeWar d:\CodeWar
 
 :exit
-@echo off

-@rem AUTHOR: sgp & apc

-@rem CREATED: 24th July 2000

-@rem LAST REVISED: 6th April 2001

-@rem LAST REVISED: 22nd May 2002

-@rem AUTHOR: apc

-@rem Batch file to set the path to CodeWarrior directories

-@rem This file is called from SetNWBld.bat.

-

-if "%1" == "/now" goto now

-if "%1" == "" goto Usage

-if "%1" == "/?" goto usage

-if "%1" == "/h" goto usage

-

-set CODEWAR=%1

-ECHO CODEWAR=%1

-

-call buildtype r

-@echo Buildtype set to Release type

-

-set MWCIncludes=%1\include

-@echo MWCIncludes=%1\include

-set MWLibraries=%1\lib

-@echo MWLibraries=%1\lib

-set MWLibraryFiles=%1\lib\nwpre.obj;%1\lib\mwcrtld.lib

-@echo MWLibraryFiles=%1\lib\nwpre.obj;%1\lib\mwcrtld.lib

-

-set PATH=%PATH%;%1\bin;

-@echo PATH=%PATH%;%1\bin;

-

-goto exit

-

-:now

-@echo CODEWAR=%CODEWAR%

-goto exit

-

-:Usage

- @echo on

- @echo "Usage: setCodeWar <Path to CodeWarrior binaries>"

- @echo "Usage: setCodeWar /now" - To display current setting

- @echo Ex. setCodeWar d:\CodeWar

-

-:exit

diff --git a/NetWare/bat/SetNWBld.bat b/NetWare/bat/SetNWBld.bat
index 062c531186..851d90e507 100644
--- a/NetWare/bat/SetNWBld.bat
+++ b/NetWare/bat/SetNWBld.bat
@@ -1,9 +1,10 @@
 @echo off
-@rem AUTHOR: sgp
+@rem AUTHOR: apc
 @rem CREATED: Thu 18th Jan 2001 09:18:08
 @rem LAST REVISED: 6th April 2001
-@rem Batch file to set the path to NetWare SDK, Watcom directories & MPK SDK
-@rem This file calls setnlmsdk.bat, setwatcom.bat & setmpksdk.bat
+@rem LAST REVISED: 22nd May 2002
+@rem Batch file to set the path to Default Buildtype,NetWare SDK, CodeWarrior directories 
+@rem This file calls buildtype with release as defualt,setnlmsdk.bat, setCodeWar.bat & setmpksdk.bat and MpkBuild with off as default
 
 REM If no parameters are passed, display usage
 if "%1" == "" goto Usage
@@ -15,48 +16,44 @@ if "%1" == "/now" goto now
 
 REM If na is passed, don't set that parameter
 if "%1" == "na" goto skip_nlmsdk_msg
+
 :setnwsdk
 call setnlmsdk %1
 goto skip_nlmsdk_nomsg
 
 :skip_nlmsdk_msg
 @echo Retaining NLMSDKBASE=%NLMSDKBASE%
-:skip_nlmsdk_nomsg
 
-if "%2" == "" goto exit
-if "%2" == "na" goto skip_watcom_msg
-:setwatcom
-call setwatcom %2
-goto skip_watcom_nomsg
-
-:skip_watcom_msg
-@echo Retaining WATCOM=%WATCOM%
-:skip_watcom_nomsg
+:skip_nlmsdk_nomsg
+if "%2" == "" goto err_exit
+if "%2" == "na" goto skip_cw_msg
 
-if "%3" == "" goto exit
-if "%3" == "na" goto skip_mpksdk_msg
-:setmpk
-call setmpksdk %3
-goto skip_mpksdk_nomsg
+:setcodewar
+call setcodewar %2
+goto skip_cw_nomsg
 
-:skip_mpksdk_msg
-@echo Retaining MPKBASE=%MPKBASE%
-:skip_mpksdk_nomsg
+:skip_cw_msg
+@echo Retaining CODEWAR=%CODEWAR%
+goto exit
 
+:skip_cw_nomsg
 goto exit
 
+:err_exit
+@echo Not Enough Parameters
+goto Usage
+
 :now
 @echo NLMSDKBASE=%NLMSDKBASE%
-@echo WATCOM=%WATCOM%
-@echo MPKBASE=%MPKBASE%
+@echo CODEWAR=%CODEWAR%
 goto exit
 
-goto exit
 :Usage
  @echo on
- @echo "Usage: setnwbld <path to NetWare SDK> [<path to Watcom dir>] [<path to MPK SDK>]"
- @echo "Usage: setnwbld /now" - To display current setting
+ @echo "Usage: setnwdef <path to NetWare SDK> <path to CodeWarrior dir>"
+ @echo "Usage: setnwdef /now" - To display current setting
  @echo Pass na if you don't want to change a setting
- @echo Ex. setnwbld d:\ndk\nwsdk na p:\mpk
- @echo Ex. setnwbld d:\ndk\
+ @echo Ex. setnwbld d:\ndk\nwsdk na
+ @echo Ex. setnwbld na d:\codewar
+
 :exit
diff --git a/NetWare/bat/Setnlmsdk.bat b/NetWare/bat/Setnlmsdk.bat
index 82fcf8bd28..96c77afde1 100644
--- a/NetWare/bat/Setnlmsdk.bat
+++ b/NetWare/bat/Setnlmsdk.bat
@@ -24,5 +24,5 @@ goto exit
  @echo "Usage: setnlmsdk <path to NetWare sdk>"
  @echo "Usage: setnlmsdk /now" - To display current setting
  @echo Ex. setnlmsdk e:\sdkcd14\nwsdk
-:exit
 
+:exit
diff --git a/NetWare/bat/ToggleD2.bat b/NetWare/bat/ToggleD2.bat
index d3f5d2c44e..89b69e3acc 100644
--- a/NetWare/bat/ToggleD2.bat
+++ b/NetWare/bat/ToggleD2.bat
@@ -13,7 +13,9 @@ if "%1" == "on" goto yes
 if "%1" == "off" goto no
 if "%1" == "/?" goto usage
 if "%1" == "/h" goto usage
-goto dontknow
+
+Rem Invalid input and so display the help message
+goto Usage
 
 :now
 if "%USE_D2%" == "" echo USE_D2 is removed, uses /d1
@@ -30,11 +32,9 @@ Set USE_D2=
 echo ....USE_D2 is removed. uses /d1
 goto exit
 
-:dontknow
-goto Usage
-
 :Usage
  @echo on
  @echo "Usage: ToggleD2 [on|off]"
  @echo "Usage: ToggleD2 /now" - To display current setting
+
 :exit