Bläddra i källkod

Remove tscgiapp.pp from dependency of testsuite executable, as this source was removed by last commit

FPC_Admin 4 månader sedan
förälder
incheckning
b4af922d15
2 ändrade filer med 31 tillägg och 8 borttagningar
  1. 29 6
      tests/utils/testsuite/Makefile
  2. 2 2
      tests/utils/testsuite/Makefile.fpc

+ 29 - 6
tests/utils/testsuite/Makefile

@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 #
 default: all
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql m68k-human68k powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mipsel-ps1 mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-iphonesim aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv32-freertos riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc loongarch64-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql m68k-human68k powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mipsel-ps1 mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-iphonesim aarch64-android aarch64-ios wasm32-embedded wasm32-wasip1 wasm32-wasip1threads sparc64-linux riscv32-linux riscv32-embedded riscv32-freertos riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc loongarch64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari human68k
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari human68k
@@ -662,7 +662,10 @@ endif
 ifeq ($(CPU_OS_TARGET),wasm32-embedded)
 ifeq ($(CPU_OS_TARGET),wasm32-embedded)
 override TARGET_PROGRAMS+=testsuite
 override TARGET_PROGRAMS+=testsuite
 endif
 endif
-ifeq ($(CPU_OS_TARGET),wasm32-wasi)
+ifeq ($(CPU_OS_TARGET),wasm32-wasip1)
+override TARGET_PROGRAMS+=testsuite
+endif
+ifeq ($(CPU_OS_TARGET),wasm32-wasip1threads)
 override TARGET_PROGRAMS+=testsuite
 override TARGET_PROGRAMS+=testsuite
 endif
 endif
 ifeq ($(CPU_OS_TARGET),sparc64-linux)
 ifeq ($(CPU_OS_TARGET),sparc64-linux)
@@ -1001,7 +1004,10 @@ endif
 ifeq ($(CPU_OS_TARGET),wasm32-embedded)
 ifeq ($(CPU_OS_TARGET),wasm32-embedded)
 override COMPILER_UNITDIR+=..
 override COMPILER_UNITDIR+=..
 endif
 endif
-ifeq ($(CPU_OS_TARGET),wasm32-wasi)
+ifeq ($(CPU_OS_TARGET),wasm32-wasip1)
+override COMPILER_UNITDIR+=..
+endif
+ifeq ($(CPU_OS_TARGET),wasm32-wasip1threads)
 override COMPILER_UNITDIR+=..
 override COMPILER_UNITDIR+=..
 endif
 endif
 ifeq ($(CPU_OS_TARGET),sparc64-linux)
 ifeq ($(CPU_OS_TARGET),sparc64-linux)
@@ -1576,7 +1582,10 @@ endif
 ifeq ($(OS_TARGET),zxspectrum)
 ifeq ($(OS_TARGET),zxspectrum)
 OEXT=.rel
 OEXT=.rel
 endif
 endif
-ifeq ($(OS_TARGET),wasi)
+ifeq ($(OS_TARGET),wasip1)
+EXEEXT=.wasm
+endif
+ifeq ($(OS_TARGET),wasip1threads)
 EXEEXT=.wasm
 EXEEXT=.wasm
 endif
 endif
 ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)
 ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)
@@ -3206,7 +3215,21 @@ REQUIRE_PACKAGES_FCL-IMAGE=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_HASH=1
 endif
 endif
-ifeq ($(CPU_OS_TARGET),wasm32-wasi)
+ifeq ($(CPU_OS_TARGET),wasm32-wasip1)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-DB=1
+REQUIRE_PACKAGES_FCL-WEB=1
+REQUIRE_PACKAGES_RTL-OBJPAS=1
+REQUIRE_PACKAGES_PTHREADS=1
+REQUIRE_PACKAGES_FCL-NET=1
+REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_POSTGRES=1
+REQUIRE_PACKAGES_FCL-IMAGE=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_HASH=1
+endif
+ifeq ($(CPU_OS_TARGET),wasm32-wasip1threads)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-DB=1
 REQUIRE_PACKAGES_FCL-DB=1
@@ -4601,5 +4624,5 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 include fpcmake.loc
 endif
 endif
-testsuite$(SRCEXEEXT): testsuite.pp  tscgiapp.pp  tsconsts.pas  tsgraph.pas  tshistory.pas  tshtml.pas  tssql.pas
+testsuite$(SRCEXEEXT): testsuite.pp  tsconsts.pas  tsgraph.pas  tshistory.pas  tshtml.pas  tssql.pas
 	$(COMPILER) $<
 	$(COMPILER) $<

+ 2 - 2
tests/utils/testsuite/Makefile.fpc

@@ -20,5 +20,5 @@ programs=testsuite
 fpcdir=../../..
 fpcdir=../../..
 
 
 [rules]
 [rules]
-testsuite$(SRCEXEEXT): testsuite.pp  tscgiapp.pp  tsconsts.pas  tsgraph.pas  tshistory.pas  tshtml.pas  tssql.pas
-	$(COMPILER) $<
+testsuite$(SRCEXEEXT): testsuite.pp  tsconsts.pas  tsgraph.pas  tshistory.pas  tshtml.pas  tssql.pas
+	$(COMPILER) $<