From 2c2516b9b63be16a8e6dc02e8a707f3e73fc4647 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 18 Dec 2017 18:06:12 -0500 Subject: [PATCH] libhaikucompat: Delete. Was decoupled from the build since the switch to use libroot_build even on Haiku. --- src/build/libhaikucompat/Jamfile | 72 --- src/build/libhaikucompat/misc.cpp | 52 -- src/build/libhaikucompat/syscalls.cpp | 455 ------------------ .../iso9660/iso9660_shell/Jamfile | 7 +- src/tools/bfs_shell/Jamfile | 9 +- src/tools/btrfs_shell/Jamfile | 2 +- src/tools/locale/Jamfile | 10 - 7 files changed, 4 insertions(+), 603 deletions(-) delete mode 100644 src/build/libhaikucompat/Jamfile delete mode 100644 src/build/libhaikucompat/misc.cpp delete mode 100644 src/build/libhaikucompat/syscalls.cpp diff --git a/src/build/libhaikucompat/Jamfile b/src/build/libhaikucompat/Jamfile deleted file mode 100644 index 2003b8dc52..0000000000 --- a/src/build/libhaikucompat/Jamfile +++ /dev/null @@ -1,72 +0,0 @@ -SubDir HAIKU_TOP src build libhaikucompat ; - -SetSubDirSupportedPlatforms libbe_test r5 dano bone ; - -UsePrivateBuildHeaders . kernel [ FDirName system arch $(HOST_ARCH) ] ; - # the latter for - - -local libbeTestSources ; -if $(TARGET_PLATFORM) = libbe_test { - libbeTestSources = misc.cpp syscalls.cpp ; -} - -# TODO: This is a temporary kludge. We should actually build libbe_build.so -# and use it for the build tools even on BeOS compatible platforms. For the -# time being we build the classes we need (BAppFileInfo and its dependencies) -# into libhaikucompat_build.a. -local libbePatchSources ; -if $(HOST_PLATFORM) in r5 bone dano { - libbePatchSources += AppFileInfo.cpp Bitmap.cpp GraphicsDefs.cpp ; - ObjectSysHdrs $(libbePatchSources) - : [ FDirName $(HAIKU_TOP) headers build os app ] ; - ObjectSysHdrs $(libbePatchSources) - : [ FDirName $(HAIKU_TOP) headers build os interface ] ; - ObjectSysHdrs $(libbePatchSources) - : [ FDirName $(HAIKU_TOP) headers build os support ] ; - ObjectSysHdrs $(libbePatchSources) - : [ FDirName $(HAIKU_TOP) headers build os storage ] ; - if $(HOST_PLATFORM) = r5 { - ObjectDefines $(libbePatchSources) : - USING_HAIKU_TYPE_CONSTANTS_H= ; - } - if $(HOST_PLATFORM) = bone { - ObjectDefines $(libbePatchSources) : - USING_HAIKU_TYPE_CONSTANTS_H= ; - } - if $(HOST_PLATFORM) = dano { - ObjectDefines $(libbePatchSources) : _IMPEXP_BE= - USING_HAIKU_TYPE_CONSTANTS_H= ; - } - ObjectC++Flags $(libbePatchSources) - : -include [ FDirName $(HAIKU_TOP) headers build - HaikuBuildCompatibility.h ] ; -} - -BuildPlatformStaticLibrary libhaikucompat_build.a : - atomic.S - strcasestr.c - strlcat.c - strlcpy.c - strnlen.c - - $(libbePatchSources) -; - -StaticLibrary libhaikucompat.a : - strcasestr.o - strlcat.o - strlcpy.o - strnlen.o - - $(libbeTestSources) -; - -SEARCH on [ FGristFiles strcasestr.c strlcat.c strlcpy.c strnlen.c ] - = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ; -SEARCH on [ FGristFiles atomic.S ] - = [ FDirName $(HAIKU_TOP) src system libroot os arch $(HOST_ARCH) ] ; -SEARCH on [ FGristFiles Bitmap.cpp GraphicsDefs.cpp ] - = [ FDirName $(HAIKU_TOP) src build libbe interface ] ; -SEARCH on [ FGristFiles AppFileInfo.cpp ] - = [ FDirName $(HAIKU_TOP) src build libbe storage ] ; diff --git a/src/build/libhaikucompat/misc.cpp b/src/build/libhaikucompat/misc.cpp deleted file mode 100644 index 0ef4f8c8a7..0000000000 --- a/src/build/libhaikucompat/misc.cpp +++ /dev/null @@ -1,52 +0,0 @@ - -#include -#include - -#include - -extern "C" void -debug_printf(const char *format, ...) -{ - va_list list; - - va_start(list, format); - vprintf(format, list); - va_end(list); -} - - -extern "C" void -ktrace_printf(const char *format, ...) -{ -} - - -dev_t -fs_mount_volume(const char *where, const char *device, const char *filesystem, - uint32 flags, const char *parameters) -{ - return B_ERROR; -} - - -status_t -fs_unmount_volume(const char *path, uint32 flags) -{ - return B_ERROR; -} - - -int32 -atomic_get(vint32 *value) -{ - return *value; -} - - -status_t -_get_port_message_info_etc(port_id id, port_message_info *info, - size_t infoSize, uint32 flags, bigtime_t timeout) -{ - return B_ERROR; -} - diff --git a/src/build/libhaikucompat/syscalls.cpp b/src/build/libhaikucompat/syscalls.cpp deleted file mode 100644 index b88e736646..0000000000 --- a/src/build/libhaikucompat/syscalls.cpp +++ /dev/null @@ -1,455 +0,0 @@ - -#include -#include - -#include - - -// #prama mark - iterating, retrieving device/partition data -partition_id -_kern_get_next_disk_device_id(int32 *cookie, size_t *neededSize) -{ - return -1; -} - - -partition_id -_kern_find_disk_device(const char *filename, size_t *neededSize) -{ - return -1; -} - - -partition_id -_kern_find_partition(const char *filename, size_t *neededSize) -{ - return -1; -} - - -status_t -_kern_get_disk_device_data(partition_id deviceID, bool deviceOnly, - bool shadow, struct user_disk_device_data *buffer, size_t bufferSize, - size_t *neededSize) -{ - return B_ERROR; -} - - -partition_id -_kern_register_file_device(const char *filename) -{ - return -1; -} - - -status_t -_kern_unregister_file_device(partition_id deviceID, const char *filename) -{ - return B_ERROR; -} - -// #pragma mark - disk systems - -status_t -_kern_get_disk_system_info(disk_system_id id, - struct user_disk_system_info *info) -{ - return B_ERROR; -} - - -status_t -_kern_get_next_disk_system_info(int32 *cookie, - struct user_disk_system_info *info) -{ - return B_ERROR; -} - - -status_t -_kern_find_disk_system(const char *name, - struct user_disk_system_info *info) -{ - return B_ERROR; -} - - -bool -_kern_supports_defragmenting_partition(partition_id partitionID, - int32 changeCounter, bool *whileMounted) -{ - return false; -} - - -bool -_kern_supports_repairing_partition(partition_id partitionID, - int32 changeCounter, bool checkOnly, bool *whileMounted) -{ - return false; -} - - -bool -_kern_supports_resizing_partition(partition_id partitionID, - int32 changeCounter, bool *canResizeContents, bool *whileMounted) -{ - return false; -} - - -bool -_kern_supports_moving_partition(partition_id partitionID, - int32 changeCounter, partition_id *unmovable, - partition_id *needUnmounting, size_t bufferSize) -{ - return false; -} - - -bool -_kern_supports_setting_partition_name(partition_id partitionID, - int32 changeCounter) -{ - return false; -} - - -bool -_kern_supports_setting_partition_content_name(partition_id partitionID, - int32 changeCounter, bool *whileMounted) -{ - return false; -} - - -bool -_kern_supports_setting_partition_type(partition_id partitionID, - int32 changeCounter) -{ - return false; -} - - -bool -_kern_supports_setting_partition_parameters(partition_id partitionID, - int32 changeCounter) -{ - return false; -} - - -bool -_kern_supports_setting_partition_content_parameters( - partition_id partitionID, int32 changeCounter, bool *whileMounted) -{ - return false; -} - - -bool -_kern_supports_initializing_partition(partition_id partitionID, - int32 changeCounter, const char *diskSystemName) -{ - return false; -} - - -bool -_kern_supports_creating_child_partition(partition_id partitionID, - int32 changeCounter) -{ - return false; -} - - -bool -_kern_supports_deleting_child_partition(partition_id partitionID, - int32 changeCounter) -{ - return false; -} - - -bool -_kern_is_sub_disk_system_for(disk_system_id diskSystemID, - partition_id partitionID, int32 changeCounter) - -{ - return false; -} - - -status_t -_kern_validate_resize_partition(partition_id partitionID, int32 changeCounter, - off_t *size) -{ - return B_ERROR; -} - - -status_t -_kern_validate_move_partition(partition_id partitionID, int32 changeCounter, - off_t *newOffset) -{ - return B_ERROR; -} - - -status_t -_kern_validate_set_partition_name(partition_id partitionID, int32 changeCounter, - char *name) -{ - return B_ERROR; -} - - -status_t -_kern_validate_set_partition_content_name(partition_id partitionID, - int32 changeCounter, char *name) -{ - return B_ERROR; -} - - -status_t -_kern_validate_set_partition_type(partition_id partitionID, int32 changeCounter, - const char *type) -{ - return B_ERROR; -} - - -status_t -_kern_validate_initialize_partition(partition_id partitionID, - int32 changeCounter, const char *diskSystemName, char *name, - const char *parameters, size_t parametersSize) -{ - return B_ERROR; -} - - -status_t -_kern_validate_create_child_partition(partition_id partitionID, - int32 changeCounter, off_t *offset, off_t *size, const char *type, - const char *parameters, size_t parametersSize) -{ - return B_ERROR; -} - - -status_t -_kern_get_partitionable_spaces(partition_id partitionID, int32 changeCounter, - struct partitionable_space_data *buffer, int32 count, int32 *actualCount) -{ - return B_ERROR; -} - - -status_t -_kern_get_next_supported_partition_type(partition_id partitionID, - int32 changeCounter, int32 *cookie, char *type) -{ - return B_ERROR; -} - - -status_t -_kern_get_partition_type_for_content_type(disk_system_id diskSystemID, - const char *contentType, char *type) -{ - return B_ERROR; -} - -// #pragma mark - disk device modification - -status_t -_kern_prepare_disk_device_modifications(partition_id deviceID) -{ - return B_ERROR; -} - - -status_t -_kern_commit_disk_device_modifications(partition_id deviceID, - port_id port, int32 token, bool completeProgress) -{ - return B_ERROR; -} - - -status_t -_kern_cancel_disk_device_modifications(partition_id deviceID) -{ - return B_ERROR; -} - - -bool -_kern_is_disk_device_modified(partition_id deviceID) -{ - return false; -} - - -status_t -_kern_defragment_partition(partition_id partitionID, int32 changeCounter) -{ - return B_ERROR; -} - - -status_t -_kern_repair_partition(partition_id partitionID, int32 changeCounter, - bool checkOnly) -{ - return B_ERROR; -} - - -status_t -_kern_resize_partition(partition_id partitionID, int32 changeCounter, - off_t size) -{ - return B_ERROR; -} - - -status_t -_kern_move_partition(partition_id partitionID, int32 changeCounter, - off_t newOffset) -{ - return B_ERROR; -} - - -status_t -_kern_set_partition_name(partition_id partitionID, int32 changeCounter, - const char *name) -{ - return B_ERROR; -} - - -status_t -_kern_set_partition_content_name(partition_id partitionID, - int32 changeCounter, const char *name) -{ - return B_ERROR; -} - - -status_t -_kern_set_partition_type(partition_id partitionID, int32 changeCounter, - const char *type) -{ - return B_ERROR; -} - - -status_t -_kern_set_partition_parameters(partition_id partitionID, int32 changeCounter, - const char *parameters, size_t parametersSize) -{ - return B_ERROR; -} - - -status_t -_kern_set_partition_content_parameters(partition_id partitionID, - int32 changeCounter, const char *parameters, size_t parametersSize) -{ - return B_ERROR; -} - - -status_t -_kern_initialize_partition(partition_id partitionID, int32 changeCounter, - const char *diskSystemName, const char *name, const char *parameters, - size_t parametersSize) -{ - return B_ERROR; -} - - -status_t -_kern_uninitialize_partition(partition_id partitionID, int32 changeCounter, - partition_id parentID, int32 parentChangeCounter) -{ - return B_ERROR; -} - - -status_t -_kern_create_child_partition(partition_id partitionID, int32 changeCounter, - off_t offset, off_t size, const char *type, const char *parameters, - size_t parametersSize, partition_id *childID) -{ - return B_ERROR; -} - - -status_t -_kern_delete_partition(partition_id partitionID, int32 changeCounter) -{ - return B_ERROR; -} - - -status_t -_kern_delete_child_partition(partition_id partitionID, int32* changeCounter, - partition_id childID, int32 childChangeCounter) -{ - return B_ERROR; -} - - -// #pragma mark - jobs - - -status_t -_kern_get_next_disk_device_job_info(int32 *cookie, - struct user_disk_device_job_info *info) -{ - return B_ERROR; -} - - -status_t -_kern_get_disk_device_job_info(disk_job_id id, - struct user_disk_device_job_info *info) -{ - return B_ERROR; -} - - -status_t -_kern_get_disk_device_job_progress_info(disk_job_id id, - struct disk_device_job_progress_info *info) -{ - return B_ERROR; -} - - -status_t -_kern_pause_disk_device_job(disk_job_id id) -{ - return B_ERROR; -} - - -status_t -_kern_cancel_disk_device_job(disk_job_id id, bool reverse) -{ - return B_ERROR; -} - -// #pragma mark - other syscalls - -status_t -_kern_get_safemode_option(const char *parameter, char *buffer, - size_t *_bufferSize) -{ - return B_ERROR; -} diff --git a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile index 84772af7c9..27e62ec0cd 100644 --- a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile @@ -12,11 +12,6 @@ SEARCH_SOURCE SubDirC++Flags $(defines) -fno-exceptions ; } -local libHaikuCompat ; -if $(HOST_PLATFORM_BEOS_COMPATIBLE) && ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) { - libHaikuCompat = libhaikucompat_build.a ; -} - # platform specific libraries local fsShellCommandLibs ; if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) { @@ -29,6 +24,6 @@ BuildPlatformMain iso9660_shell iso9660_identify.cpp kernel_interface.cpp - : fs_shell.a $(libHaikuCompat) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) + : fs_shell.a $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) $(HOST_LIBROOT) $(fsShellCommandLibs) ; diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile index bd8fb28849..31adcd641d 100644 --- a/src/tools/bfs_shell/Jamfile +++ b/src/tools/bfs_shell/Jamfile @@ -22,11 +22,6 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ; SubDirC++Flags $(defines) -Wno-multichar -fno-rtti ; } -local libHaikuCompat ; -if $(HOST_PLATFORM_BEOS_COMPATIBLE) && ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) { - libHaikuCompat = libhaikucompat_build.a ; -} - # platform specific libraries local fsShellCommandLibs ; if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) { @@ -69,7 +64,7 @@ BuildPlatformMain bfs_shell command_checkfs.cpp : bfs.o - fs_shell.a $(libHaikuCompat) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) + fs_shell.a $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) $(HOST_LIBROOT) $(fsShellCommandLibs) ; @@ -78,7 +73,7 @@ BuildPlatformMain bfs_fuse : bfs.o fuse_module.a - $(libHaikuCompat) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) + $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) $(HOST_STATIC_LIBROOT) $(fsShellCommandLibs) fuse ; diff --git a/src/tools/btrfs_shell/Jamfile b/src/tools/btrfs_shell/Jamfile index 8ec1718d85..50a69d24d0 100644 --- a/src/tools/btrfs_shell/Jamfile +++ b/src/tools/btrfs_shell/Jamfile @@ -61,7 +61,7 @@ BuildPlatformMain btrfs_shell command_cat.cpp : btrfs.o - fs_shell.a $(libHaikuCompat) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) + fs_shell.a $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) $(HOST_LIBROOT) $(fsShellCommandLibs) ; diff --git a/src/tools/locale/Jamfile b/src/tools/locale/Jamfile index a06d60d36a..ebceaa1278 100644 --- a/src/tools/locale/Jamfile +++ b/src/tools/locale/Jamfile @@ -26,16 +26,6 @@ USES_BE_API on $(localetools) = true ; UseLibraryHeaders icu ; -# TODO: temporary kludge -local libHaikuCompat ; -if $(HOST_PLATFORM) in r5 bone dano { - ObjectC++Flags database_support.cpp UpdateMimeInfoThread.cpp - MimeUpdateThread.cpp - : -include [ FDirName $(HAIKU_TOP) headers build - HaikuBuildCompatibility.h ] ; - libHaikuCompat = libhaikucompat_build.a ; -} - BuildPlatformMain collectcatkeys : collectcatkeys.cpp PlainTextCatalog.cpp