paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-04 07:43:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* win32 and go32v2 updates

Browse Source
This commit is contained in:
peter 2000-12-10 12:08:11 +00:00
parent 9e14dafee3
commit 7c436e40e5
6 changed files with 38 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile
View File

@ -1175,7 +1175,7 @@ testcheck: units $(DOTEST)
# Dotest options
#
ifneq ($(FPC),ppc386)
ifneq ($(FPC),ppc386$(EXEEXT))
override DOTESTOPT+=-c$(FPC)
endif

2
tests/Makefile.fpc
View File

@ -50,7 +50,7 @@ testcheck: units $(DOTEST)
# Dotest options
#
ifneq ($(FPC),ppc386)
ifneq ($(FPC),ppc386$(EXEEXT))
override DOTESTOPT+=-c$(FPC)
endif

55
tests/units/Makefile
View File

@ -1221,53 +1221,16 @@ endif
# Users rules
#####################################################################
.PHONY: go32v2_units linux_units os2_units win32_units clean
.PHONY: rtl fcl clean
erroru$(PPUEXT): erroru.pp $(OS_TARGET)_units
rtl:
$(MAKE) -C ../../rtl/$(OS_TARGET) all
$(MAKE) -C ../../rtl/$(OS_TARGET) install UNITINSTALLDIR=$(BASEDIR)
go32v2_units :
$(MAKE) clean OS_TARGET=go32v2
$(MAKE) -C ../../rtl/go32v2 clean all OS_TARGET=go32v2
-$(COPY) ../../rtl/go32v2/*.o .
-$(COPY) ../../rtl/go32v2/*.a .
-$(COPY) ../../rtl/go32v2/*.ppu .
$(MAKE) -C ../../fcl/go32v2 clean all OS_TARGET=go32v2
-$(COPY) ../../fcl/go32v2/*.o .
-$(COPY) ../../fcl/go32v2/*.a .
-$(COPY) ../../fcl/go32v2/*.ppu .
linux_units :
$(MAKE) clean OS_TARGET=linux
$(MAKE) -C ../../rtl/linux clean all OS_TARGET=linux
-$(COPY) ../../rtl/linux/*.o .
-$(COPY) ../../rtl/linux/*.a .
-$(COPY) ../../rtl/linux/*.ppu .
$(MAKE) -C ../../fcl/linux clean all OS_TARGET=linux
-$(COPY) ../../fcl/linux/*.o .
-$(COPY) ../../fcl/linux/*.a .
-$(COPY) ../../fcl/linux/*.ppu .
os2_units :
$(MAKE) clean OS_TARGET=os2
$(MAKE) -C ../../rtl/os2 clean all OS_TARGET=os2
-$(COPY) ../../rtl/os2/*.oo2 .
-$(COPY) ../../rtl/os2/*.ao2 .
-$(COPY) ../../rtl/os2/*.ppo .
$(MAKE) -C ../../fcl/os2 clean all OS_TARGET=os2
-$(COPY) ../../fcl/os2/*.oo2 .
-$(COPY) ../../fcl/os2/*.ao2 .
-$(COPY) ../../fcl/os2/*.ppo .
win32_units :
$(MAKE) clean OS_TARGET=win32
$(MAKE) -C ../../rtl/win32 clean all OS_TARGET=win32
-$(COPY) ../../rtl/win32/*.ow .
-$(COPY) ../../rtl/win32/*.aw .
-$(COPY) ../../rtl/win32/*.ppw .
$(MAKE) -C ../../fcl/win32 clean all OS_TARGET=win32
-$(COPY) ../../fcl/win32/*.ow .
-$(COPY) ../../fcl/win32/*.aw .
-$(COPY) ../../fcl/win32/*.ppw .
fcl:
$(MAKE) -C ../../fcl/$(OS_TARGET) all
$(MAKE) -C ../../fcl/$(OS_TARGET) install UNITINSTALLDIR=$(BASEDIR)
clean : cleanall
erroru$(PPUEXT): erroru.pp rtl fcl

56
tests/units/Makefile.fpc
View File

@ -8,53 +8,17 @@ units=erroru
[rules]
.PHONY: go32v2_units linux_units os2_units win32_units clean
.PHONY: rtl fcl clean
erroru$(PPUEXT): erroru.pp $(OS_TARGET)_units
rtl:
$(MAKE) -C ../../rtl/$(OS_TARGET) all
$(MAKE) -C ../../rtl/$(OS_TARGET) install UNITINSTALLDIR=$(BASEDIR)
go32v2_units :
$(MAKE) clean OS_TARGET=go32v2
$(MAKE) -C ../../rtl/go32v2 clean all OS_TARGET=go32v2
-$(COPY) ../../rtl/go32v2/*.o .
-$(COPY) ../../rtl/go32v2/*.a .
-$(COPY) ../../rtl/go32v2/*.ppu .
$(MAKE) -C ../../fcl/go32v2 clean all OS_TARGET=go32v2
-$(COPY) ../../fcl/go32v2/*.o .
-$(COPY) ../../fcl/go32v2/*.a .
-$(COPY) ../../fcl/go32v2/*.ppu .
linux_units :
$(MAKE) clean OS_TARGET=linux
$(MAKE) -C ../../rtl/linux clean all OS_TARGET=linux
-$(COPY) ../../rtl/linux/*.o .
-$(COPY) ../../rtl/linux/*.a .
-$(COPY) ../../rtl/linux/*.ppu .
$(MAKE) -C ../../fcl/linux clean all OS_TARGET=linux
-$(COPY) ../../fcl/linux/*.o .
-$(COPY) ../../fcl/linux/*.a .
-$(COPY) ../../fcl/linux/*.ppu .
os2_units :
$(MAKE) clean OS_TARGET=os2
$(MAKE) -C ../../rtl/os2 clean all OS_TARGET=os2
-$(COPY) ../../rtl/os2/*.oo2 .
-$(COPY) ../../rtl/os2/*.ao2 .
-$(COPY) ../../rtl/os2/*.ppo .
$(MAKE) -C ../../fcl/os2 clean all OS_TARGET=os2
-$(COPY) ../../fcl/os2/*.oo2 .
-$(COPY) ../../fcl/os2/*.ao2 .
-$(COPY) ../../fcl/os2/*.ppo .
win32_units :
$(MAKE) clean OS_TARGET=win32
$(MAKE) -C ../../rtl/win32 clean all OS_TARGET=win32
-$(COPY) ../../rtl/win32/*.ow .
-$(COPY) ../../rtl/win32/*.aw .
-$(COPY) ../../rtl/win32/*.ppw .
$(MAKE) -C ../../fcl/win32 clean all OS_TARGET=win32
-$(COPY) ../../fcl/win32/*.ow .
-$(COPY) ../../fcl/win32/*.aw .
-$(COPY) ../../fcl/win32/*.ppw .
fcl:
$(MAKE) -C ../../fcl/$(OS_TARGET) all
$(MAKE) -C ../../fcl/$(OS_TARGET) install UNITINSTALLDIR=$(BASEDIR)
clean : cleanall
erroru$(PPUEXT): erroru.pp rtl fcl

23
tests/utils/redir.pp
View File

@ -678,7 +678,7 @@ end;
{$EndIf MsDos}
SwapVectors;
{ Must use shell() for linux for the wildcard expansion (PFV) }
{$ifdef linux}
{$ifdef UNIX}
IOStatus:=0;
ExecuteResult:=Shell(Progname+' '+Comline);
{ Signal that causes the stop of the shell }
@ -688,22 +688,22 @@ end;
$80 bit is a CoreFlag apparently }
ExecuteResult:=(ExecuteResult and $ff00) shr 8;
{$else}
{$ifdef win32}
{$ifdef win32}
StoreInherit:=ExecInheritsHandles;
ExecInheritsHandles:=true;
{$endif win32}
{$endif win32}
DosError:=0;
Dos.Exec (ProgName, ComLine);
{$ifdef win32}
Dos.Exec (Getenv('COMSPEC'),'/C '+progname+' '+Comline);
{$ifdef win32}
ExecInheritsHandles:=StoreInherit;
{$endif win32}
{$endif win32}
IOStatus:=DosError;
ExecuteResult:=DosExitCode;
{$endif}
SwapVectors;
{$ifdef CPU86}
{ reset the FPU }
{$asmmode att}
{$asmmode att}
asm
fninit
end;
@ -711,7 +711,7 @@ end;
{$IfDef MsDos}
Fullheap;
{$EndIf MsDos}
End;
End;
{*****************************************************************************
Initialize
@ -725,10 +725,13 @@ finalization
End.
{
$Log$
Revision 1.3 2000-11-30 22:38:22 peter
Revision 1.4 2000-12-10 12:08:11 peter
* win32 and go32v2 updates
Revision 1.3 2000/11/30 22:38:22 peter
* renamed test suite
Revision 1.1 2000/11/29 23:14:20 peter
* new testsuite setup
}
}

5
tests/webtbs/tw0966.pp
View File

@ -1,3 +1,5 @@
{ %INTERACTIVE }
{ Source provided for Free Pascal Bug Report 966 }
{$i-}
{$ifdef linux}
@ -76,6 +78,7 @@ begin
read_to_eof;
shutdown(s,2); close(sin); close(sout);
{$else : not has_sockets}
begin
Writeln('No sockets unit for this target');
{$endif has_sockets}
end.
end.