[haiku-commits] haiku: hrev49151 - in src: . tests/add-ons/kernel/file_systems/udf/r5 kits/tracker tests/add-ons/kernel/file_systems/bfs/r5 tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon

  • From: waddlesplash@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 8 May 2015 19:36:51 +0200 (CEST)

hrev49151 adds 6 changesets to branch 'master'
old head: 728d237aa6b186da36c6f33edbe9a6f42f45012c
new head: 0ccc5a5ee49c2416a7810d07b71cbf91248dbc43
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=0ccc5a5ee49c+%5E728d237aa6b1

----------------------------------------------------------------------------

eb8660457a9a: Tracker: Model: use SetToFormat.

4bb1fc1791cb: Tracker: get rid of fTrashContextMenu member from DeskWindow...

... as it's useless and shadowing the one in ContainerWindow.
No functional change intended, and none occurs (from my testing).

PVS message V703.

ae495ca8fe9e: filesystems: we aren't BeOS, so we can safely use -O2(+).

fe4a91e388a7: ReadMe: fix typo.

3ecb7fb4415b: 3rdparty: delete CUE file.

Almost certainly doesn't work anymore, and Jam can create ISOs
if needed.

0ccc5a5ee49c: makehaikufloppy: delete.

The last change to it was 2009, in which Stephan said "I have no
idea if this even still works." With the advent of packagefs,
it's even more unlikely that it does, and there's no real need for
it anyway.

If someone happes to have a usecase as well as a patch to make it work,
we can consider re-adding it.

[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

13 files changed, 2 insertions(+), 200 deletions(-)
3rdparty/nero/haiku-cd.cue | 8 --
ReadMe.md | 2 +-
makehaikufloppy | 124 -------------------
src/add-ons/kernel/file_systems/bfs/Jamfile | 5 -
.../file_systems/udf/drive_setup_addon/Jamfile | 10 --
src/kits/tracker/DeskWindow.cpp | 4 -
src/kits/tracker/DeskWindow.h | 1 -
src/kits/tracker/Model.cpp | 4 +-
.../add-ons/kernel/file_systems/bfs/r5/Jamfile | 11 --
.../add-ons/kernel/file_systems/udf/r5/Jamfile | 13 --
.../udf/r5/drive_setup_addon/Jamfile | 10 --
.../kernel/file_systems/userlandfs/bfs/Jamfile | 5 -
src/tools/bfs_shell/Jamfile | 5 -

############################################################################

Commit: eb8660457a9a478f88c379605b039e0484c43790
URL: http://cgit.haiku-os.org/haiku/commit/?id=eb8660457a9a
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri May 8 17:02:10 2015 UTC

Tracker: Model: use SetToFormat.

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index e2d842d..ab16265 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -1310,10 +1310,8 @@ Model::GetVersionString(BString &result, version_kind
kind)
if (error != B_OK)
return error;

- char vstr[32];
- sprintf(vstr, "%" B_PRId32 ".%" B_PRId32 ".%" B_PRId32, version.major,
+ result.SetToFormat("%" B_PRId32 ".%" B_PRId32 ".%" B_PRId32,
version.major,
version.middle, version.minor);
- result = vstr;

return B_OK;
}

############################################################################

Commit: 4bb1fc1791cb519b57901187da738e926cdfee18
URL: http://cgit.haiku-os.org/haiku/commit/?id=4bb1fc1791cb
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri May 8 17:06:18 2015 UTC

Tracker: get rid of fTrashContextMenu member from DeskWindow...

... as it's useless and shadowing the one in ContainerWindow.
No functional change intended, and none occurs (from my testing).

PVS message V703.

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp
index c22e180..40ff654 100644
--- a/src/kits/tracker/DeskWindow.cpp
+++ b/src/kits/tracker/DeskWindow.cpp
@@ -194,7 +194,6 @@ BDeskWindow::BDeskWindow(LockingList<BWindow>* windowList)
| B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS,
B_ALL_WORKSPACES,
false, true),
fDeskShelf(NULL),
- fTrashContextMenu(NULL),
fNodeRef(NULL),
fShortcutsSettings(NULL)
{
@@ -395,9 +394,6 @@ BDeskWindow::Quit()
fAddonsList->MakeEmpty(true);
delete fAddonsList;

- delete fTrashContextMenu;
- fTrashContextMenu = NULL;
-
delete fDeskShelf;
_inherited::Quit();
}
diff --git a/src/kits/tracker/DeskWindow.h b/src/kits/tracker/DeskWindow.h
index e1f2141..04666f5 100644
--- a/src/kits/tracker/DeskWindow.h
+++ b/src/kits/tracker/DeskWindow.h
@@ -83,7 +83,6 @@ private:

BShelf* fDeskShelf;
// shelf for replicant support
- BPopUpMenu* fTrashContextMenu;

BRect fOldFrame;


############################################################################

Commit: ae495ca8fe9e48dea982cf522c5c54c56dffb9fd
URL: http://cgit.haiku-os.org/haiku/commit/?id=ae495ca8fe9e
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri May 8 17:28:01 2015 UTC

filesystems: we aren't BeOS, so we can safely use -O2(+).

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/file_systems/bfs/Jamfile
b/src/add-ons/kernel/file_systems/bfs/Jamfile
index 8d78cf7..b8842b9 100644
--- a/src/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/bfs/Jamfile
@@ -7,11 +7,6 @@ SubDir HAIKU_TOP src add-ons kernel file_systems bfs ;
#BFS_BIG_ENDIAN_ONLY
;

- if $(DEBUG) = 0 {
- # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
- OPTIM = -O1 ;
- }
-
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;
diff --git a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
index 329a3ab..40fc156 100644
--- a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
@@ -1,8 +1,5 @@
SubDir HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ;

-# save original optimization level
-oldOPTIM = $(OPTIM) ;
-
# set some additional defines
{
local defines =
@@ -15,9 +12,6 @@ oldOPTIM = $(OPTIM) ;

if $(DEBUG) {
#defines += DEBUG ;
- } else {
- # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
- OPTIM = -O1 ;
}

defines = [ FDefines $(defines) ] ;
@@ -55,7 +49,3 @@ actions ignore InstallUDFDS
}

InstallUDFDS install : i-udf-ds ;
-
-# restore original optimization level
-OPTIM = $(oldOPTIM) ;
-
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile
b/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile
index 7a22934..882568e 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile
@@ -2,9 +2,6 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs r5 ;

SetSubDirSupportedPlatformsBeOSCompatible ;

-# save original optimization level
-oldOPTIM = $(OPTIM) ;
-
# set some additional defines
{
local defines =
@@ -27,11 +24,6 @@ oldOPTIM = $(OPTIM) ;
bfsAddOnName = obfs ;
}

- if $(DEBUG) = 0 {
- # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
- OPTIM = -O1 ;
- }
-
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) -fno-rtti ;
@@ -75,6 +67,3 @@ actions ignore InstallBFS
}

InstallBFS install : obfs ;
-
-# restore original optimization level
-OPTIM = $(oldOPTIM) ;
diff --git a/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile
b/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile
index d94a504..53c24ab 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile
@@ -3,9 +3,6 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems udf r5 ;
SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ;

-# save original optimization level
-oldOPTIM = $(OPTIM) ;
-
# set some additional defines
{
local defines =
@@ -14,11 +11,6 @@ oldOPTIM = $(OPTIM) ;

defines += COMPILE_FOR_R5 ;

- if $(DEBUG) = 0 {
- # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
- OPTIM = -O1 ;
- }
-
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;
@@ -62,8 +54,3 @@ actions ignore InstallUDF
}

InstallUDF install : udf ;
-
-# restore original optimization level
-OPTIM = $(oldOPTIM) ;
-
-SubInclude HAIKU_TOP src tests add-ons kernel file_systems udf r5
drive_setup_addon ;
diff --git
a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile
b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile
index 8289920..e882929 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile
@@ -2,9 +2,6 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems udf r5
drive_setup_addon

SetSubDirSupportedPlatformsBeOSCompatible ;

-# save original optimization level
-oldOPTIM = $(OPTIM) ;
-
# set some additional defines
{
local defines =
@@ -17,9 +14,6 @@ oldOPTIM = $(OPTIM) ;

if $(DEBUG) {
#defines += DEBUG ;
- } else {
- # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
- OPTIM = -O1 ;
}

defines = [ FDefines $(defines) ] ;
@@ -57,7 +51,3 @@ actions ignore InstallUDFDS
}

InstallUDFDS install : i-udf-ds ;
-
-# restore original optimization level
-OPTIM = $(oldOPTIM) ;
-
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
index b42a2d0..28128f8 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
@@ -11,11 +11,6 @@ SEARCH_SOURCE += $(bfsTop) ;
USER=1
;

- if $(DEBUG) = 0 {
- # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
- OPTIM = -O1 ;
- }
-
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) -fno-rtti ;
diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile
index bd8fb28..0c02396 100644
--- a/src/tools/bfs_shell/Jamfile
+++ b/src/tools/bfs_shell/Jamfile
@@ -12,11 +12,6 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
FS_SHELL
;

- if $(DEBUG) = 0 {
- # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
- OPTIM = -O1 ;
- }
-
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) -Wno-multichar ;
SubDirC++Flags $(defines) -Wno-multichar -fno-rtti ;

############################################################################

Commit: fe4a91e388a7f8380e20f761103751abbbc6cd22
URL: http://cgit.haiku-os.org/haiku/commit/?id=fe4a91e388a7
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri May 8 17:29:23 2015 UTC

ReadMe: fix typo.

----------------------------------------------------------------------------

diff --git a/ReadMe.md b/ReadMe.md
index d37ff7d..03fa5c8 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -47,7 +47,7 @@ one of our OpenGrok servers:

### Contributing documentation
The main piece of documentation that still needs work are the API docs (found
-in the tree at `src/docs/user`). Just find an undocumented class, write
+in the tree at `docs/user`). Just find an undocumented class, write
documentation for it, and [submit a
patch](https://dev.haiku-os.org/wiki/CodingGuidelines/SubmittingPatches).

### Contributing translations

############################################################################

Commit: 3ecb7fb4415b319b6aac606551d51efad21037df
URL: http://cgit.haiku-os.org/haiku/commit/?id=3ecb7fb4415b
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri May 8 17:31:02 2015 UTC

3rdparty: delete CUE file.

Almost certainly doesn't work anymore, and Jam can create ISOs
if needed.

----------------------------------------------------------------------------

diff --git a/3rdparty/nero/haiku-cd.cue b/3rdparty/nero/haiku-cd.cue
deleted file mode 100644
index 2e3daa2..0000000
--- a/3rdparty/nero/haiku-cd.cue
+++ /dev/null
@@ -1,8 +0,0 @@
-FILE "haiku-boot-cd.iso" BINARY
-TRACK 01 MODE1/2048
-INDEX 01 00:00:00
-POSTGAP 00:02:00
-FILE "haiku.image" BINARY
-TRACK 02 MODE1/2048
-INDEX 01 00:00:00
-POSTGAP 00:02:00

############################################################################

Revision: hrev49151
Commit: 0ccc5a5ee49c2416a7810d07b71cbf91248dbc43
URL: http://cgit.haiku-os.org/haiku/commit/?id=0ccc5a5ee49c
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri May 8 17:34:53 2015 UTC

makehaikufloppy: delete.

The last change to it was 2009, in which Stephan said "I have no
idea if this even still works." With the advent of packagefs,
it's even more unlikely that it does, and there's no real need for
it anyway.

If someone happes to have a usecase as well as a patch to make it work,
we can consider re-adding it.

----------------------------------------------------------------------------

diff --git a/makehaikufloppy b/makehaikufloppy
deleted file mode 100644
index 6abcf83..0000000
--- a/makehaikufloppy
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-
-usage() {
- echo "Usage: makebootfloppy [-cd] [-base <directory>] [-preserve]
[-image <target>]"
- echo "-cd : Creates a boot floppy capable of booting to a CD."
- echo " If not specified, the boot floppy will only be able
to boot"
- echo " systems from hard drives."
- echo "-base : Specifies the base directory of the system you wish
to make"
- echo " a boot floppy from. Defaults to /boot"
- echo "-preserve : Leaves a copy of the floppy image in /tmp (only valid
when"
- echo " used with the -cd option)."
- echo "-image : writes the floppy image to the specified file - this
implies"
- echo " the -cd option."
- exit $1
-}
-
-BASE=/boot
-CD=0
-PRESERVE=0
-IMAGE=/dev/disk/floppy/raw
-
-while [ "x$1" != "x" ] ; do
- if [ "$1" = "-help" ] || [ "$1" = "--help" ] ; then
- usage 0
- elif [ "$1" = "-cd" ] ; then
- CD=1
- elif [ "$1" = "-preserve" ] ; then
- PRESERVE=1
- elif [ "$1" = "-image" ] ; then
- shift
- IMAGE=$1
- CD=1
- if [ "x$1" = "x" ] ; then
- echo "-image requires an argument."
- usage 1
- fi
- elif [ "$1" = "-base" ] ; then
- shift
- BASE=$1
- if [ "x$1" = "x" ] || [ ! -d $BASE ] ; then
- echo "-base requires a directory argument."
- usage 1
- fi
- else
- echo "Invalid option: $1"
- usage 1
- fi
- shift
-done
-
-if [ $CD = 1 ] ; then
- rm -f /tmp/boot.tgz /tmp/boot.img
-
- echo "Creating boot image..."
-
- mkdir -p /tmp/system
- cp $BASE/system/kernel_x86 /tmp/system/
- oldCWD=$(pwd)
-
- cd /tmp
- tar chf /tmp/boot.tar system/kernel_x86
- rm -r /tmp/system
-
- cd $oldCWD
- cd $BASE
- pwd
- tar rvhf /tmp/boot.tar \
- system/add-ons/kernel/busses/ide \
- system/add-ons/kernel/bus_managers \
- system/add-ons/kernel/file_systems/bfs \
- system/add-ons/kernel/generic \
- system/add-ons/kernel/partitioning_systems \
- system/add-ons/kernel/drivers/disk/scsi/scsi* \
- system/add-ons/kernel/file_systems/bfs \
- > /dev/null
-# system/add-ons/kernel/boot \
- gzip -c /tmp/boot.tar > /tmp/boot.tgz
- rm /tmp/boot.tar
- cd $oldCWD
- if [ $? != 0 ] ; then
- echo "Error creating boot floppy"
- exit 1
- fi
-
- dd if=/dev/zero of=/tmp/boot.img bs=1k count=1440
- if [ $? != 0 ] ; then
- echo "Error creating temporary boot image"
- exit 1
- fi
- dd if=$BASE/system/haiku_loader of=/tmp/boot.img conv=notrunc
- dd if=/tmp/boot.tgz of=/tmp/boot.img bs=192k seek=1 conv=notrunc
-
- echo "Writing boot image to "$IMAGE
- dd if=/tmp/boot.img of=$IMAGE bs=72k
- _retval=$?
-
- if [ $PRESERVE = 0 ] ; then
- rm -f /tmp/boot.tgz /tmp/boot.img
- fi
-
- if [ $_retval != 0 ] ; then
- echo "Error creating boot floppy"
- exit 1
- fi
-else
- # non-CD mode (only writes the bare boot loader)
-
- echo "Writing boot loader..."
- dd if=$BASE/system/haiku_loader of=$IMAGE bs=18k
- if [ $? != 0 ] ; then
- echo "Error creating boot floppy"
- exit 1
- fi
-
- echo "Erasing old boot drivers from the floppy..."
- dd if=/dev/zero of=$IMAGE bs=512 conv=notrunc seek=384 count=1
- if [ $? != 0 ] ; then
- echo "Error creating boot floppy"
- exit 1
- fi
-fi
-
-echo "Done!"
-exit 0


Other related posts: