i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now links against the boottest file system modules, it doesn't build them

Browse Source 
directly anymore (due to name clashes).
Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4698 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-09-15 22:31:06 +00:00
parent 7be68ba5e7
commit ee9b3cfd75
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kernel/boot/loader/Jamfile
+12 -21
View File
@@ -4,7 +4,10 @@ UsePrivateHeaders [ FDirName kernel ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName storage ] ; UsePrivateHeaders [ FDirName storage ] ;
SubDirHdrs $(OBOS_TOP) headers private kernel arch $(OBOS_ARCH) ; SubDirHdrs $(OBOS_TOP) headers private kernel arch $(OBOS_ARCH) ;
SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
# we need to redefine certain calls in the boot loader so that
# they will really be used instead of their POSIX counterparts
# in libroot.so
ObjectsDefines ObjectsDefines
# boot loader # boot loader
@@ -18,13 +21,6 @@ ObjectsDefines
apple.cpp apple.cpp
intel.cpp intel.cpp
PartitionMap.cpp PartitionMap.cpp
# file systems
bfs.cpp
Directory.cpp
File.cpp
Stream.cpp
BPlusTree.cpp
: :
read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close
; ;
@@ -37,6 +33,7 @@ ObjectsDefines
BOOT_SUPPORT_PARTITION_INTEL BOOT_SUPPORT_PARTITION_INTEL
BOOT_SUPPORT_FILE_SYSTEM_BFS BOOT_SUPPORT_FILE_SYSTEM_BFS
BOOT_SUPPORT_FILE_SYSTEM_AMIGA_FFS
; ;
defines = [ FDefines $(defines) ] ; defines = [ FDefines $(defines) ] ;
@@ -45,7 +42,7 @@ ObjectsDefines
# SubDirC++Flags -include /usr/include/stdio.h ; # SubDirC++Flags -include /usr/include/stdio.h ;
} else { } else {
# SubDirC++Flags -include /boot/develop/headers/posix/stdio.h ; # SubDirC++Flags -include /boot/develop/headers/posix/stdio.h ;
SubDirC++Flags $(defines) -DHAVE_READ_POS=1 ; SubDirC++Flags $(defines) -DHAVE_READ_POS=1 ; # -fcheck-memory-usage -D_NO_INLINE_ASM ;
} }
} }
@@ -69,18 +66,11 @@ SimpleTest BootLoaderTest :
intel.cpp intel.cpp
PartitionMap.cpp PartitionMap.cpp
# file systems
bfs.cpp
Directory.cpp
File.cpp
Stream.cpp
BPlusTree.cpp
# utility functions - Dano has a strlcpy() function in libroot.so, while R5 has not # utility functions - Dano has a strlcpy() function in libroot.so, while R5 has not
list.c list.c
strlcpy.c strlcpy.c
:
: -fno-builtin : boottest_bfs.a boottest_amiga_ffs.a
; ;
# Tell Jam where to find the utility sources # Tell Jam where to find the utility sources
@@ -96,6 +86,8 @@ SEARCH on [ FGristFiles
heap.cpp RootFileSystem.cpp heap.cpp RootFileSystem.cpp
] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ; ] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ;
# partitioning system modules
SEARCH on [ FGristFiles amiga_rdb.cpp ] SEARCH on [ FGristFiles amiga_rdb.cpp ]
= [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ] ; = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ] ;
@@ -105,6 +97,5 @@ SEARCH on [ FGristFiles apple.cpp ]
SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp ] SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp ]
= [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems intel ] ; = [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems intel ] ;
SEARCH on [ FGristFiles
bfs.cpp Directory.cpp File.cpp Stream.cpp BPlusTree.cpp SubInclude OBOS_TOP src tests kernel boot loader file_systems ;
] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems bfs ] ;