From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 27 May 2002 16:22:06 +0000 (+0000)
Subject: NetWare diff from Ananth Kesari.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8213a98bef1bbbd4199bd867bb676f2fb4424cb0;p=p5sagit%2Fp5-mst-13.2.git

NetWare diff from Ananth Kesari.

p4raw-id: //depot/perl@16811
---

diff --git a/NetWare/bat/SetNWDef.bat b/NetWare/bat/SetNWDef.bat
new file mode 100644
index 0000000..3b53cfd
--- /dev/null
+++ b/NetWare/bat/SetNWDef.bat
@@ -0,0 +1,73 @@
+@echo off
+@rem AUTHOR: apc
+@rem CREATED: Thu 18th Jan 2001 09:18:08
+@rem LAST REVISED: 6th April 2001
+@rem LAST REVISED: 6th May 2002
+@rem Batch file to set the path to Default Buildtype,NetWare SDK, CodeWarrior directories & MPK SDK and MPKbuild options
+@rem This file calls buildtype with release as defualt,setnlmsdk.bat, setcw.bat & setmpksdk.bat and MpkBuild with off as default
+
+REM If no parameters are passed, display usage
+if "%1" == "" goto Usage
+if "%1" == "/?" goto Usage
+if "%1" == "/h" goto Usage
+
+REM Display the current settings
+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 err_exit
+if "%2" == "na" goto skip_cw_msg
+:setcw
+call setcw %2
+goto skip_cw_nomsg
+
+:skip_cw_msg
+@echo Retaining CODEWAR=%CODEWAR%
+:skip_cw_nomsg
+
+if "%3" == "" goto exit
+if "%3" == "na" goto skip_mpksdk_msg
+
+:setmpk
+call setmpksdk %3
+goto exit
+
+:mpksdk_off
+call mpkbuild off
+@echo mpkbuild off
+goto exit
+
+:skip_mpksdk_msg
+@echo Retaining MPKBASE=%MPKBASE%
+goto exit
+
+:now
+@echo NLMSDKBASE=%NLMSDKBASE%
+@echo cw=%cw%
+@echo MPKBASE=%MPKBASE%
+goto exit
+
+goto exit
+
+:err_exit
+@echo Not Enough Parameters
+goto Usage
+
+:Usage
+ @echo on
+ @echo "Usage: setnwbld <path to NetWare SDK> [<path to CodeWarrior dir>] "
+ @echo "Usage: setnwbld /now" - To display current setting
+ @echo Pass na if you don't want to change a setting
+ @echo Ex. setnwbld d:\ndk\nwsdk na 
+ @echo Ex. setnwbld d:\ndk\
+:exit
diff --git a/NetWare/bat/Setcw.bat b/NetWare/bat/Setcw.bat
new file mode 100644
index 0000000..a2c2f80
--- /dev/null
+++ b/NetWare/bat/Setcw.bat
@@ -0,0 +1,35 @@
+@echo off
+@rem AUTHOR: sgp
+@rem CREATED: 24th July 2000
+@rem LAST REVISED: 6th April 2001
+@rem LAST REVISED: 6th Mayl 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
+call buildtype r
+@echo Buildtype set to Release type
+set MWCIncludes=%1\include
+set MWLibraries=%1\lib
+set MWLibraryFiles=%1\lib\nwpre.obj;p:\apps\script\sw\cw\lib\mwcrtld.lib
+set PATH=%PATH%;p:\apps\script\sw\cw\bin;
+goto exit
+
+:now
+@echo CODEWAR=%CODEWAR%
+goto exit
+
+:Usage
+ @echo on
+ @echo "Usage: setcw <path to CodeWarrior>"
+ @echo "Usage: setcw /now" - To display current setting
+ @echo Ex. setcw d:\CodeWar
+:exit
+
diff --git a/NetWare/bat/Setwatcom.bat b/NetWare/bat/Setwatcom.bat
index 445ac67..e69de29 100644
--- a/NetWare/bat/Setwatcom.bat
+++ b/NetWare/bat/Setwatcom.bat
@@ -1,28 +0,0 @@
-@echo off
-@rem AUTHOR: sgp
-@rem CREATED: 24th July 2000
-@rem LAST REVISED: 6th April 2001
-@rem Batch file to set the path to Watcom 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 WATCOM=%1
-echo WATCOM set to %1
-
-goto exit
-
-:now
-@echo WATCOM=%WATCOM%
-goto exit
-
-:Usage
- @echo on
- @echo "Usage: setwatcom <path to Watcom>"
- @echo "Usage: setwatcom /now" - To display current setting
- @echo Ex. setwatcom d:\Watcom
-:exit
-
diff --git a/lib/ExtUtils/MM_NW5.pm b/lib/ExtUtils/MM_NW5.pm
index cd08a72..3c8b1a7 100644
--- a/lib/ExtUtils/MM_NW5.pm
+++ b/lib/ExtUtils/MM_NW5.pm
@@ -281,14 +281,13 @@ END
 
     $m .= <<'END' if $self->{PERL_SRC};
         $(NOECHO)echo "$(EXTRALIBS)" >> $(PERL_SRC)\ext.libs
-
+    
+    
 END
-
     $m .= $self->dir_target('$(INST_ARCHAUTODIR)');
     return $m;
 }
 
-
 =item dynamic_lib (o)
 
 Defines how to produce the *.so (or equivalent) files.