[haiku-commits] r35653 - in haiku/trunk: build/jam src/add-ons/kernel/file_systems/udf
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 28 Feb 2010 09:03:41 +0100 (CET)
Author: mmlr
Date: 2010-02-28 09:03:41 +0100 (Sun, 28 Feb 2010)
New Revision: 35653
Changeset: http://dev.haiku-os.org/changeset/35653/haiku
Modified:
haiku/trunk/build/jam/HaikuImage
haiku/trunk/src/add-ons/kernel/file_systems/udf/Jamfile
haiku/trunk/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
Log:
* Cleanup the Jamfile, this one doesn't work on BeOS anymore.
* Turn off remaining verbose debug output.
* Add UDF to the default image.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2010-02-28 07:50:28 UTC (rev 35652)
+++ haiku/trunk/build/jam/HaikuImage 2010-02-28 08:03:41 UTC (rev 35653)
@@ -187,7 +187,7 @@
$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
- write_overlay ntfs reiserfs ; #googlefs
+ write_overlay ntfs reiserfs udf ; #googlefs
# modules
Modified: haiku/trunk/src/add-ons/kernel/file_systems/udf/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/udf/Jamfile 2010-02-28
07:50:28 UTC (rev 35652)
+++ haiku/trunk/src/add-ons/kernel/file_systems/udf/Jamfile 2010-02-28
08:03:41 UTC (rev 35653)
@@ -1,22 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel file_systems udf ;
-SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ;
-# save original optimization level
-oldOPTIM = $(OPTIM) ;
-
-# set some additional defines
-{
- local defines =
- KEEP_WRONG_DIRENT_RECLEN
- ;
-
- defines = [ FDefines $(defines) ] ;
- SubDirCcFlags $(defines) -Wall -Wno-multichar ;
- SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti ;
-}
-
UsePrivateKernelHeaders ;
KernelAddon udf :
@@ -32,29 +17,6 @@
Utils.cpp
VirtualPartition.cpp
Volume.cpp
-
- kernel_cpp.cpp
- kernel_interface.cpp
- ;
-SEARCH on [ FGristFiles
- kernel_cpp.cpp
- ] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
-
-
-rule InstallUDF
-{
- Depends $(<) : $(>) ;
-}
-
-actions ignore InstallUDF
-{
- cp $(>) /boot/home/config/add-ons/kernel/file_systems/
-}
-
-InstallUDF install : udf ;
-
-# restore original optimization level
-OPTIM = $(oldOPTIM) ;
-
-#SubInclude HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ;
+ kernel_interface.cpp
+;
Modified: haiku/trunk/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
2010-02-28 07:50:28 UTC (rev 35652)
+++ haiku/trunk/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
2010-02-28 08:03:41 UTC (rev 35653)
@@ -26,7 +26,7 @@
#undef TRACE
#undef TRACE_ERROR
-#define UDF_KERNEL_INTERFACE_DEBUG
+//#define UDF_KERNEL_INTERFACE_DEBUG
#ifdef UDF_KERNEL_INTERFACE_DEBUG
# define TRACE(x) dprintf x
# define TRACE_ERROR(x) dprintf x
Other related posts:
- » [haiku-commits] r35653 - in haiku/trunk: build/jam src/add-ons/kernel/file_systems/udf - mmlr
