develooper Front page | perl.perl5.porters | Postings from April 2001

[PATCH: perl@9885] win32/Makefile (nmake) update

Thread Next
From:
Prymmer/Kahn
Date:
April 28, 2001 21:56
Subject:
[PATCH: perl@9885] win32/Makefile (nmake) update
Message ID:
Pine.BSF.4.21.0104282147270.2927-100000@shell8.ba.best.com

Enclosed please find a unix-format context diff of the changes
I found necessary to get the 9885 kit building with MS VC 5
and the nmake utility.  This patch affects only win32/Makefile
and does not (unfortunately) take care of win32/makefile.mk.

I also noted that the new t/lib/selfstubber.t test can pass all
of its 12 current tests but the test bombs on NT 4 while trying
to unlink the SSI-$$/Data.pm file since the OS file access lock
seems to think that there is another process using that file even
after test 12 prints out "ok 12\n". It like so:

D:\ttt\perl\t>./perl -I..\lib lib/selfstubber.t
1..12
ok 1
ok 2
ok 3
ok 4
ok 5
ok 6
# D:\ttt\perl\t\perl.exe "-I../lib" "-ISSI-188" Parent--188
# D:\ttt\perl\t\perl.exe "-I../lib" "-ISSI-188" Child--188
ok 7
ok 8
# D:\ttt\perl\t\perl.exe "-I../lib" "-ISSO-188" Parent--188
# D:\ttt\perl\t\perl.exe "-I../lib" "-ISSO-188" Child--188
ok 9
ok 10
ok 11
ok 12
unlink SSI-188/Data.pm failed: Permission denied at lib/selfstubber.t line 19.
unlink SSI-188/Data.pm failed: Permission denied at lib/selfstubber.t line 19.
unlink SSI-188/Data.pm failed: Permission denied at lib/selfstubber.t line 19.
unlink SSI-188/Data.pm failed: Permission denied at lib/selfstubber.t line 19.
^C

At any rate here is the patch for win32/Makefile with some tricky spots
for handling List/Util.  Should the packaging of List/Util within the
perl tar ball change then there may need to be some changes to the
win32/Makefile as well.  Hopefully the dos ^M end of lines can be
preserved with this:

*** Makefile.orig Fri Apr 27 07:39:40 2001
--- Makefile Sat Apr 28 21:07:02 2001
***************
*** 609,615 ****
  DYNAMIC_EXT	= Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
  		Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
  		Sys/Hostname Storable Filter/Util/Call Encode Digest/MD5 \
! 		PerlIO/Scalar MIME/Base64 Time/HiRes Time/Piece
  STATIC_EXT	= DynaLoader
  NONXS_EXT	= Errno
  
--- 609,616 ----
  DYNAMIC_EXT	= Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
  		Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
  		Sys/Hostname Storable Filter/Util/Call Encode Digest/MD5 \
! 		PerlIO/Scalar MIME/Base64 Time/HiRes Time/Piece \
! 		Cwd List/Util PerlIO/Via XS/Typemap
  STATIC_EXT	= DynaLoader
  NONXS_EXT	= Errno
  
***************
*** 639,645 ****
--- 640,653 ----
  MIMEBASE64	= $(EXTDIR)\MIME\Base64\Base64
  TIMEHIRES	= $(EXTDIR)\Time\HiRes\HiRes
  TIMEPIECE	= $(EXTDIR)\Time\Piece\Piece
+ CWD		= $(EXTDIR)\Cwd\Cwd
+ LISTUTIL  	= $(EXTDIR)\List\Util\Util
+ PERLIOVIA	= $(EXTDIR)\PerlIO\Via\Via
+ XSTYPEMAP	= $(EXTDIR)\XS\Typemap\Typemap
  
+ # Help out FindExt::scan_ext() with a copy
+ LISTUTIL_PM	= $(LISTUTIL).pm
+ 
  SOCKET_DLL	= $(AUTODIR)\Socket\Socket.dll
  FCNTL_DLL	= $(AUTODIR)\Fcntl\Fcntl.dll
  OPCODE_DLL	= $(AUTODIR)\Opcode\Opcode.dll
***************
*** 664,669 ****
--- 672,681 ----
  MIMEBASE64_DLL	= $(AUTODIR)\MIME\Base64\Base64.dll
  TIMEHIRES_DLL	= $(AUTODIR)\Time\HiRes\HiRes.dll
  TIMEPIECE_DLL	= $(AUTODIR)\Time\Piece\Piece.dll
+ CWD_DLL		= $(AUTODIR)\Cwd\Cwd.dll
+ LISTUTIL_DLL	= $(AUTODIR)\List\Util\Util.dll
+ PERLIOVIA_DLL	= $(AUTODIR)\PerlIO\Via\Via.dll
+ XSTYPEMAP_DLL	= $(AUTODIR)\XS\Typemap\Typemap.dll
  
  ERRNO_PM	= $(LIBDIR)\Errno.pm
  
***************
*** 691,697 ****
  		$(PERLIOSCALAR).c	\
  		$(MIMEBASE64).c	\
  		$(TIMEHIRES).c	\
! 		$(TIMEPIECE).c	
  
  EXTENSION_DLL	= 		\
  		$(SOCKET_DLL)	\
--- 703,713 ----
  		$(PERLIOSCALAR).c	\
  		$(MIMEBASE64).c	\
  		$(TIMEHIRES).c	\
! 		$(TIMEPIECE).c	\
! 		$(CWD).c	\
! 		$(LISTUTIL).c	\
! 		$(PERLIOVIA).c	\
! 		$(XSTYPEMAP).c
  
  EXTENSION_DLL	= 		\
  		$(SOCKET_DLL)	\
***************
*** 717,723 ****
  		$(PERLIOSCALAR_DLL) \
  		$(MIMEBASE64_DLL) \
  		$(TIMEHIRES_DLL)  \
! 		$(TIMEPIECE_DLL)
  
  EXTENSION_PM	=		\
  		$(ERRNO_PM)
--- 733,743 ----
  		$(PERLIOSCALAR_DLL) \
  		$(MIMEBASE64_DLL) \
  		$(TIMEHIRES_DLL)  \
! 		$(TIMEPIECE_DLL)  \
! 		$(CWD_DLL)	\
! 		$(LISTUTIL_DLL)	\
! 		$(PERLIOVIA_DLL)	\
! 		$(XSTYPEMAP_DLL)
  
  EXTENSION_PM	=		\
  		$(ERRNO_PM)
***************
*** 780,786 ****
  	-del /f config.h
  	copy $(CFGH_TMPL) config.h
  
! ..\config.sh : config.w32 $(MINIPERL) config_sh.PL
  	$(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) config.w32 > ..\config.sh
  
  # this target is for when changes to the main config.sh happen
--- 800,806 ----
  	-del /f config.h
  	copy $(CFGH_TMPL) config.h
  
! ..\config.sh : config.w32 $(MINIPERL) $(LISTUTIL_PM) config_sh.PL
  	$(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) config.w32 > ..\config.sh
  
  # this target is for when changes to the main config.sh happen
***************
*** 1020,1054 ****
  	cd ..\..\win32
  
  $(MD5_DLL): $(PERLEXE) $(MD5).xs
! 	cd $(EXTDIR)\$(*B)
! 	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\win32
  
  $(PERLIOSCALAR_DLL): $(PERLEXE) $(PERLIOSCALAR).xs
! 	cd $(EXTDIR)\$(*B)
! 	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\win32
  
  $(MIMEBASE64_DLL): $(PERLEXE) $(MIMEBASE64).xs
! 	cd $(EXTDIR)\$(*B)
! 	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\win32
  
  $(TIMEHIRES_DLL): $(PERLEXE) $(TIMEHIRES).xs
! 	cd $(EXTDIR)\$(*B)
! 	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\win32
  
  $(TIMEPIECE_DLL): $(PERLEXE) $(TIMEPIECE).xs
  	cd $(EXTDIR)\$(*B)
  	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
  	cd ..\..\win32
  
  $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
  	cd $(EXTDIR)\$(*B)
  	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
--- 1040,1103 ----
  	cd ..\..\win32
  
  $(MD5_DLL): $(PERLEXE) $(MD5).xs
! 	cd $(EXTDIR)\Digest\$(*B)
! 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\..\win32
  
  $(PERLIOSCALAR_DLL): $(PERLEXE) $(PERLIOSCALAR).xs
! 	cd $(EXTDIR)\PerlIO\$(*B)
! 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\..\win32
  
  $(MIMEBASE64_DLL): $(PERLEXE) $(MIMEBASE64).xs
! 	cd $(EXTDIR)\MIME\$(*B)
! 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\..\win32
  
  $(TIMEHIRES_DLL): $(PERLEXE) $(TIMEHIRES).xs
! 	cd $(EXTDIR)\Time\$(*B)
! 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
! 	cd ..\..\..\win32
  
  $(TIMEPIECE_DLL): $(PERLEXE) $(TIMEPIECE).xs
+ 	cd $(EXTDIR)\Time\$(*B)
+ 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+ 	$(MAKE)
+ 	cd ..\..\..\win32
+ 
+ $(CWD_DLL): $(PERLEXE) $(CWD).xs
  	cd $(EXTDIR)\$(*B)
  	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
  	$(MAKE)
  	cd ..\..\win32
  
+ $(LISTUTIL_PM): $(EXTDIR)\List\Util\lib\List\Util.pm
+ 	cd $(EXTDIR)
+ 	copy List\Util\lib\List\Util.pm List\Util\Util.pm
+ 	cd ..\win32
+ 
+ $(LISTUTIL_DLL): $(LISTUTIL_PM) $(PERLEXE) $(LISTUTIL).xs
+ 	cd $(EXTDIR)\List\$(*B)
+ 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+ 	$(MAKE)
+ 	cd ..\..\..\win32
+ 
+ $(PERLIOVIA_DLL): $(PERLEXE) $(PERLIOVIA).xs
+ 	cd $(EXTDIR)\PerlIO\$(*B)
+ 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+ 	$(MAKE)
+ 	cd ..\..\..\win32
+ 
+ $(XSTYPEMAP_DLL): $(PERLEXE) $(XSTYPEMAP).xs
+ 	cd $(EXTDIR)\XS\$(*B)
+ 	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+ 	$(MAKE)
+ 	cd ..\..\..\win32
+ 
  $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
  	cd $(EXTDIR)\$(*B)
  	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
***************
*** 1107,1118 ****
--- 1156,1171 ----
  	-del /f $(LIBDIR)\Filter\Util\Call.pm
  	-del /f $(LIBDIR)\Digest\MD5.pm
  	-del /f $(LIBDIR)\PerlIO\Scalar.pm
+ 	-del /f $(LIBDIR)\PerlIO\Via.pm
  	-del /f $(LIBDIR)\MIME\Base64.pm
  	-del /f $(LIBDIR)\MIME\QuotedPrint.pm
  	-del /f $(LIBDIR)\List\Util.pm
+ 	-del /f $(LISTUTIL_PM)
  	-del /f $(LIBDIR)\Scalar\Util.pm
  	-del /f $(LIBDIR)\Time\HiRes.pm
  	-del /f $(LIBDIR)\Time\Piece.pm
+ 	-del /f $(LIBDIR)\Cwd.pm
+ 	-del /f $(LIBDIR)\XS\Typemap.pm
  	-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
  	-rmdir /s $(LIBDIR)\IO
  	-if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread
***************
*** 1130,1135 ****
--- 1183,1190 ----
  	-rmdir /s $(LIBDIR)\List
  	-if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar
  	-rmdir /s $(LIBDIR)\Scalar
+ 	-if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
+ 	-rmdir /s $(LIBDIR)\XS
  	cd $(PODDIR)
  	-del /f *.html *.bat checkpods \
  	    perlaix.pod perlamiga.pod perlbs2000.pod perlcygwin.pod \
End of Patch.

Peter Prymmer




Thread Next


nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About