Change 22495 by [EMAIL PROTECTED] on 2004/03/13 20:05:20
Revert change #22489, that seems to cause build failures on Windows.
Affected files ...
... //depot/perl/win32/Makefile#239 edit
... //depot/perl/win32/makefile.mk#264 edit
Differences ...
==== //depot/perl/win32/Makefile#239 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#238~22489~ Fri Mar 12 10:26:34 2004
+++ perl/win32/Makefile Sat Mar 13 12:05:20 2004
@@ -1124,13 +1124,13 @@
$(RCOPY) ..\lib $(INST_LIB)\*.*
minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils
- $(XCOPY) $(MINIPERL) ..\t\$(NULL)
- if exist ..\t\perl.exe del /f ..\t\perl.exe
- rename ..\t\miniperl.exe perl.exe
+ $(XCOPY) $(MINIPERL) ..\t\perl.exe
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
attrib -r ..\t\*.*
- cd ..\t && \
- $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
+ copy test ..\t
+ cd ..\t
+ $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
+ cd ..\win32
test-prep : all utils
$(XCOPY) $(PERLEXE) ..\t\$(NULL)
==== //depot/perl/win32/makefile.mk#264 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#263~22489~ Fri Mar 12 10:26:34 2004
+++ perl/win32/makefile.mk Sat Mar 13 12:05:20 2004
@@ -1257,17 +1257,16 @@
$(RCOPY) ..\lib $(INST_LIB)\*.*
minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils
- $(XCOPY) $(MINIPERL) ..\t\$(NULL)
- if exist ..\t\perl.exe del /f ..\t\perl.exe
- rename ..\t\miniperl.exe perl.exe
+ $(XCOPY) $(MINIPERL) ..\t\perl.exe
.IF "$(CCTYPE)" == "BORLAND"
$(XCOPY) $(GLOBBAT) ..\t\$(NULL)
.ELSE
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
.ENDIF
attrib -r ..\t\*.*
+ copy test ..\t
cd ..\t && \
- $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
+ $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
test-prep : all utils
$(XCOPY) $(PERLEXE) ..\t\$(NULL)
End of Patch.
