From ea0bca7cd20ce5c8fa2c677d2e3f09dbfd75fb36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 21 Mar 2005 17:57:45 +0000 Subject: [PATCH] The boot floppy now builds at its new location. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11941 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kernel/Jamfile | 1 + src/tests/kernel/boot_floppy/Jamfile | 249 +++++++++++++++++-- src/tests/kernel/boot_floppy/cpuinfo/Jamfile | 2 +- src/tests/kernel/boot_floppy/echo/Jamfile | 2 +- src/tests/kernel/boot_floppy/fortune/Jamfile | 2 +- src/tests/kernel/boot_floppy/ls/Jamfile | 2 +- src/tests/kernel/boot_floppy/ps/Jamfile | 2 +- src/tests/kernel/boot_floppy/shell/Jamfile | 2 +- src/tests/kernel/boot_floppy/symlink/Jamfile | 2 +- src/tests/kernel/boot_floppy/testapp/Jamfile | 2 +- src/tests/kernel/boot_floppy/tests/Jamfile | 2 +- src/tests/kernel/boot_floppy/uname/Jamfile | 2 +- 12 files changed, 244 insertions(+), 26 deletions(-) diff --git a/src/tests/kernel/Jamfile b/src/tests/kernel/Jamfile index 5571f50502..ca2f8ca480 100644 --- a/src/tests/kernel/Jamfile +++ b/src/tests/kernel/Jamfile @@ -1,6 +1,7 @@ SubDir OBOS_TOP src tests kernel ; SubInclude OBOS_TOP src tests kernel boot ; +SubInclude OBOS_TOP src tests kernel boot_floppy ; SubInclude OBOS_TOP src tests kernel consoled ; SubInclude OBOS_TOP src tests kernel core ; SubInclude OBOS_TOP src tests kernel libroot ; diff --git a/src/tests/kernel/boot_floppy/Jamfile b/src/tests/kernel/boot_floppy/Jamfile index aaf64c0e83..44c337af72 100644 --- a/src/tests/kernel/boot_floppy/Jamfile +++ b/src/tests/kernel/boot_floppy/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel apps ; +SubDir OBOS_TOP src tests kernel boot_floppy ; KernelObjects exec_test.c @@ -16,24 +16,241 @@ KernelObjects ; UsePrivateHeaders kernel ; -# UsePrivateHeaders [ FDirName kernel arch ] ; UsePrivateHeaders [ FDirName kernel arch $(OBOS_ARCH) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ; +KernelLd init : + libglue2.o + <$(SOURCE_GRIST)>init.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/init + ; + +KernelLd kernel_false : + libglue2.o + <$(SOURCE_GRIST)>false_main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/false + ; + +KernelLd kernel_true : + libglue2.o + <$(SOURCE_GRIST)>true_main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/true + ; + +KernelLd fibo : + libglue2.o + <$(SOURCE_GRIST)>fibo_main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/fibo + ; + +KernelLd sig_test : + libglue2.o + <$(SOURCE_GRIST)>sig_test.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/sig_test + ; + +KernelLd monitor_test : + libglue2.o + <$(SOURCE_GRIST)>monitor_test.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/monitor_test + ; + +KernelLd kernel_fortune : + libglue2.o + <$(SOURCE_GRIST)!fortune>main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/fortune + ; + +KernelConfigSection beos/etc/fortunes : data : $(SUBDIR)/fortune/fortunes ; + +KernelLd kernel_ls : + libglue2.o + <$(SOURCE_GRIST)!ls>main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/ls + ; + +KernelLd kernel_ln : + libglue2.o + <$(SOURCE_GRIST)!symlink>main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/symlink + ; + +KernelLd boot_floppy_consoled : + libglue2.o + consoled.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/consoled + ; + +# Note: shell is a built in target, thus we need the grist. +KernelLd obos_shell : + libglue2.o + <$(SOURCE_GRIST)!shell>main.o + <$(SOURCE_GRIST)!shell>args.o + <$(SOURCE_GRIST)!shell>commands.o + <$(SOURCE_GRIST)!shell>file_utils.o + <$(SOURCE_GRIST)!shell>parse.o + <$(SOURCE_GRIST)!shell>script.o + <$(SOURCE_GRIST)!shell>shell_vars.o + <$(SOURCE_GRIST)!shell>statements.o + <$(SOURCE_GRIST)!shell>shell_history.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/sh + ; + +KernelLd kernel_testapp : + libglue2.o + <$(SOURCE_GRIST)!testapp>main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/testapp + ; + +KernelLd tls_test : + libglue2.o + <$(SOURCE_GRIST)>tls_test.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/tls_test + ; + +KernelLd pipe_test : + libglue2.o + <$(SOURCE_GRIST)>pipe_test.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/pipe_test + ; + +KernelLd fork_test : + libglue2.o + <$(SOURCE_GRIST)>fork_test.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/fork_test + ; + +KernelConfigSection drivers/dev/tty + : elf32 + : $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/drivers/dev/tty + ; + +KernelConfigSection drivers/dev/console + : elf32 + : $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/drivers/dev/console + ; + +KernelConfigSection addons/kernel/console/vga_text + : elf32 + : $(OBOS_TOP)/distro/$(OBOS_ARCH).R1/beos/system/add-ons/kernel/console/vga_text + ; + +KernelLd kernel_ps : + libglue2.o + <$(SOURCE_GRIST)!ps>main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/ps + ; + +KernelLd kernel_echo : + libglue2.o + <$(SOURCE_GRIST)!echo>main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/echo + ; + +KernelLd kernel_uname : + libglue2.o + <$(SOURCE_GRIST)!uname>main.o + libroot.so + : $(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/app.ld + : + : + : beos/bin/uname + ; + +KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(OBOS_TOP)/src/kernel/boot/arch/$(OBOS_ARCH)/bootblock.bin ; + +Depends $(OBOS_FLOPPY) : tty ; +Depends $(OBOS_FLOPPY) : console ; +Depends $(OBOS_FLOPPY) : vga_text ; + +Depends boot_floppy : $(OBOS_FLOPPY) ; +NotFile boot_floppy ; +Depends bootfloppy : $(OBOS_FLOPPY) ; +NotFile bootfloppy ; + + if $(OBOS_ARCH) = x86 { - SubInclude OBOS_TOP src kernel apps cpuinfo ; + SubInclude OBOS_TOP src tests kernel boot_floppy cpuinfo ; } -SubInclude OBOS_TOP src kernel apps echo ; -SubInclude OBOS_TOP src kernel apps filetest ; -SubInclude OBOS_TOP src kernel apps fortune ; -SubInclude OBOS_TOP src kernel apps hostname ; -SubInclude OBOS_TOP src kernel apps ls ; -SubInclude OBOS_TOP src kernel apps symlink ; -SubInclude OBOS_TOP src kernel apps ps ; -SubInclude OBOS_TOP src kernel apps shell ; -SubInclude OBOS_TOP src kernel apps envtest ; -#SubInclude OBOS_TOP src kernel apps sockettest ; -SubInclude OBOS_TOP src kernel apps testapp ; -SubInclude OBOS_TOP src kernel apps tests ; -SubInclude OBOS_TOP src kernel apps uname ; +SubInclude OBOS_TOP src tests kernel boot_floppy echo ; +SubInclude OBOS_TOP src tests kernel boot_floppy filetest ; +SubInclude OBOS_TOP src tests kernel boot_floppy fortune ; +SubInclude OBOS_TOP src tests kernel boot_floppy hostname ; +SubInclude OBOS_TOP src tests kernel boot_floppy ls ; +SubInclude OBOS_TOP src tests kernel boot_floppy symlink ; +SubInclude OBOS_TOP src tests kernel boot_floppy ps ; +SubInclude OBOS_TOP src tests kernel boot_floppy shell ; +SubInclude OBOS_TOP src tests kernel boot_floppy envtest ; +#SubInclude OBOS_TOP src tests kernel boot_floppy sockettest ; +SubInclude OBOS_TOP src tests kernel boot_floppy testapp ; +SubInclude OBOS_TOP src tests kernel boot_floppy tests ; +SubInclude OBOS_TOP src tests kernel boot_floppy uname ; diff --git a/src/tests/kernel/boot_floppy/cpuinfo/Jamfile b/src/tests/kernel/boot_floppy/cpuinfo/Jamfile index 7f32bc0e8c..96703f5fb5 100644 --- a/src/tests/kernel/boot_floppy/cpuinfo/Jamfile +++ b/src/tests/kernel/boot_floppy/cpuinfo/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel apps cpuinfo ; +SubDir OBOS_TOP src tests kernel boot_floppy cpuinfo ; KernelObjects <$(SOURCE_GRIST)>main.c diff --git a/src/tests/kernel/boot_floppy/echo/Jamfile b/src/tests/kernel/boot_floppy/echo/Jamfile index 8db262a729..ac155fc2dc 100644 --- a/src/tests/kernel/boot_floppy/echo/Jamfile +++ b/src/tests/kernel/boot_floppy/echo/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel apps echo ; +SubDir OBOS_TOP src tests kernel boot_floppy echo ; KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ; diff --git a/src/tests/kernel/boot_floppy/fortune/Jamfile b/src/tests/kernel/boot_floppy/fortune/Jamfile index ca41fe0e4b..684180cf16 100644 --- a/src/tests/kernel/boot_floppy/fortune/Jamfile +++ b/src/tests/kernel/boot_floppy/fortune/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel apps fortune ; +SubDir OBOS_TOP src tests kernel boot_floppy fortune ; KernelObjects <$(SOURCE_GRIST)>main.c diff --git a/src/tests/kernel/boot_floppy/ls/Jamfile b/src/tests/kernel/boot_floppy/ls/Jamfile index f5ddbae634..a712cf048e 100644 --- a/src/tests/kernel/boot_floppy/ls/Jamfile +++ b/src/tests/kernel/boot_floppy/ls/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel apps ls ; +SubDir OBOS_TOP src tests kernel boot_floppy ls ; KernelObjects <$(SOURCE_GRIST)>main.c diff --git a/src/tests/kernel/boot_floppy/ps/Jamfile b/src/tests/kernel/boot_floppy/ps/Jamfile index 263838b2af..7b76173f16 100644 --- a/src/tests/kernel/boot_floppy/ps/Jamfile +++ b/src/tests/kernel/boot_floppy/ps/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel apps ps ; +SubDir OBOS_TOP src tests kernel boot_floppy ps ; KernelObjects <$(SOURCE_GRIST)>main.c ; diff --git a/src/tests/kernel/boot_floppy/shell/Jamfile b/src/tests/kernel/boot_floppy/shell/Jamfile index d7f4ec4aeb..d71fe08523 100644 --- a/src/tests/kernel/boot_floppy/shell/Jamfile +++ b/src/tests/kernel/boot_floppy/shell/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel apps shell ; +SubDir OBOS_TOP src tests kernel boot_floppy shell ; KernelObjects <$(SOURCE_GRIST)>main.c <$(SOURCE_GRIST)>args.c diff --git a/src/tests/kernel/boot_floppy/symlink/Jamfile b/src/tests/kernel/boot_floppy/symlink/Jamfile index 05619634af..513aa7290e 100644 --- a/src/tests/kernel/boot_floppy/symlink/Jamfile +++ b/src/tests/kernel/boot_floppy/symlink/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel apps symlink ; +SubDir OBOS_TOP src tests kernel boot_floppy symlink ; KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ; diff --git a/src/tests/kernel/boot_floppy/testapp/Jamfile b/src/tests/kernel/boot_floppy/testapp/Jamfile index fb59ed569d..facaf40c0e 100644 --- a/src/tests/kernel/boot_floppy/testapp/Jamfile +++ b/src/tests/kernel/boot_floppy/testapp/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel apps testapp ; +SubDir OBOS_TOP src tests kernel boot_floppy testapp ; KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ; diff --git a/src/tests/kernel/boot_floppy/tests/Jamfile b/src/tests/kernel/boot_floppy/tests/Jamfile index a9b1b02dcd..e2c266bbd3 100644 --- a/src/tests/kernel/boot_floppy/tests/Jamfile +++ b/src/tests/kernel/boot_floppy/tests/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src kernel apps tests ; +SubDir OBOS_TOP src tests kernel boot_floppy tests ; KernelObjects <$(SOURCE_GRIST)>thread_test.c diff --git a/src/tests/kernel/boot_floppy/uname/Jamfile b/src/tests/kernel/boot_floppy/uname/Jamfile index cf8eec9ce8..223f5b5ba5 100644 --- a/src/tests/kernel/boot_floppy/uname/Jamfile +++ b/src/tests/kernel/boot_floppy/uname/Jamfile @@ -1,3 +1,3 @@ -SubDir OBOS_TOP src kernel apps uname ; +SubDir OBOS_TOP src tests kernel boot_floppy uname ; KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;