diff options
author | Steve Hay <steve.m.hay@googlemail.com> | 2014-12-31 13:43:52 +0000 |
---|---|---|
committer | Steve Hay <steve.m.hay@googlemail.com> | 2014-12-31 13:45:36 +0000 |
commit | a4e8ab8ad81a8e9c3cfd67d6cfa22e2122a58117 (patch) | |
tree | 7fabdcd80fc693e5aba9c5d00b83d19e39c40f4b /win32 | |
parent | 4ea01bd3b46f4943827bc62ef9c2ffc6f3bcf657 (diff) | |
download | perl-a4e8ab8ad81a8e9c3cfd67d6cfa22e2122a58117.tar.gz |
Remove redundant -I..\lib arguments from some Win32 makefile command-lines
Invocations of $(PERLEXE) from win32\ do not need -I..\lib since $(PERLEXE)
is ..\perl.exe, which will pick up the lib\ folder in ..\ anyway.
Invocations of perl.exe from t\ (which may be a copy of either perl.exe or
miniperl.exe from the top-level folder) also do not need -I..\lib since
they all run the harness program, which fixes up @INC with exactly that
..\lib folder in a BEGIN block anyway.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile | 24 | ||||
-rw-r--r-- | win32/makefile.mk | 28 |
2 files changed, 25 insertions, 27 deletions
diff --git a/win32/Makefile b/win32/Makefile index f08997c58b..8e700abd24 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1118,7 +1118,7 @@ Extensions_realclean: #------------------------------------------------------------------------------- doc: $(PERLEXE) ..\pod\perltoc.pod - $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \ + $(PERLEXE) ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \ --podpath=pod:lib:utils --htmlroot="file://$(INST_HTML::=|)" \ --recurse @@ -1319,8 +1319,8 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES) $(XCOPY) $(GLOBEXE) ..\t\$(NULL) attrib -r ..\t\*.* cd ..\t && \ -#note this perl.exe is miniperl - perl.exe -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t opbasic/*.t op/*.t pragma/*.t +# Note this perl.exe is miniperl + perl.exe harness base/*.t comp/*.t cmd/*.t io/*.t opbasic/*.t op/*.t pragma/*.t test-prep : all utils ../pod/perltoc.pod $(XCOPY) $(PERLEXE) ..\t\$(NULL) @@ -1330,12 +1330,12 @@ test-prep : all utils ../pod/perltoc.pod test : test-prep cd ..\t - perl.exe -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) + perl.exe harness $(TEST_SWITCHES) $(TEST_FILES) cd ..\win32 test_porting : test-prep cd ..\t - perl.exe -I..\lib harness $(TEST_SWITCHES) porting\*.t ..\lib\diagnostics.t + perl.exe harness $(TEST_SWITCHES) porting\*.t ..\lib\diagnostics.t cd ..\win32 test-reonly : reonly utils @@ -1343,7 +1343,7 @@ test-reonly : reonly utils $(XCOPY) $(PERLDLL) ..\t\$(NULL) $(XCOPY) $(GLOBEXE) ..\t\$(NULL) cd ..\t - perl.exe -I..\lib harness $(OPT) -re \bre\\/ $(EXTRA) + perl.exe harness $(OPT) -re \bre\\/ $(EXTRA) cd ..\win32 regen : @@ -1354,7 +1354,7 @@ regen : test-notty : test-prep set PERL_SKIP_TTY_TEST=1 cd ..\t - perl.exe -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) + perl.exe harness $(TEST_SWITCHES) $(TEST_FILES) cd ..\win32 _test : @@ -1362,7 +1362,7 @@ _test : $(XCOPY) $(PERLDLL) ..\t\$(NULL) $(XCOPY) $(GLOBEXE) ..\t\$(NULL) cd ..\t - perl.exe -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) + perl.exe harness $(TEST_SWITCHES) $(TEST_FILES) cd ..\win32 _clean : @@ -1403,13 +1403,13 @@ realclean : Extensions_realclean _clean # Please *don't* use this unless all tests pass. # If you want to report test failures, use "nmake nok" instead. ok: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" + $(PERLEXE) ..\utils\perlbug -ok -s "(UNINSTALLED)" okfile: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" -F perl.ok + $(PERLEXE) ..\utils\perlbug -ok -s "(UNINSTALLED)" -F perl.ok nok: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" + $(PERLEXE) ..\utils\perlbug -nok -s "(UNINSTALLED)" nokfile: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" -F perl.nok + $(PERLEXE) ..\utils\perlbug -nok -s "(UNINSTALLED)" -F perl.nok diff --git a/win32/makefile.mk b/win32/makefile.mk index db7a56ecd5..1c16dba5e2 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1399,7 +1399,7 @@ Extensions_realclean : doc: $(PERLEXE) ..\pod\perltoc.pod - $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \ + $(PERLEXE) ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \ --podpath=pod:lib:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\ --recurse @@ -1596,8 +1596,8 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils $(XCOPY) $(GLOBEXE) ..\t\$(NULL) attrib -r ..\t\*.* cd ..\t && \ -#note this perl.exe is miniperl - perl.exe -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t opbasic/*.t op/*.t pragma/*.t +# Note this perl.exe is miniperl + perl.exe harness base/*.t comp/*.t cmd/*.t io/*.t opbasic/*.t op/*.t pragma/*.t test-prep : all utils ..\pod\perltoc.pod $(XCOPY) $(PERLEXE) ..\t\$(NULL) @@ -1619,34 +1619,32 @@ test-prep : all utils ..\pod\perltoc.pod test : test-prep set PERL_STATIC_EXT=$(STATIC_EXT) && \ - cd ..\t && perl.exe -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) + cd ..\t && perl.exe harness $(TEST_SWITCHES) $(TEST_FILES) test_porting : test-prep set PERL_STATIC_EXT=$(STATIC_EXT) && \ - cd ..\t && perl.exe -I..\lib harness $(TEST_SWITCHES) porting\*.t ..\lib\diagnostics.t + cd ..\t && perl.exe harness $(TEST_SWITCHES) porting\*.t ..\lib\diagnostics.t test-reonly : reonly utils $(XCOPY) $(PERLEXE) ..\t\$(NULL) $(XCOPY) $(PERLDLL) ..\t\$(NULL) $(XCOPY) $(GLOBEXE) ..\t\$(NULL) - cd ..\t && \ - perl.exe -I..\lib harness $(OPT) -re \bpat\\/ $(EXTRA) && \ - cd ..\win32 + cd ..\t && perl.exe harness $(OPT) -re \bpat\\/ $(EXTRA) regen : - cd .. && regen.pl && cd win32 + cd .. && regen.pl test-notty : test-prep set PERL_STATIC_EXT=$(STATIC_EXT) && \ set PERL_SKIP_TTY_TEST=1 && \ - cd ..\t && perl.exe -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) + cd ..\t && perl.exe harness $(TEST_SWITCHES) $(TEST_FILES) _test : $(XCOPY) $(PERLEXE) ..\t\$(NULL) $(XCOPY) $(PERLDLL) ..\t\$(NULL) $(XCOPY) $(GLOBEXE) ..\t\$(NULL) set PERL_STATIC_EXT=$(STATIC_EXT) && \ - cd ..\t && perl.exe -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) + cd ..\t && perl.exe harness $(TEST_SWITCHES) $(TEST_FILES) _clean : -@erase miniperlmain$(o) @@ -1688,13 +1686,13 @@ realclean : Extensions_realclean _clean # Please *don't* use this unless all tests pass. # If you want to report test failures, use "dmake nok" instead. ok: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" + $(PERLEXE) ..\utils\perlbug -ok -s "(UNINSTALLED)" okfile: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" -F perl.ok + $(PERLEXE) ..\utils\perlbug -ok -s "(UNINSTALLED)" -F perl.ok nok: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" + $(PERLEXE) ..\utils\perlbug -nok -s "(UNINSTALLED)" nokfile: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" -F perl.nok + $(PERLEXE) ..\utils\perlbug -nok -s "(UNINSTALLED)" -F perl.nok |