X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=a0eb3cd9b933d7a48eba2423bebc3a8053ee422d;hb=0b96339f066406ec3091aa3edc23d79475da8df5;hp=c7d9fb9478896eb26089c803dfd7bfef3f459fb4;hpb=83cd6e83f6f67657e252f6e633e259439425d98a;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/makefile.mk b/win32/makefile.mk index c7d9fb9..a0eb3cd 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -34,7 +34,7 @@ INST_TOP *= $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -INST_VER *= \5.9.0 +INST_VER *= \5.9.1 # # Comment this out if you DON'T want your perl installation to have @@ -138,11 +138,11 @@ CCTYPE *= MSVC60 #USE_SETARGV *= define # -# if you have the source for des_fcrypt(), uncomment this and make sure the -# file exists (see README.win32). File should be located in the same -# directory as this file. +# if you want to have the crypt() builtin function implemented, leave this or +# CRYPT_LIB uncommented. The fcrypt.c file named here contains a suitable +# version of des_fcrypt(). # -#CRYPT_SRC *= fcrypt.c +CRYPT_SRC *= fcrypt.c # # if you didn't set CRYPT_SRC and if you have des_fcrypt() available in a @@ -378,13 +378,13 @@ LINK_FLAGS += -L"$(CCLIBDIR)\Release" .ELIF "$(CCTYPE)" == "GCC" CC = gcc -LINK32 = gcc +LINK32 = g++ .IF "$(USE_GCC_V3_2)" == "define" LINK32 = g++ .END LIB32 = ar rc IMPLIB = dlltool -RSC = rc +RSC = windres i = .i o = .o @@ -450,7 +450,8 @@ LIBC = msvcrt.lib LIBC = PerlCRT.lib .ENDIF -PERLEXE_RES = +PERLEXE_ICO = .\perlexe.ico +PERLEXE_RES = .\perlexe.res PERLDLL_RES = .IF "$(CFG)" == "Debug" @@ -553,7 +554,11 @@ $(o).dll: .ENDIF .rc.res: +.IF "$(CCTYPE)" == "GCC" + $(RSC) --use-temp-file -i $< -o $@ +.ELSE $(RSC) -i.. $< +.ENDIF # # various targets @@ -592,6 +597,9 @@ UTILS = \ ..\utils\enc2xs \ ..\utils\piconv \ ..\utils\cpan \ + ..\utils\xsubpp \ + ..\utils\prove \ + ..\utils\instmodsh \ ..\pod\checkpods \ ..\pod\pod2html \ ..\pod\pod2latex \ @@ -603,7 +611,6 @@ UTILS = \ ..\x2p\find2perl \ ..\x2p\psed \ ..\x2p\s2p \ - ..\lib\ExtUtils\xsubpp \ bin\exetype.pl \ bin\runperl.pl \ bin\pl2bat.pl \ @@ -818,6 +825,7 @@ CFG_VARS = \ _a=$(a) ~ \ lib_ext=$(a) ~ \ static_ext=$(STATIC_EXT) ~ \ + usethreads=$(USE_ITHREADS) ~ \ useithreads=$(USE_ITHREADS) ~ \ usemultiplicity=$(USE_MULTI) ~ \ useperlio=$(USE_PERLIO) ~ \ @@ -1017,6 +1025,11 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) .ENDIF $(XCOPY) $(PERLIMPLIB) $(COREDIR) +$(PERLEXE_ICO): $(MINIPERL) makeico.pl + $(MINIPERL) makeico.pl > $@ + +$(PERLEXE_RES): perlexe.rc $(PERLEXE_ICO) + $(MINIMOD) : $(MINIPERL) ..\minimod.pl cd .. && miniperl minimod.pl > lib\ExtUtils\Miniperl.pm @@ -1100,43 +1113,55 @@ doc: $(PERLEXE) --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\ --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse +# Note that this next section is parsed (and regenerated) by pod/buildtoc +# so please check that script before making structural changes here utils: $(PERLEXE) $(X2P) cd ..\utils && $(MAKE) PERL=$(MINIPERL) - copy ..\README.aix ..\pod\perlaix.pod - copy ..\README.amiga ..\pod\perlamiga.pod - copy ..\README.apollo ..\pod\perlapollo.pod - copy ..\README.beos ..\pod\perlbeos.pod - copy ..\README.bs2000 ..\pod\perlbs2000.pod - copy ..\README.ce ..\pod\perlce.pod - copy ..\README.cygwin ..\pod\perlcygwin.pod - copy ..\README.dgux ..\pod\perldgux.pod - copy ..\README.dos ..\pod\perldos.pod - copy ..\README.epoc ..\pod\perlepoc.pod - copy ..\README.freebsd ..\pod\perlfreebsd.pod - copy ..\README.hpux ..\pod\perlhpux.pod - copy ..\README.hurd ..\pod\perlhurd.pod - copy ..\README.irix ..\pod\perlirix.pod - copy ..\README.machten ..\pod\perlmachten.pod - copy ..\README.macos ..\pod\perlmacos.pod - copy ..\README.mint ..\pod\perlmint.pod - copy ..\README.mpeix ..\pod\perlmpeix.pod - copy ..\README.netware ..\pod\perlnetware.pod - copy ..\README.os2 ..\pod\perlos2.pod - copy ..\README.os390 ..\pod\perlos390.pod - copy ..\README.os400 ..\pod\perlos400.pod - copy ..\README.plan9 ..\pod\perlplan9.pod - copy ..\README.qnx ..\pod\perlqnx.pod - copy ..\README.solaris ..\pod\perlsolaris.pod - copy ..\README.tru64 ..\pod\perltru64.pod - copy ..\README.uts ..\pod\perluts.pod - copy ..\README.vmesa ..\pod\perlvmesa.pod copy ..\vms\perlvms.pod ..\pod\perlvms.pod - copy ..\README.vos ..\pod\perlvos.pod - copy ..\README.win32 ..\pod\perlwin32.pod + copy ..\README.aix ..\pod\perlaix.pod + copy ..\README.amiga ..\pod\perlamiga.pod + copy ..\README.apollo ..\pod\perlapollo.pod + copy ..\README.beos ..\pod\perlbeos.pod + copy ..\README.bs2000 ..\pod\perlbs2000.pod + copy ..\README.ce ..\pod\perlce.pod + copy ..\README.cn ..\pod\perlcn.pod + copy ..\README.cygwin ..\pod\perlcygwin.pod + copy ..\README.dgux ..\pod\perldgux.pod + copy ..\README.dos ..\pod\perldos.pod + copy ..\README.epoc ..\pod\perlepoc.pod + copy ..\README.freebsd ..\pod\perlfreebsd.pod + copy ..\README.hpux ..\pod\perlhpux.pod + copy ..\README.hurd ..\pod\perlhurd.pod + copy ..\README.irix ..\pod\perlirix.pod + copy ..\README.jp ..\pod\perljp.pod + copy ..\README.ko ..\pod\perlko.pod + copy ..\README.machten ..\pod\perlmachten.pod + copy ..\README.macos ..\pod\perlmacos.pod + copy ..\README.macosx ..\pod\perlmacosx.pod + copy ..\README.mint ..\pod\perlmint.pod + copy ..\README.mpeix ..\pod\perlmpeix.pod + copy ..\README.netware ..\pod\perlnetware.pod + copy ..\README.os2 ..\pod\perlos2.pod + copy ..\README.os390 ..\pod\perlos390.pod + copy ..\README.os400 ..\pod\perlos400.pod + copy ..\README.plan9 ..\pod\perlplan9.pod + copy ..\README.qnx ..\pod\perlqnx.pod + copy ..\README.solaris ..\pod\perlsolaris.pod + copy ..\README.tru64 ..\pod\perltru64.pod + copy ..\README.tw ..\pod\perltw.pod + copy ..\README.uts ..\pod\perluts.pod + copy ..\README.vmesa ..\pod\perlvmesa.pod + copy ..\README.vms ..\pod\perlvms.pod + copy ..\README.vos ..\pod\perlvos.pod + copy ..\README.win32 ..\pod\perlwin32.pod + copy ..\pod\perl591delta.pod ..\pod\perldelta.pod cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters cd ..\lib && $(PERLEXE) lib_pm.PL $(PERLEXE) $(PL2BAT) $(UTILS) +# Note that the pod cleanup in this next section is parsed (and regenerated +# by pod/buildtoc so please check that script before making changes here + distclean: clean -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ $(PERLIMPLIB) ..\miniperl$(a) $(MINIMOD) @@ -1169,8 +1194,6 @@ distclean: clean -if exist $(LIBDIR)\Data rmdir /s $(LIBDIR)\Data -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util -if exist $(LIBDIR)\Filter\Util rmdir /s $(LIBDIR)\Filter\Util - -if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest - -if exist $(LIBDIR)\Digest rmdir /s $(LIBDIR)\Digest -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME -if exist $(LIBDIR)\MIME rmdir /s $(LIBDIR)\MIME -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List @@ -1180,19 +1203,21 @@ distclean: clean -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -if exist $(LIBDIR)\XS rmdir /s $(LIBDIR)\XS -cd $(PODDIR) && del /f *.html *.bat checkpods \ - perlaix.pod perlamiga.pod perlapollo.pod \ - perlbeos.pod perlbs2000.pod perlce.pod perlcygwin.pod perldgux.pod \ - perldos.pod perlepoc.pod perlfreebsd.pod perlhpux.pod perlhurd.pod \ - perlirix.pod perlmachten.pod perlmint.pod \ - perlmacos.pod perlmpeix.pod perlnetware.pod \ - perlos2.pod perlos390.pod perlos400.pod \ - perlplan9.pod perlqnx.pod \ - perlsolaris.pod perltru64.pod perluts.pod \ - perlvmesa.pod perlvms.pod perlvos.pod \ - perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \ + perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \ + perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \ + perldelta.pod perldgux.pod perldos.pod perlepoc.pod \ + perlfreebsd.pod perlhpux.pod perlhurd.pod perlirix.pod \ + perljp.pod perlko.pod perlmachten.pod perlmacos.pod \ + perlmacosx.pod perlmint.pod perlmpeix.pod perlnetware.pod \ + perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ + perlqnx.pod perlsolaris.pod perltru64.pod perltw.pod \ + perluts.pod perlvmesa.pod perlvms.pod perlvms.pod perlvos.pod \ + perlwin32.pod \ + pod2html pod2latex pod2man pod2text pod2usage \ podchecker podselect -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ - perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat + perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \ + xsubpp instmodsh prove -cd ..\x2p && del /f find2perl s2p psed *.bat -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new -del /f $(CONFIGPM) @@ -1248,15 +1273,6 @@ test-notty : test-prep set PERL_SKIP_TTY_TEST=1 && \ cd ..\t && $(PERLEXE) -I.\lib harness -test-wide : test-prep - set HARNESS_PERL_SWITCHES=-C && \ - cd ..\t && $(PERLEXE) -I..\lib harness - -test-wide-notty : test-prep - set PERL_SKIP_TTY_TEST=1 && \ - set HARNESS_PERL_SWITCHES=-C && \ - cd ..\t && $(PERLEXE) -I..\lib harness - _test : $(RIGHTMAKE) $(XCOPY) $(PERLEXE) ..\t\$(NULL) $(XCOPY) $(PERLDLL) ..\t\$(NULL)