Ticket #945: boot-haiku1.diff

File boot-haiku1.diff, 62.4 KB (added by kaoutsis, 17 years ago)

  • 3rdparty/mmu_man/themes/addons/DeskbarAddon.cpp

     
    5959    status_t err;
    6060    entry_ref ref;
    6161    BEntry ent;
    62     err = ent.SetTo("/boot/beos/preferences/Deskbar");
     62    err = ent.SetTo("/boot/haiku/preferences/Deskbar");
    6363    if (!err) {
    6464        err = ent.GetRef(&ref);
    6565        if (!err) {

  • 3rdparty/mmu_man/themes/addons/SoundsAddon.cpp

     
    6363    status_t err;
    6464    entry_ref ref;
    6565    BEntry ent;
    66     err = ent.SetTo("/boot/beos/preferences/Sounds");
     66    err = ent.SetTo("/boot/haiku/preferences/Sounds");
    6767    if (!err) {
    6868        err = ent.GetRef(&ref);
    6969        if (!err) {

  • 3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp

     
    126126    */
    127127    if (!err)
    128128        return B_OK;
    129     err = ent.SetTo("/boot/beos/preferences/Appearance");
     129    err = ent.SetTo("/boot/haiku/preferences/Appearance");
    130130    if (!err) {
    131131        err = ent.GetRef(&ref);
    132132        if (!err) {

  • 3rdparty/mmu_man/themes/addons/ScreensaverAddon.cpp

     
    6868    status_t err;
    6969    entry_ref ref;
    7070    BEntry ent;
    71     err = ent.SetTo("/boot/beos/preferences/ScreenSaver");
     71    err = ent.SetTo("/boot/haiku/preferences/ScreenSaver");
    7272    if (!err) {
    7373        err = ent.GetRef(&ref);
    7474        if (!err) {

  • 3rdparty/mmu_man/themes/addons/BackgroundsAddon.cpp

     
    8080    status_t err;
    8181    entry_ref ref;
    8282    BEntry ent;
    83     err = ent.SetTo("/boot/beos/preferences/Backgrounds");
     83    err = ent.SetTo("/boot/haiku/preferences/Backgrounds");
    8484    if (!err) {
    8585        err = ent.GetRef(&ref);
    8686        if (!err) {

  • 3rdparty/mmu_man/themes/addons/HaikuWindowDecorAddon.cpp

     
    9999    status_t err;
    100100    entry_ref ref;
    101101    BEntry ent;
    102     err = ent.SetTo("/boot/beos/references/Appearance");
     102    err = ent.SetTo("/boot/haiku/references/Appearance");
    103103    if (!err) {
    104104        err = ent.GetRef(&ref);
    105105        if (!err) {

  • 3rdparty/mmu_man/themes/ThemeManager.cpp

     
    879879
    880880    err = ThemeLocation(id, location);
    881881    if (!err) {
    882         if (location.FindFirst("/boot/beos") >= 0) {
     882        if (location.FindFirst("/boot/haiku") >= 0) {
    883883            PRINT(("trying to save theme '%s' to system dir!\n", name.String()));
    884884            return B_PERMISSION_DENIED;
    885885        }
    … …  
    10871087    err = ThemeLocation(id, s);
    10881088    if (err)
    10891089        return true;
    1090     if (s.FindFirst("/boot/beos") >= 0)
     1090    if (s.FindFirst("/boot/haiku") >= 0)
    10911091        return true;
    10921092    return false;
    10931093}

  • build/jam/UserBuildConfig.ReadMe

     
    1414
    1515# Adding timezone and keymap settings
    1616AddSymlinkToHaikuImage home config settings
    17     : /boot/beos/etc/timezones/Europe/Paris : timezone ;
     17    : /boot/haiku/etc/timezones/Europe/Paris : timezone ;
    1818
    1919AddFilesToHaikuImage home config settings : <keymap>US-International
    2020    : Key_map ;
    … …  
    8888# has been added, like for "kernel").
    8989HAIKU_INCLUDE_IN_IMAGE on libbe.so kernel = 1 ;
    9090
    91 # Add "crashing_app" to the beos/bin directory of the Haiku image/installation.
     91# Add "crashing_app" to the haiku/bin directory of the Haiku image/installation.
    9292# Note, that this also makes the image depend on the target, i.e. it is
    9393# automatically updated when the image is built.
    94 AddFilesToHaikuImage beos bin : crashing_app ;
     94AddFilesToHaikuImage haiku bin : crashing_app ;
    9595
    9696# Make a symlink to home/config/bin/crash.
    97 AddSymlinkToHaikuImage home config bin : /beos/bin/crashing_app : crash ;
     97AddSymlinkToHaikuImage home config bin : /haiku/bin/crashing_app : crash ;
    9898
    9999# Adds the source directories src/kits/storage and src/tests/servers/debug
    100100# (recursively) to the image (as /boot/home/HaikuSources/src/kits/storage

  • build/jam/OptionalPackages

     
    3838    AddFilesToHaikuImage develop lib x86 : libncurses.a ;
    3939
    4040    # cc and c++ wrapper scripts
    41     AddFilesToHaikuImage beos bin : cc c++ ;
     41    AddFilesToHaikuImage haiku bin : cc c++ ;
    4242
    4343    # headers
    4444    AddHeaderDirectoryToHaikuImage gnu : 3rdparty ;

  • build/jam/ImageRules

     
    246246{
    247247    # AddDriversToContainer <container> : <relative directory> : <targets> ;
    248248    #
    249     local directoryTokens = beos system add-ons kernel drivers dev
     249    local directoryTokens = haiku system add-ons kernel drivers dev
    250250        $(relativeDirectoryTokens) ;
    251251
    252     AddFilesToContainer $(container) : beos system add-ons kernel drivers bin
     252    AddFilesToContainer $(container) : haiku system add-ons kernel drivers bin
    253253        : $(targets) ;
    254254
    255255    # If the image shall only be updated, we don't add any symlinks.
    … …  
    278278    # AddDriverRegistrationToContainer <container> : <directory>
    279279    #   : <link target> : <link names> ] ;
    280280    #
    281     local directoryTokens = beos system add-ons kernel registration
     281    local directoryTokens = haiku system add-ons kernel registration
    282282        $(relativeDirectoryTokens) ;
    283283
    284284    # get the relative symlink path prefix
    … …  
    321321        local name = $(target:BS) ;
    322322        local linkTarget = [ FDirName /boot $(installDir:G=) $(name) ] ;
    323323
    324         AddSymlinkToContainer $(container) : beos system add-ons kernel boot
     324        AddSymlinkToContainer $(container) : haiku system add-ons kernel boot
    325325            : $(linkTarget) : $(name) ;
    326326    }
    327327}
    … …  
    688688        Always $(file) ;
    689689        MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
    690690        BuildHaikuImageUserGroupFile $(file) ;
    691         AddFilesToHaikuImage beos etc : $(file) ;
     691        AddFilesToHaikuImage haiku etc : $(file) ;
    692692    }
    693693
    694694    HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;

  • build/jam/FloppyBootImage

     
    3838
    3939
    4040# modules
    41 AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers
     41AddFilesToFloppyBootArchive haiku system add-ons kernel bus_managers
    4242    : $(BEOS_ADD_ONS_BUS_MANAGERS) ;
    43 AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart
     43AddFilesToFloppyBootArchive haiku system add-ons kernel busses agp_gart
    4444    : $(X86_ONLY)<agp_gart>intel ;
    45 AddFilesToFloppyBootArchive beos system add-ons kernel busses ide
     45AddFilesToFloppyBootArchive haiku system add-ons kernel busses ide
    4646    : ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ;
    47 AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ;
    48 AddFilesToFloppyBootArchive beos system add-ons kernel file_systems
     47AddFilesToFloppyBootArchive haiku system add-ons kernel console : vga_text ;
     48AddFilesToFloppyBootArchive haiku system add-ons kernel file_systems
    4949    : $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
    50 AddFilesToFloppyBootArchive beos system add-ons kernel generic
     50AddFilesToFloppyBootArchive haiku system add-ons kernel generic
    5151    : block_io fast_log ide_adapter locked_pool scsi_periph ;
    52 AddFilesToFloppyBootArchive beos system add-ons kernel partitioning_systems
     52AddFilesToFloppyBootArchive haiku system add-ons kernel partitioning_systems
    5353    : intel session ;
    54 AddFilesToFloppyBootArchive beos system add-ons kernel interrupt_controllers
     54AddFilesToFloppyBootArchive haiku system add-ons kernel interrupt_controllers
    5555    : $(PPC_ONLY)openpic ;
    5656
    5757if $(TARGET_ARCH) = x86 {
    58     AddFilesToFloppyBootArchive beos system add-ons kernel cpu : generic_x86 ;
     58    AddFilesToFloppyBootArchive haiku system add-ons kernel cpu : generic_x86 ;
    5959}
    6060
    6161# drivers
    … …  
    6767}
    6868
    6969# kernel
    70 AddFilesToFloppyBootArchive beos system : <revisioned>kernel_$(TARGET_ARCH) ;
     70AddFilesToFloppyBootArchive haiku system : <revisioned>kernel_$(TARGET_ARCH) ;
    7171
    7272# scripts and data files
    7373
    … …  
    7979
    8080if $(NET_BOOT) = 1 {
    8181# add-ons
    82 AddFilesToFloppyBootArchive beos system add-ons kernel network
     82AddFilesToFloppyBootArchive haiku system add-ons kernel network
    8383    : stack socket ;
    84 AddFilesToFloppyBootArchive beos system add-ons kernel network devices
     84AddFilesToFloppyBootArchive haiku system add-ons kernel network devices
    8585    : $(BEOS_NETWORK_DEVICES) ;
    86 AddFilesToFloppyBootArchive beos system add-ons kernel network datalink_protocols
     86AddFilesToFloppyBootArchive haiku system add-ons kernel network datalink_protocols
    8787    : $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
    88 AddFilesToFloppyBootArchive beos system add-ons kernel network ppp
     88AddFilesToFloppyBootArchive haiku system add-ons kernel network ppp
    8989    : $(BEOS_NETWORK_PPP) ;
    90 AddFilesToFloppyBootArchive beos system add-ons kernel network protocols
     90AddFilesToFloppyBootArchive haiku system add-ons kernel network protocols
    9191    : $(BEOS_NETWORK_PROTOCOLS) ;
    9292}
    9393

  • build/jam/HaikuImage

     
    140140
    141141
    142142# modules
    143 AddFilesToHaikuImage beos system add-ons kernel bus_managers
     143AddFilesToHaikuImage haiku system add-ons kernel bus_managers
    144144    : $(BEOS_ADD_ONS_BUS_MANAGERS) ;
    145 AddFilesToHaikuImage beos system add-ons kernel busses agp_gart
     145AddFilesToHaikuImage haiku system add-ons kernel busses agp_gart
    146146    : $(X86_ONLY)<agp_gart>intel ;
    147 AddFilesToHaikuImage beos system add-ons kernel busses ide
     147AddFilesToHaikuImage haiku system add-ons kernel busses ide
    148148    : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ;
    149 AddFilesToHaikuImage beos system add-ons kernel busses scsi
     149AddFilesToHaikuImage haiku system add-ons kernel busses scsi
    150150    : ahci ;
    151 AddFilesToHaikuImage beos system add-ons kernel busses usb
     151AddFilesToHaikuImage haiku system add-ons kernel busses usb
    152152    : <usb>uhci <usb>ehci ;
    153 AddFilesToHaikuImage beos system add-ons kernel console : vga_text ;
    154 AddFilesToHaikuImage beos system add-ons kernel debugger
     153AddFilesToHaikuImage haiku system add-ons kernel console : vga_text ;
     154AddFilesToHaikuImage haiku system add-ons kernel debugger
    155155    : <kdebug>hangman <kdebug>invalidate_on_exit ;
    156 AddFilesToHaikuImage beos system add-ons kernel file_systems
     156AddFilesToHaikuImage haiku system add-ons kernel file_systems
    157157    : $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
    158 AddFilesToHaikuImage beos system add-ons kernel generic
     158AddFilesToHaikuImage haiku system add-ons kernel generic
    159159    : block_io dpc fast_log ide_adapter locked_pool mpu401 scsi_periph ;
    160 AddFilesToHaikuImage beos system add-ons kernel partitioning_systems
     160AddFilesToHaikuImage haiku system add-ons kernel partitioning_systems
    161161    : intel session ;
    162 AddFilesToHaikuImage beos system add-ons kernel interrupt_controllers
     162AddFilesToHaikuImage haiku system add-ons kernel interrupt_controllers
    163163    : $(PPC_ONLY)openpic ;
    164164
    165165if $(TARGET_ARCH) = x86 {
    166     AddFilesToHaikuImage beos system add-ons kernel cpu : generic_x86 ;
     166    AddFilesToHaikuImage haiku system add-ons kernel cpu : generic_x86 ;
    167167}
    168168
    169169# drivers
    … …  
    183183#AddDriversToHaikuImage power       : $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
    184184
    185185# kernel
    186 AddFilesToHaikuImage beos system : <revisioned>kernel_$(TARGET_ARCH) ;
     186AddFilesToHaikuImage haiku system : <revisioned>kernel_$(TARGET_ARCH) ;
    187187
    188188# libs
    189 AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIBS) ;
     189AddFilesToHaikuImage haiku system lib : $(BEOS_SYSTEM_LIBS) ;
    190190
    191191# libnetwork.so replaces quite a few libraries
    192192BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES
    … …  
    194194
    195195local lib ;
    196196for lib in $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
    197     AddSymlinkToHaikuImage beos system lib : libnetwork.so : $(lib) ;
     197    AddSymlinkToHaikuImage haiku system lib : libnetwork.so : $(lib) ;
    198198}
    199199
    200200# libGL.so has GLUT built-in
    201201if $(TARGET_ARCH) = x86 {
    202     AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ;
     202    AddSymlinkToHaikuImage haiku system lib : $(X86_ONLY)libGL.so : libglut.so ;
    203203}
    204204
    205205# servers
    206 AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ;
     206AddFilesToHaikuImage haiku system servers : $(BEOS_SYSTEM_SERVERS) ;
    207207
    208208# apps
    209 AddFilesToHaikuImage beos system        : runtime_loader Deskbar Tracker ;
    210 AddFilesToHaikuImage beos bin           : $(BEOS_BIN) consoled ;
    211 AddFilesToHaikuImage beos apps          : $(BEOS_APPS) ;
    212 AddFilesToHaikuImage beos preferences   : $(BEOS_PREFERENCES) ;
    213 AddFilesToHaikuImage beos demos         : $(BEOS_DEMOS) ;
     209AddFilesToHaikuImage haiku system       : runtime_loader Deskbar Tracker ;
     210AddFilesToHaikuImage haiku bin          : $(BEOS_BIN) consoled ;
     211AddFilesToHaikuImage haiku apps         : $(BEOS_APPS) ;
     212AddFilesToHaikuImage haiku preferences  : $(BEOS_PREFERENCES) ;
     213AddFilesToHaikuImage haiku demos            : $(BEOS_DEMOS) ;
    214214
    215215SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
    216 AddFilesToHaikuImage beos bin           : which ;
     216AddFilesToHaikuImage haiku bin          : which ;
    217217
    218 AddSymlinkToHaikuImage beos bin : sh : bash ;
     218AddSymlinkToHaikuImage haiku bin : sh : bash ;
    219219
    220220AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
    221221
    … …  
    228228local app ;
    229229for app in $(DESKBAR_APPLICATIONS) {
    230230    AddSymlinkToHaikuImage home config be Applications
    231         : /boot/beos/apps/$(app) : $(app) ;
     231        : /boot/haiku/apps/$(app) : $(app) ;
    232232}
    233233
    234234# Deskbar Desktop Applets links
    … …  
    238238;
    239239for app in $(DESKBAR_DESKTOP_APPLETS) {
    240240    AddSymlinkToHaikuImage home config be Desktop\ Applets
    241         : /boot/beos/apps/$(app) : $(app) ;
     241        : /boot/haiku/apps/$(app) : $(app) ;
    242242}
    243243
    244244# Deskbar Preferences and Demos links
    245 AddSymlinkToHaikuImage home config be : /boot/beos/preferences : Preferences ;
    246 AddSymlinkToHaikuImage home config be : /boot/beos/demos : Demos ;
     245AddSymlinkToHaikuImage home config be : /boot/haiku/preferences : Preferences ;
     246AddSymlinkToHaikuImage home config be : /boot/haiku/demos : Demos ;
    247247
    248 AddSymlinkToHaikuImage beos bin : bzip2 : bunzip2 ;
    249 AddSymlinkToHaikuImage beos bin : less : more ;
    250 AddSymlinkToHaikuImage beos bin : gzip : gunzip ;
    251 AddSymlinkToHaikuImage beos bin : gzip : zcat ;
    252 AddSymlinkToHaikuImage beos bin : zdiff : zcmp ;
    253 AddSymlinkToHaikuImage beos bin : unzip : zipinfo ;
    254 AddSymlinkToHaikuImage beos bin : gawk : awk ;
    255 AddSymlinkToHaikuImage beos bin : grep : egrep ;
    256 AddSymlinkToHaikuImage beos bin : grep : fgrep ;
    257 AddSymlinkToHaikuImage beos bin : vim : vi ;
    258 AddSymlinkToHaikuImage beos bin : vim : view ;
     248AddSymlinkToHaikuImage haiku bin : bzip2 : bunzip2 ;
     249AddSymlinkToHaikuImage haiku bin : less : more ;
     250AddSymlinkToHaikuImage haiku bin : gzip : gunzip ;
     251AddSymlinkToHaikuImage haiku bin : gzip : zcat ;
     252AddSymlinkToHaikuImage haiku bin : zdiff : zcmp ;
     253AddSymlinkToHaikuImage haiku bin : unzip : zipinfo ;
     254AddSymlinkToHaikuImage haiku bin : gawk : awk ;
     255AddSymlinkToHaikuImage haiku bin : grep : egrep ;
     256AddSymlinkToHaikuImage haiku bin : grep : fgrep ;
     257AddSymlinkToHaikuImage haiku bin : vim : vi ;
     258AddSymlinkToHaikuImage haiku bin : vim : view ;
    259259
    260260
    261261# scripts and data files
    262262local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript InstallerInitScript
    263263    InstallerFinishScript ;
    264264SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
    265 AddFilesToHaikuImage beos system boot : $(bootScripts) ;
     265AddFilesToHaikuImage haiku system boot : $(bootScripts) ;
    266266
    267267local logoArtwork = "HAIKU logo - white on blue - big.png"
    268268    "HAIKU logo - white on blue - small.png" ;
    269269SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
    270 AddFilesToHaikuImage beos etc artwork : $(logoArtwork) ;
     270AddFilesToHaikuImage haiku etc artwork : $(logoArtwork) ;
    271271
    272272# Mail spell check dictionaries
    273273local spellFiles = words geekspeak ;
    274274spellFiles = $(spellFiles:G=spell) ;
    275275SEARCH on $(spellFiles)
    276276    = [ FDirName $(HAIKU_TOP) src apps mail ] ;
    277 AddFilesToHaikuImage beos etc word_dictionary : $(spellFiles) ;
     277AddFilesToHaikuImage haiku etc word_dictionary : $(spellFiles) ;
    278278
    279279local svgFiles = "lion.svg" ;
    280280SEARCH on $(svgFiles)
    281281    = [ FDirName $(HAIKU_TOP) src tests kits interface picture ] ;
    282 AddFilesToHaikuImage beos etc artwork : $(svgFiles) ;
     282AddFilesToHaikuImage haiku etc artwork : $(svgFiles) ;
    283283
    284284# TODO: Use data/etc/termcap or src/libs/termcap.src?
    285285local etcFiles = inputrc profile termcap teapot.data ;
    286286etcFiles = $(etcFiles:G=etc) ;
    287287SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
    288 AddFilesToHaikuImage beos etc : $(etcFiles) ;
     288AddFilesToHaikuImage haiku etc : $(etcFiles) ;
    289289
    290290local fortuneFiles =  Art Computers Education Food Fortunes Goedel Haiku
    291291    Humorists Kids Law "Linux cookies" Love Magic Medicine Miscellaneous
    … …  
    293293    Sports "Tech Support Excuses" ;
    294294fortuneFiles = $(fortuneFiles:G=etc!fortunes) ;
    295295SEARCH on $(fortuneFiles) = [ FDirName $(HAIKU_TOP) data etc fortunes ] ;
    296 AddFilesToHaikuImage beos etc fortunes : $(fortuneFiles) ;
     296AddFilesToHaikuImage haiku etc fortunes : $(fortuneFiles) ;
    297297
    298298local fontDir = [ FDirName $(HAIKU_TOP) data etc fonts ] ;
    299299local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ;
    300300local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
    301 AddFilesToHaikuImage beos etc fonts psfonts : $(psFonts) ;
    302 AddFilesToHaikuImage beos etc fonts ttfonts : $(ttFonts) ;
     301AddFilesToHaikuImage haiku etc fonts psfonts : $(psFonts) ;
     302AddFilesToHaikuImage haiku etc fonts ttfonts : $(ttFonts) ;
    303303
    304304local kanbeDir = [ FDirName $(HAIKU_TOP) data etc KanBe ] ;
    305305local kanbeDefault = [ Glob $(kanbeDir)/default : *.canna *.gz ] ;
    306306local kanbeDic = [ Glob $(kanbeDir)/dic : *.cbp ] ;
    307307local kanbeDicCanna = [ Glob $(kanbeDir)/dic/canna
    308308    : *.cld *.ctd *.cbd *.dir ] ;
    309 AddFilesToHaikuImage beos etc KanBe default : $(kanbeDefault) ;
    310 AddFilesToHaikuImage beos etc KanBe dic : $(kanbeDic) ;
    311 AddFilesToHaikuImage beos etc KanBe dic canna : $(kanbeDicCanna) ;
    312 AddDirectoryToHaikuImage beos etc KanBe dic group ;
    313 AddDirectoryToHaikuImage beos etc KanBe dic user ;
     309AddFilesToHaikuImage haiku etc KanBe default : $(kanbeDefault) ;
     310AddFilesToHaikuImage haiku etc KanBe dic : $(kanbeDic) ;
     311AddFilesToHaikuImage haiku etc KanBe dic canna : $(kanbeDicCanna) ;
     312AddDirectoryToHaikuImage haiku etc KanBe dic group ;
     313AddDirectoryToHaikuImage haiku etc KanBe dic user ;
    314314
    315315local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
    316316    : *.keymap ] ;
    317317keymapFiles = $(keymapFiles:BG=keymap) ;
    318 AddFilesToHaikuImage beos etc Keymap : $(keymapFiles) ;
    319 AddSymlinkToHaikuImage beos etc Keymap : Swedish : Finnish ;
    320 AddSymlinkToHaikuImage beos etc Keymap : Slovene : Croatian ;
    321 AddSymlinkToHaikuImage beos etc Keymap : US-International : Brazilian ;
     318AddFilesToHaikuImage haiku etc Keymap : $(keymapFiles) ;
     319AddSymlinkToHaikuImage haiku etc Keymap : Swedish : Finnish ;
     320AddSymlinkToHaikuImage haiku etc Keymap : Slovene : Croatian ;
     321AddSymlinkToHaikuImage haiku etc Keymap : US-International : Brazilian ;
    322322
    323323local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
    324324for timezone in $(timezones) {
    325325    local dir = [ on $(timezone) return $(RELATIVE_TIMEZONE_DIR) ] ;
    326     AddFilesToHaikuImage beos etc timezones $(dir) : $(timezone) ;
     326    AddFilesToHaikuImage haiku etc timezones $(dir) : $(timezone) ;
    327327}
    328328
    329329local driverSettingsFiles = <driver-settings>kernel ;
    … …  
    342342AddFilesToHaikuImage home config settings : <settings>fresh_install ;
    343343
    344344# boot loader
    345 AddFilesToHaikuImage beos system : zbeos ;
     345AddFilesToHaikuImage haiku system : zbeos ;
    346346
    347347# boot module links
    348348AddBootModuleSymlinksToHaikuImage
    … …  
    356356;
    357357
    358358# add-ons
    359 AddFilesToHaikuImage beos system add-ons accelerants
     359AddFilesToHaikuImage haiku system add-ons accelerants
    360360    : $(BEOS_ADD_ONS_ACCELERANTS) ;
    361 AddFilesToHaikuImage beos system add-ons opengl
     361AddFilesToHaikuImage haiku system add-ons opengl
    362362    : $(X86_ONLY)Mesa\ Software\ Renderer ;
    363 AddFilesToHaikuImage beos system add-ons Translators
     363AddFilesToHaikuImage haiku system add-ons Translators
    364364    : $(BEOS_ADD_ONS_TRANSLATORS) ;
    365 AddFilesToHaikuImage beos system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
    366 AddFilesToHaikuImage beos system add-ons mail_daemon outbound_protocols : SMTP ;
    367 AddFilesToHaikuImage beos system add-ons mail_daemon inbound_filters : Match\ Header Spam\ Filter R5\ Daemon\ Filter ;
    368 AddFilesToHaikuImage beos system add-ons mail_daemon outbound_filters : Fortune ;
    369 AddFilesToHaikuImage beos system add-ons mail_daemon system_filters : Inbox New\ Mail\ Notification Outbox Message\ Parser ;
    370 AddFilesToHaikuImage beos system add-ons media : $(BEOS_ADD_ONS_MEDIA) ;
    371 AddFilesToHaikuImage beos system add-ons media plugins
     365AddFilesToHaikuImage haiku system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
     366AddFilesToHaikuImage haiku system add-ons mail_daemon outbound_protocols : SMTP ;
     367AddFilesToHaikuImage haiku system add-ons mail_daemon inbound_filters : Match\ Header Spam\ Filter R5\ Daemon\ Filter ;
     368AddFilesToHaikuImage haiku system add-ons mail_daemon outbound_filters : Fortune ;
     369AddFilesToHaikuImage haiku system add-ons mail_daemon system_filters : Inbox New\ Mail\ Notification Outbox Message\ Parser ;
     370AddFilesToHaikuImage haiku system add-ons media : $(BEOS_ADD_ONS_MEDIA) ;
     371AddFilesToHaikuImage haiku system add-ons media plugins
    372372    : $(BEOS_ADD_ONS_MEDIA_PLUGINS) ;
    373 AddFilesToHaikuImage beos system add-ons Tracker : FileType-F ZipOMatic-Z ;
    374 AddSymlinkToHaikuImage beos system add-ons Tracker
    375     : /boot/beos/preferences/Backgrounds : Background-B ;
    376 AddFilesToHaikuImage beos system add-ons input_server devices
     373AddFilesToHaikuImage haiku system add-ons Tracker : FileType-F ZipOMatic-Z ;
     374AddSymlinkToHaikuImage haiku system add-ons Tracker
     375    : /boot/haiku/preferences/Backgrounds : Background-B ;
     376AddFilesToHaikuImage haiku system add-ons input_server devices
    377377    : <input>keyboard <input>mouse <input>wacom ;
    378 AddFilesToHaikuImage beos system add-ons input_server filters : screen_saver ;
    379 AddFilesToHaikuImage beos system add-ons kernel network : stack ;
    380 AddFilesToHaikuImage beos system add-ons kernel network devices
     378AddFilesToHaikuImage haiku system add-ons input_server filters : screen_saver ;
     379AddFilesToHaikuImage haiku system add-ons kernel network : stack ;
     380AddFilesToHaikuImage haiku system add-ons kernel network devices
    381381    : $(BEOS_NETWORK_DEVICES) ;
    382 AddFilesToHaikuImage beos system add-ons kernel network datalink_protocols
     382AddFilesToHaikuImage haiku system add-ons kernel network datalink_protocols
    383383    : $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
    384 AddFilesToHaikuImage beos system add-ons kernel network ppp
     384AddFilesToHaikuImage haiku system add-ons kernel network ppp
    385385    : $(BEOS_NETWORK_PPP) ;
    386 AddFilesToHaikuImage beos system add-ons kernel network protocols
     386AddFilesToHaikuImage haiku system add-ons kernel network protocols
    387387    : $(BEOS_NETWORK_PROTOCOLS) ;
    388 AddFilesToHaikuImage beos system add-ons Print : $(BEOS_ADD_ONS_PRINT) ;
    389 AddFilesToHaikuImage beos system add-ons Print transport
     388AddFilesToHaikuImage haiku system add-ons Print : $(BEOS_ADD_ONS_PRINT) ;
     389AddFilesToHaikuImage haiku system add-ons Print transport
    390390    : $(BEOS_ADD_ONS_PRINT_TRANSPORT) ;
    391 AddFilesToHaikuImage beos system add-ons Screen\ Savers
     391AddFilesToHaikuImage haiku system add-ons Screen\ Savers
    392392    : $(BEOS_ADD_ONS_SCREENSAVERS) ;
    393393
    394 AddFilesToHaikuImage beos system add-ons disk_systems
     394AddFilesToHaikuImage haiku system add-ons disk_systems
    395395    : <disk_system>intel <disk_system>bfs ;
    396396
    397397AddDirectoryToHaikuImage home config add-ons Tracker ;
    398398AddDirectoryToHaikuImage home config add-ons Screen\ Savers ;
    399399AddDirectoryToHaikuImage home config add-ons Translators ;
    400 AddDirectoryToHaikuImage beos etc synth ;
    401 AddDirectoryToHaikuImage beos system add-ons input_server methods ;
     400AddDirectoryToHaikuImage haiku etc synth ;
     401AddDirectoryToHaikuImage haiku system add-ons input_server methods ;
    402402
    403403# optional
    404 AddFilesToHaikuImage optional beos system add-ons input_server methods : canna ;
     404AddFilesToHaikuImage optional haiku system add-ons input_server methods : canna ;
    405405
    406406# printers
    407407AddDirectoryToHaikuImage home config settings printers Preview
    … …  
    410410      : home-config-settings-printers-save-as-pdf.rdef ;
    411411
    412412# licenses
    413 CopyDirectoryToHaikuImage beos etc
     413CopyDirectoryToHaikuImage haiku etc
    414414    : [ FDirName $(HAIKU_TOP) data etc licenses ]
    415415    : licenses : -x .svn ;
    416416

  • build/jam/UserBuildConfig.sample

     
    1919
    2020# Add symlink/file (timezone and keymap settings) to the image.
    2121#AddSymlinkToHaikuImage home config settings
    22 #   : /boot/beos/etc/timezones/Europe/Paris : timezone ;
     22#   : /boot/haiku/etc/timezones/Europe/Paris : timezone ;
    2323#AddFilesToHaikuImage home config settings : <keymap>US-International
    2424#   : Key_map ;
    2525

  • build/jam/PackageRules

     
    214214        unzip -od / install.zip
    215215        alert "Finished installing" "Thanks"
    216216    else
    217         if [ -e /boot/beos/apps/Terminal ]
     217        if [ -e /boot/haiku/apps/Terminal ]
    218218        then
    219             terminal=/boot/beos/apps/Terminal
     219            terminal=/boot/haiku/apps/Terminal
    220220        else
    221221            terminal=`query Terminal | head -1`
    222222        fi

  • build/jam/NetBootArchive

     
    3232
    3333
    3434# modules
    35 AddFilesToNetBootArchive beos system add-ons kernel bus_managers
     35AddFilesToNetBootArchive haiku system add-ons kernel bus_managers
    3636    : $(BEOS_ADD_ONS_BUS_MANAGERS) ;
    37 AddFilesToNetBootArchive beos system add-ons kernel busses agp_gart
     37AddFilesToNetBootArchive haiku system add-ons kernel busses agp_gart
    3838    : $(X86_ONLY)<agp_gart>intel ;
    39 AddFilesToNetBootArchive beos system add-ons kernel busses ide
     39AddFilesToNetBootArchive haiku system add-ons kernel busses ide
    4040    : ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
    41 AddFilesToNetBootArchive beos system add-ons kernel console : vga_text ;
    42 AddFilesToNetBootArchive beos system add-ons kernel file_systems
     41AddFilesToNetBootArchive haiku system add-ons kernel console : vga_text ;
     42AddFilesToNetBootArchive haiku system add-ons kernel file_systems
    4343    : $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
    44 AddFilesToNetBootArchive beos system add-ons kernel generic
     44AddFilesToNetBootArchive haiku system add-ons kernel generic
    4545    : block_io fast_log ide_adapter locked_pool scsi_periph ;
    46 AddFilesToNetBootArchive beos system add-ons kernel partitioning_systems
     46AddFilesToNetBootArchive haiku system add-ons kernel partitioning_systems
    4747    : intel session ;
    48 AddFilesToNetBootArchive beos system add-ons kernel interrupt_controllers
     48AddFilesToNetBootArchive haiku system add-ons kernel interrupt_controllers
    4949    : $(PPC_ONLY)openpic ;
    5050
    5151if $(TARGET_ARCH) = x86 {
    52     AddFilesToNetBootArchive beos system add-ons kernel cpu : generic_x86 ;
     52    AddFilesToNetBootArchive haiku system add-ons kernel cpu : generic_x86 ;
    5353}
    5454
    5555# drivers
    … …  
    5959AddDriversToNetBootArchive net          : $(BEOS_ADD_ONS_DRIVERS_NET) ;
    6060
    6161# kernel
    62 AddFilesToNetBootArchive beos system : <revisioned>kernel_$(TARGET_ARCH) ;
     62AddFilesToNetBootArchive haiku system : <revisioned>kernel_$(TARGET_ARCH) ;
    6363
    6464# scripts and data files
    6565
    … …  
    7070    : $(driverSettingsFiles) ;
    7171
    7272# add-ons
    73 AddFilesToNetBootArchive beos system add-ons kernel network
     73AddFilesToNetBootArchive haiku system add-ons kernel network
    7474    : stack ;
    75 AddFilesToNetBootArchive beos system add-ons kernel network devices
     75AddFilesToNetBootArchive haiku system add-ons kernel network devices
    7676    : $(BEOS_NETWORK_DEVICES) ;
    77 AddFilesToNetBootArchive beos system add-ons kernel network datalink_protocols
     77AddFilesToNetBootArchive haiku system add-ons kernel network datalink_protocols
    7878    : $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
    79 AddFilesToNetBootArchive beos system add-ons kernel network ppp
     79AddFilesToNetBootArchive haiku system add-ons kernel network ppp
    8080    : $(BEOS_NETWORK_PPP) ;
    81 AddFilesToNetBootArchive beos system add-ons kernel network protocols
     81AddFilesToNetBootArchive haiku system add-ons kernel network protocols
    8282    : $(BEOS_NETWORK_PROTOCOLS) ;
    8383
    8484# boot module links

  • build/scripts/build_haiku_image

     
    198198        $rmAttrs -f $copyrightAttrs
    199199        touch $copyrightAttrs
    200200        $addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs
    201         $copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}beos/apps/AboutSystem
     201        $copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}haiku/apps/AboutSystem
    202202    fi
    203203fi
    204204

  • data/system/boot/SetupEnvironment

     
    4444
    4545if [ "$SAFEMODE" != "yes" ]
    4646then
    47     export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
    48     export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/beos/system/lib"
    49     export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/beos/system/add-ons"
     47    export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/haiku/apps:/boot/haiku/preferences:$BETOOLS
     48    export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/haiku/system/lib"
     49    export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/haiku/system/add-ons"
    5050else
    51     export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
    52     export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/beos/system/lib"
    53     export ADDON_PATH="%A/add-ons:/boot/beos/system/add-ons"
     51    export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/haiku/apps:/boot/haiku/preferences:$BETOOLS
     52    export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/haiku/system/lib"
     53    export ADDON_PATH="%A/add-ons:/boot/haiku/system/add-ons"
    5454fi
    5555
    5656# media kit

  • data/system/boot/Bootscript

     
    5454exec >/dev/null 2>&1
    5555
    5656# Standard locations of boot files
    57 SCRIPTS=beos/system/boot
    58 SERVERS=beos/system/servers
     57SCRIPTS=haiku/system/boot
     58SERVERS=haiku/system/servers
    5959
    6060# Set up the environment
    6161
    … …  
    7171fi
    7272
    7373# Sets timezone etc.
    74 runprog beos/bin/clockconfig
     74runprog haiku/bin/clockconfig
    7575
    7676# Launch servers
    7777
    … …  
    9999# Launch Terminal or consoled depending on $SAFEMODE
    100100if [ "$SAFEMODE" != "yes" ]; then
    101101    if [ -e /etc/users ]; then
    102         launch beos/system/Login
     102        launch haiku/system/Login
    103103        # nothing more
    104104    else
    105         launch beos/system/Tracker
    106         launch beos/system/Deskbar
     105        launch haiku/system/Tracker
     106        launch haiku/system/Deskbar
    107107
    108108        # install ProcessController in the deskbar
    109         (sleep 7; /boot/beos/apps/ProcessController -deskbar) &
     109        (sleep 7; /boot/haiku/apps/ProcessController -deskbar) &
    110110    fi
    111     launch beos/apps/Terminal
     111    launch haiku/apps/Terminal
    112112else
    113     launch beos/bin/consoled
     113    launch haiku/bin/consoled
    114114fi
    115115
    116116if [ "$SAFEMODE" != "yes" ]; then
    … …  
    129129fi
    130130
    131131# Check for daily saving time
    132 launch beos/bin/dstcheck
     132launch haiku/bin/dstcheck
    133133
    134134if [ "$SAFEMODE" != "yes" ]; then
    135135    # Start user boot script
    … …  
    141141# Check for fresh install and register all bundled app mimetypes
    142142FRESH_INSTALL_INDICATOR_FILE=$HOME/config/settings/fresh_install
    143143if [ -e $FRESH_INSTALL_INDICATOR_FILE ]; then
    144 #   mimeset -all -f /boot/beos/apps
    145 #   mimeset -all -f /boot/beos/preferences
    146 #   mimeset -all -f /boot/beos/system/servers
     144#   mimeset -all -f /boot/haiku/apps
     145#   mimeset -all -f /boot/haiku/preferences
     146#   mimeset -all -f /boot/haiku/system/servers
    147147#   mimeset -all -f /boot/apps
    148148    rm $FRESH_INSTALL_INDICATOR_FILE
    149149fi

  • data/system/boot/Bootscript.cd

     
    7272
    7373# Launch Terminal or consoled depending on $SAFEMODE
    7474if [ "$SAFEMODE" != "yes" ]; then
    75     if [ -x /boot/beos/apps/Installer ]; then
    76         /boot/beos/apps/Installer
    77         #/boot/beos/apps/Terminal -x /boot/beos/apps/Installer
     75    if [ -x /boot/haiku/apps/Installer ]; then
     76        /boot/haiku/apps/Installer
     77        #/boot/haiku/apps/Terminal -x /boot/haiku/apps/Installer
    7878    else
    79         /boot/beos/apps/Terminal
     79        /boot/haiku/apps/Terminal
    8080    fi
    81     #launch beos/apps/Terminal
     81    #launch haiku/apps/Terminal
    8282else
    83     launch beos/bin/consoled
     83    launch haiku/bin/consoled
    8484fi
    8585
    8686# sync disks

  • src/preferences/network_old/NetworkWindow.cpp

     
    346346            argc  = 1;
    347347            arg_v = (const char **)malloc(sizeof(char *) * (argc + 1));
    348348           
    349             arg_v[0] = strdup("/boot/beos/system/servers/net_server");
     349            arg_v[0] = strdup("/boot/haiku/system/servers/net_server");
    350350            arg_v[1] = NULL;
    351351           
    352352            thread = load_image(argc,arg_v,(const char **)environ);

  • src/preferences/time/ZoneView.cpp

     
    360360        tzLink.SetTo(path.Path(), true);
    361361
    362362        if (tzLink.InitCheck() != B_OK) {// link is broken
    363             tzLink.SetTo("/boot/beos/etc/timezones/Pacific/fiji");
     363            tzLink.SetTo("/boot/haiku/etc/timezones/Pacific/fiji");
    364364            // do something like set to a default GMT???
    365365        }
    366366    } else {
    367367        // set tzlink to a default
    368         tzLink.SetTo("/boot/beos/etc/timezones/EST");
     368        tzLink.SetTo("/boot/haiku/etc/timezones/EST");
    369369    }
    370370#endif
    371371    // we need something in the current zone

  • src/preferences/sounds/HWindow.cpp

     
    330330        menu->AddItem(new BMenuItem(path.Leaf(), msg), 0);
    331331    }
    332332   
    333     BPath path("/boot/beos/etc/sounds");
     333    BPath path("/boot/haiku/etc/sounds");
    334334    status_t err = B_OK;
    335335    BDirectory dir( path.Path() );
    336336    BEntry entry;

  • src/tests/add-ons/kernel/kernelland_emu.cpp

     
    3232//#define TRACE(x) printf x
    3333
    3434static const char *gModuleDirs[] = {
    35     "distro/x86.R1/beos/system/add-ons/userland",
     35    "distro/x86.R1/haiku/system/add-ons/userland",
    3636    NULL
    3737};
    3838

  • src/tests/servers/registrar/run_haiku_registrar.cpp

     
    2626    team_info teamInfo;
    2727    int32 cookie = 0;
    2828    while (get_next_team_info(&cookie, &teamInfo) == B_OK) {
    29         if (!strncmp(teamInfo.args, "/boot/beos/", 11)) {
     29        if (!strncmp(teamInfo.args, "/boot/haiku/", 11)) {
    3030            // this is a system component and not worth to investigate
    3131            continue;
    3232        }

  • src/tests/kits/app/bmessage/MessageRefItemTest.h

     
    122122    static entry_ref Test1()
    123123    {
    124124        entry_ref ref;
    125         get_ref_for_path("/boot/beos/apps/camera", &ref);
     125        get_ref_for_path("/boot/haiku/apps/camera", &ref);
    126126        return ref;
    127127    }
    128128    static entry_ref Test2()

  • src/tests/kits/interface/WidthBufferTest.cpp

     
    6464int32
    6565App::TesterFunc()
    6666{
    67     FILE *file = fopen("/boot/beos/etc/termcap", "r");
     67    FILE *file = fopen("/boot/haiku/etc/termcap", "r");
    6868    if (file != NULL) {
    6969        char buffer[512];
    7070        while (fgets(buffer, 512, file)) {

  • src/tests/kits/interface/picture/PictureTest.cpp

     
    77
    88#include "SVGViewView.h"
    99
    10 class Svg2PictureWindow : public BWindow {
    11 public:
    12     Svg2PictureWindow(BRect frame, const char *filename)
    13         :   BWindow(frame, "Svg2Picture", B_TITLED_WINDOW, 0) {
    14        
    15             BView *view = new Svg2PictureView(Bounds(), filename);
    16             AddChild(view);
    17     }
     10class Svg2PictureWindow : public BWindow {
     11public:
     12    Svg2PictureWindow(BRect frame, const char *filename)
     13        :   BWindow(frame, "Svg2Picture", B_TITLED_WINDOW, 0) {
     14       
     15            BView *view = new Svg2PictureView(Bounds(), filename);
     16            AddChild(view);
     17    }
    1818};
    1919
    2020class OriginalView : public BBox {
    … …  
    154154                "BPicture test", B_TITLED_WINDOW,
    155155                B_NOT_RESIZABLE|B_NOT_ZOOMABLE|B_QUIT_ON_WINDOW_CLOSE);
    156156   
    157     BWindow *svgWindow = new Svg2PictureWindow(BRect(300, 300, 600, 600), "/boot/beos/etc/artwork/lion.svg");
     157    BWindow *svgWindow = new Svg2PictureWindow(BRect(300, 300, 600, 600), "/boot/haiku/etc/artwork/lion.svg");
    158158   
    159159   
    160160    BRect rect(pictureWindow->Bounds());

  • src/tests/kits/midi/midi_player_replacement/MidiPlayerView.h

     
    5454//--------------
    5555//--------------
    5656//--------------
    57 #define BEOS_SYNTH_DIRECTORY "/boot/beos/etc/synth/"
     57#define BEOS_SYNTH_DIRECTORY "/boot/haiku/etc/synth/"
    5858//--------------
    5959
    6060//----------------------------------------------------------

  • src/tests/kits/storage/FindDirectoryTest.cpp

     
    180180        }
    181181        // BeOS directories.  These are mostly accessed read-only.
    182182        case B_BEOS_DIRECTORY:
    183             error = path.SetTo("/boot/beos");
     183            error = path.SetTo("/boot/haiku");
    184184            break;
    185185        case B_BEOS_SYSTEM_DIRECTORY:
    186             error = path.SetTo("/boot/beos/system");
     186            error = path.SetTo("/boot/haiku/system");
    187187            break;
    188188        case B_BEOS_ADDONS_DIRECTORY:
    189             error = path.SetTo("/boot/beos/system/add-ons");
     189            error = path.SetTo("/boot/haiku/system/add-ons");
    190190            break;
    191191        case B_BEOS_BOOT_DIRECTORY:
    192             error = path.SetTo("/boot/beos/system/boot");
     192            error = path.SetTo("/boot/haiku/system/boot");
    193193            break;
    194194        case B_BEOS_FONTS_DIRECTORY:
    195             error = path.SetTo("/boot/beos/etc/fonts");
     195            error = path.SetTo("/boot/haiku/etc/fonts");
    196196            break;
    197197        case B_BEOS_LIB_DIRECTORY:
    198             error = path.SetTo("/boot/beos/system/lib");
     198            error = path.SetTo("/boot/haiku/system/lib");
    199199            break;
    200200        case B_BEOS_SERVERS_DIRECTORY:
    201             error = path.SetTo("/boot/beos/system/servers");
     201            error = path.SetTo("/boot/haiku/system/servers");
    202202            break;
    203203        case B_BEOS_APPS_DIRECTORY:
    204             error = path.SetTo("/boot/beos/apps");
     204            error = path.SetTo("/boot/haiku/apps");
    205205            break;
    206206        case B_BEOS_BIN_DIRECTORY:
    207             error = path.SetTo("/boot/beos/bin");
     207            error = path.SetTo("/boot/haiku/bin");
    208208            break;
    209209        case B_BEOS_ETC_DIRECTORY:
    210             error = path.SetTo("/boot/beos/etc");
     210            error = path.SetTo("/boot/haiku/etc");
    211211            break;
    212212        case B_BEOS_DOCUMENTATION_DIRECTORY:
    213             error = path.SetTo("/boot/beos/documentation");
     213            error = path.SetTo("/boot/haiku/documentation");
    214214            break;
    215215        case B_BEOS_PREFERENCES_DIRECTORY:
    216             error = path.SetTo("/boot/beos/preferences");
     216            error = path.SetTo("/boot/haiku/preferences");
    217217            break;
    218218        case B_BEOS_TRANSLATORS_DIRECTORY:
    219             error = path.SetTo("/boot/beos/system/add-ons/Translators");
     219            error = path.SetTo("/boot/haiku/system/add-ons/Translators");
    220220            break;
    221221        case B_BEOS_MEDIA_NODES_DIRECTORY:
    222             error = path.SetTo("/boot/beos/system/add-ons/media");
     222            error = path.SetTo("/boot/haiku/system/add-ons/media");
    223223            break;
    224224        case B_BEOS_SOUNDS_DIRECTORY:
    225             error = path.SetTo("/boot/beos/etc/sounds");
     225            error = path.SetTo("/boot/haiku/etc/sounds");
    226226            break;
    227227        // Common directories, shared among all users.
    228228        case B_COMMON_DIRECTORY:

  • src/tests/kits/storage/MimeTypeTest.cpp

     
    6666static const char *applicationSupertype = "application";
    6767
    6868// Application Paths
    69 static const char *testApp              = "/boot/beos/apps/SoundRecorder";
    70 static const char *testApp2             = "/boot/beos/apps/CDPlayer";
     69static const char *testApp              = "/boot/haiku/apps/SoundRecorder";
     70static const char *testApp2             = "/boot/haiku/apps/CDPlayer";
    7171static const char *fakeTestApp          = "/__this_isn't_likely_to_exist__";
    7272
    7373// BMessage field names
    … …  
    32363236                            B_MINI_ICON) == B_OK);
    32373237    // app hint
    32383238    entry_ref appHintRef;
    3239     CHK(get_ref_for_path("/boot/beos/apps/StyledEdit", &appHintRef) == B_OK);
     3239    CHK(get_ref_for_path("/boot/haiku/apps/StyledEdit", &appHintRef) == B_OK);
    32403240    CHK(type.SetAppHint(&appHintRef) == B_OK);
    32413241    // sniffer rule
    32423242    const char *snifferRule = "0.5 [0:0] ('ARGH')";
    … …  
    33343334                            B_MINI_ICON) == B_OK);
    33353335    // app hint
    33363336    entry_ref appHintRef2;
    3337     CHK(get_ref_for_path("/boot/beos/apps/NetPositive", &appHintRef2) == B_OK);
     3337    CHK(get_ref_for_path("/boot/haiku/apps/NetPositive", &appHintRef2) == B_OK);
    33383338    CHK(type.SetAppHint(&appHintRef2) == B_OK);
    33393339    // sniffer rule
    33403340    const char *snifferRule2 = "0.7 [0:5] ('YEAH!')";

  • src/tests/kits/storage/DirectoryTest.cpp

     
    619619    CPPUNIT_ASSERT( dir.IsRootDirectory() == true );
    620620    //
    621621    NextSubTest();
    622     CPPUNIT_ASSERT( dir.SetTo("/boot/beos") == B_OK );
     622    CPPUNIT_ASSERT( dir.SetTo("/boot/haiku") == B_OK );
    623623    CPPUNIT_ASSERT( dir.InitCheck() == B_OK );
    624624    CPPUNIT_ASSERT( dir.IsRootDirectory() == false );
    625625    //

  • src/tests/kits/translation/TranslationUtilsTest.cpp

     
    357357    BTranslatorRoster *proster = new BTranslatorRoster();
    358358    CPPUNIT_ASSERT(proster);
    359359    CPPUNIT_ASSERT(proster->AddTranslators(
    360         "/boot/beos/system/add-ons/Translators/PPMTranslator") == B_OK);
     360        "/boot/haiku/system/add-ons/Translators/PPMTranslator") == B_OK);
    361361    CPPUNIT_ASSERT(BTranslationUtils::AddTranslationItems(pmenu,
    362362        B_TRANSLATOR_BITMAP, NULL, NULL, NULL, proster) == B_OK);
    363363    CPPUNIT_ASSERT(pmenu->CountItems() == 1);

  • src/apps/processcontroller/PCWorld.cpp

     
    150150            } while (be_roster->IsRunning(kTrackerSig) && k-- > 0);
    151151        }
    152152        remove("/boot/home/config/settings/Tracker/tracker_shelf");
    153         launch(kTrackerSig, "/boot/beos/system/Tracker");
     153        launch(kTrackerSig, "/boot/haiku/system/Tracker");
    154154    } else if (argc == 2 && strcmp(argv[1], "-deskbar") == 0) {
    155155        BDeskbar deskbar;
    156156        if (!gInDeskbar && !deskbar.HasItem(kDeskbarItemName))

  • src/apps/processcontroller/ProcessController.cpp

     
    311311            break;
    312312
    313313        case 'Trac':
    314             launch(kTrackerSig, "/boot/beos/system/Tracker");
     314            launch(kTrackerSig, "/boot/haiku/system/Tracker");
    315315            break;
    316316
    317317        case 'Dbar':
    318             launch(kDeskbarSig, "/boot/beos/system/Deskbar");
     318            launch(kDeskbarSig, "/boot/haiku/system/Deskbar");
    319319            break;
    320320       
    321321        case 'Term':
    322             launch(kTerminalSig, "/boot/beos/apps/Terminal");
     322            launch(kTerminalSig, "/boot/haiku/apps/Terminal");
    323323            break;
    324324
    325325        case 'AlDb':
    326326        {
    327327            if (!be_roster->IsRunning(kDeskbarSig))
    328                 launch(kDeskbarSig, "/boot/beos/system/Deskbar");
     328                launch(kDeskbarSig, "/boot/haiku/system/Deskbar");
    329329            BDeskbar deskbar;
    330330            if (gInDeskbar || deskbar.HasItem (kDeskbarItemName))
    331331                deskbar.RemoveItem (kDeskbarItemName);

  • src/apps/mediaconverter/MediaConverterWindow.cpp

     
    343343
    344344    BString string, string2;
    345345
    346     BEntry entry("/boot/beos/apps/MediaPlayer", true);
     346    BEntry entry("/boot/haiku/apps/MediaPlayer", true);
    347347    char buffer[40];
    348348    char buffer2[B_PATH_NAME_LENGTH];
    349349    char *argv[3];

  • src/apps/installer/FSUtils.cpp

     
    467467    bool requireOverride = true;
    468468
    469469    if (DirectoryMatches(entry, B_BEOS_DIRECTORY))
    470         warning = "If you %s the beos folder, you won't be able to "
     470        warning = "If you %s the haiku folder, you won't be able to "
    471471            "boot " OS_NAME "! Are you sure you want to do this? To %s the folder "
    472472            "anyway, hold down the Shift key and click \"Do it\".";
    473473    else if (DirectoryMatchesOrContains(entry, B_BEOS_SYSTEM_DIRECTORY))
    … …  
    33123312
    33133313WellKnowEntryList::WellKnowEntryList()
    33143314{
    3315     AddOne(B_BEOS_DIRECTORY, "beos");
     3315    AddOne(B_BEOS_DIRECTORY, "haiku");
    33163316    AddOne((directory_which)B_BOOT_DISK, "/boot", "boot");
    33173317    AddOne(B_USER_DIRECTORY, "home");
    33183318    AddOne(B_BEOS_SYSTEM_DIRECTORY, "system");

  • src/system/kernel/device_manager/device_manager_private.h

     
    2323
    2424// driver registration directories
    2525#define PNP_DIR
    26 #define SYSTEM_DRIVER_REGISTRATION "/boot/beos/system/add-ons/kernel/"PNP_DIR"registration/"
     26#define SYSTEM_DRIVER_REGISTRATION "/boot/haiku/system/add-ons/kernel/"PNP_DIR"registration/"
    2727#define COMMON_DRIVER_REGISTRATION "/boot/home/config/add-ons/kernel/"PNP_DIR"registration/"
    2828
    2929// info about ID generator

  • src/system/kernel/module.cpp

     
    958958                    image->name)) != NULL) {
    959959            // even if strlcpy() is used here, it's by no means safe
    960960            // against buffer overflows
    961             size_t length = strlcpy(path, "/boot/beos/system/add-ons/kernel/",
     961            size_t length = strlcpy(path, "/boot/haiku/system/add-ons/kernel/",
    962962                sizeof(path));
    963963            strlcpy(path + length, name, strlen(image->name)
    964964                + 1 + (suffix - name));

  • src/system/kernel/fs/devfs.cpp

     
    493493get_priority(const char *path)
    494494{
    495495    // TODO: use find_directory()
    496     const char *kPaths[] = {"/boot/beos", "/boot/common", "/boot/home", NULL};
     496    const char *kPaths[] = {"/boot/haiku", "/boot/common", "/boot/home", NULL};
    497497
    498498    for (int32 i = 0; kPaths[i] != NULL; i++) {
    499499        if (!strncmp(kPaths[i], path, strlen(kPaths[i])))
    … …  
    28392839        if (!image->is_module && image->id >= 0) {
    28402840            // fake an absolute path
    28412841            char path[B_PATH_NAME_LENGTH];
    2842             strlcpy(path, "/boot/beos/system/add-ons/kernel/", sizeof(path));
     2842            strlcpy(path, "/boot/haiku/system/add-ons/kernel/", sizeof(path));
    28432843            strlcat(path, image->name, sizeof(path));
    28442844
    28452845            // try to add the driver

  • src/system/kernel/fs/vfs_boot.cpp

     
    4444    const char *path;
    4545    const char *target;
    4646} sPredefinedLinks[] = {
    47     {"/system", "/boot/beos/system"},
    48     {"/bin", "/boot/beos/bin"},
    49     {"/etc", "/boot/beos/etc"},
     47    {"/system", "/boot/haiku/system"},
     48    {"/bin", "/boot/haiku/bin"},
     49    {"/etc", "/boot/haiku/etc"},
    5050    {"/var", "/boot/var"},
    5151    {"/tmp", "/boot/var/tmp"},
    5252    {NULL}

  • src/system/kernel/vm/vm_tests.c

     
    198198//      char *blah;
    199199        int fd;
    200200
    201         fd = _kern_open("/boot/beos/system/kernel_" OBOS_ARCH, 0);
     201        fd = _kern_open("/boot/haiku/system/kernel_" OBOS_ARCH, 0);
    202202
    203203        rid = vm_map_file(vm_kernel_address_space_id(), "mmap_test", &ptr, B_ANY_KERNEL_ADDRESS,
    204204            B_PAGE_SIZE, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, REGION_NO_PRIVATE_MAP, "/boot/kernel", 0);

  • src/system/kernel/main.c

     
    288288
    289289    // start the init process
    290290    {
    291         const char *args[] = {"/bin/sh", "/boot/beos/system/boot/Bootscript",
     291        const char *args[] = {"/bin/sh", "/boot/haiku/system/boot/Bootscript",
    292292            NULL};
    293293        int32 argc = 2;
    294294        thread_id thread;

  • src/system/kernel/team.cpp

     
    11171117        // the arguments are already on the user stack, we no longer need them in this form
    11181118
    11191119    // ToDo: don't use fixed paths!
    1120     err = elf_load_user_image("/boot/beos/system/runtime_loader", team, 0, &entry);
     1120    err = elf_load_user_image("/boot/haiku/system/runtime_loader", team, 0, &entry);
    11211121    if (err < B_OK) {
    11221122        // Luckily, we don't have to clean up the mess we created - that's
    11231123        // done for us by the normal team deletion process

  • src/system/boot/platform/bios_ia32/stage1.S

     
    55; partitions. The offset of the partition in 512 byte blocks must be written at
    66; position PARTITION_OFFSET_OFFSET (32 bit little endian; makebootable does
    77; that) or otherwise the code can't find the partition.
    8 ; The partition must be a BFS formatted. The file "beos/system/zbeos"
     8; The partition must be a BFS formatted. The file "haiku/system/zbeos"
    99; (the stage 2 boot loader) loaded into memory at 0x1000:0x0000 (linear address
    1010; 0x10000) and entered at 0x:1000:0x0200 with parameters eax - partition offset
    1111; in 512 byte blocks and dl - BIOS ID of the boot drive.
    … …  
    639639
    640640; the path to the boot loader
    641641kPathComponents:
    642 pathComponent               "beos"
     642pathComponent               "haiku"
    643643pathComponent               "system"
    644644pathComponent               "zbeos"
    645645                            db  0

  • src/system/boot/loader/loader.cpp 

    Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
     
    2424#endif
    2525
    2626#define KERNEL_IMAGE    "kernel_" BOOT_ARCH
    27 #define KERNEL_PATH     "beos/system/" KERNEL_IMAGE
     27#define KERNEL_PATH     "haiku/system/" KERNEL_IMAGE
    2828
    2929
    3030static const char *sPaths[] = {
    31     "beos/system/add-ons/kernel",
     31    "haiku/system/add-ons/kernel",
    3232    "home/config/add-ons/kernel",
    3333    NULL
    3434};

  • src/system/runtime_loader/runtime_loader.c

     
    6565                ":/bin"
    6666                ":/boot/apps"
    6767                ":/boot/preferences"
    68                 ":/boot/beos/apps"
    69                 ":/boot/beos/preferences"
     68                ":/boot/haiku/apps"
     69                ":/boot/haiku/preferences"
    7070                ":/boot/develop/tools/gnupro/bin";
    7171
    7272        case B_LIBRARY_IMAGE:
    7373            return "%A/lib"
    7474                ":/boot/home/config/lib"
    7575                    // TODO: Remove!
    76                 ":/boot/common/lib:/boot/beos/system/lib";
     76                ":/boot/common/lib:/boot/haiku/system/lib";
    7777
    7878        case B_ADD_ON_IMAGE:
    7979            return "%A/add-ons"
    8080                ":/boot/home/config/add-ons"
    8181                    // TODO: Remove!
    8282                ":/boot/common/add-ons"
    83                 ":/boot/beos/system/add-ons";
     83                ":/boot/haiku/system/add-ons";
    8484
    8585        default:
    8686            return NULL;

  • src/system/libroot/os/find_directory.c

     
    3030
    3131/* Haiku system directories */
    3232
    33 /* os root dir; just stick to 'beos' for now */
    34 #define OS "beos"
    35 //#define OS "haiku" // :)
    36 //#define OS "os"
     33#define OS "haiku"
    3734
    3835static const char *os_dirs[] = {
    3936    OS,                                     // B_BEOS_DIRECTORY

  • src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp

     
    2727
    2828    BRect rect(5,4,250,25);
    2929    rect.bottom = rect.top - 2 + itemHeight;
    30     BMailFileConfigView *fview = new BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune File:","予言ファイル:"),"fortune_file",false,"/boot/beos/etc/fortunes/default",B_FILE_NODE);
     30    BMailFileConfigView *fview = new BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune File:","予言ファイル:"),"fortune_file",false,"/boot/haiku/etc/fortunes/default",B_FILE_NODE);
    3131    AddChild(fview);
    3232   
    3333    rect.top = rect.bottom + 8;
    … …  
    4444{
    4545    BString path = archive->FindString("fortune_file");
    4646    if (path == B_EMPTY_STRING)
    47         path = "/boot/beos/etc/fortunes/default";
     47        path = "/boot/haiku/etc/fortunes/default";
    4848   
    4949    if (BMailFileConfigView *control = (BMailFileConfigView *)FindView("fortune_file"))
    5050        control->SetTo(archive,NULL);

  • src/add-ons/print/drivers/pdf/source/PrinterSetupWindow.cpp

     
    140140    BDirectory  Folder;
    141141    BEntry      entry;
    142142   
    143     Folder.SetTo ("/boot/beos/etc/bubblejet");
     143    Folder.SetTo ("/boot/haiku/etc/bubblejet");
    144144    if (Folder.InitCheck() != B_OK)
    145145        return;
    146146       

  • src/bin/make/config.h

     
    22/* config.h.  Generated by configure.  */
    33/* config.h.in.  Generated from configure.in by autoheader.  */
    44
    5 #define LOCALEDIR   "/boot/beos/etc/local/"
     5#define LOCALEDIR   "/boot/haiku/etc/local/"
    66#define LIBDIR      "/boot/develop/lib/"
    77#define INCLUDEDIR  "/boot/develop/headers/"
    88

  • src/bin/network/wget/src/config.h

     
    251251#define HAVE_WORKING_FNMATCH_H 1
    252252
    253253/* Define to be the name of the operating system. */
    254 #define OS_TYPE "beos"
     254#define OS_TYPE "haiku"
    255255
    256256/* Define to the address where bug reports for this package should be sent. */
    257257#define PACKAGE_BUGREPORT ""

  • src/bin/desklink/desklink.cpp

     
    165165        // launch the media player app
    166166        if (LaunchBySig("application/x-vnd.Haiku-MediaPlayer") == B_OK
    167167            || LaunchBySig("application/x-vnd.Be.MediaPlayer") == B_OK
    168             || LaunchByPath("/boot/beos/apps/MediaPlayer") == B_OK)
     168            || LaunchByPath("/boot/haiku/apps/MediaPlayer") == B_OK)
    169169            break;
    170170
    171171        (new BAlert("desklink", "Couldn't launch MediaPlayer", "OK"))->Go();

  • src/libs/ncurses/include/ncurses_cfg.h

     
    4646#ifndef NC_CONFIG_H
    4747#define NC_CONFIG_H
    4848
    49 #define SYSTEM_NAME "beos"
     49#define SYSTEM_NAME "haiku"
    5050#define CC_HAS_PROTOS 1
    5151#define HAVE_LONG_FILE_NAMES 1
    5252#define MIXEDCASE_FILENAMES 1

  • src/servers/app/FontManager.cpp

     
    318318    // TODO: load them for real, and use these as a fallback
    319319
    320320    _AddDefaultMapping("Bitstream Vera Sans", "Roman",
    321         "/boot/beos/etc/fonts/ttfonts/Vera.ttf");
     321        "/boot/haiku/etc/fonts/ttfonts/Vera.ttf");
    322322    _AddDefaultMapping("Bitstream Vera Sans", "Bold",
    323         "/boot/beos/etc/fonts/ttfonts/VeraBd.ttf");
     323        "/boot/haiku/etc/fonts/ttfonts/VeraBd.ttf");
    324324    _AddDefaultMapping("Bitstream Vera Sans Mono", "Roman",
    325         "/boot/beos/etc/fonts/ttfonts/VeraMono.ttf");
     325        "/boot/haiku/etc/fonts/ttfonts/VeraMono.ttf");
    326326
    327327    return false;
    328328}

  • src/servers/debug/DebugServer.cpp

     
    4242
    4343// paths to the apps used for debugging
    4444static const char *kConsoledPath    = "/bin/consoled";
    45 static const char *kTerminalPath    = "/boot/beos/apps/Terminal";
     45static const char *kTerminalPath    = "/boot/haiku/apps/Terminal";
    4646static const char *kGDBPath         = "/bin/gdb";
    4747
    4848

  • src/servers/registrar/TRoster.cpp

     
    7878
    7979//! Applications living in this tree are considered "vital system apps".
    8080static const char *const kVitalSystemAppPathPrefix
    81     = "/boot/beos/system/servers";
     81    = "/boot/haiku/system/servers";
    8282
    8383//! Applications living in this tree are considered "system apps".
    84 static const char *const kSystemAppPathPrefix = "/boot/beos/system";
     84static const char *const kSystemAppPathPrefix = "/boot/haiku/system";
    8585
    8686// get_default_roster_settings_file
    8787/*! \brief Returns the path to the default roster settings.

  • src/kits/media/DormantNodeManager.cpp

     
    3333 * It handles loading/unloading of dormant nodes.
    3434 *
    3535 * Dormant media nodes can be instantiated on demand. The reside on harddisk in the
    36  * directories /boot/beos/system/add-ons/media and /boot/home/config/add-ons/media
     36 * directories /boot/haiku/system/add-ons/media and /boot/home/config/add-ons/media
    3737 * Multiple media nodes can be included in one file, they can be accessed using the
    3838 * BMediaAddOn that each file implements.
    3939 * The BMediaAddOn allows getting a list of supported flavors. Each flavor represents

  • src/kits/tracker/Tests.cpp

     
    5555
    5656const char *pathsToSearch[] = {
    5757//  "/boot/home/config/settings/NetPositive/Bookmarks/",
    58     "/boot/beos",
     58    "/boot/haiku",
    5959    "/boot/apps",
    6060    "/boot/home",
    6161    0

  • src/kits/tracker/FSUtils.cpp

     
    467467    bool requireOverride = true;
    468468
    469469    if (DirectoryMatches(entry, B_BEOS_DIRECTORY))
    470         warning = "If you %s the beos folder, you won't be able to "
     470        warning = "If you %s the haiku folder, you won't be able to "
    471471            "boot " OS_NAME "! Are you sure you want to do this? To %s the folder "
    472472            "anyway, hold down the Shift key and click \"Do it\".";
    473473    else if (DirectoryMatchesOrContains(entry, B_BEOS_SYSTEM_DIRECTORY))
    … …  
    34043404
    34053405WellKnowEntryList::WellKnowEntryList()
    34063406{
    3407     AddOne(B_BEOS_DIRECTORY, "beos");
     3407    AddOne(B_BEOS_DIRECTORY, "haiku");
    34083408    AddOne((directory_which)B_BOOT_DISK, "/boot", "boot");
    34093409    AddOne(B_USER_DIRECTORY, "home");
    34103410    AddOne(B_BEOS_SYSTEM_DIRECTORY, "system");

  • src/kits/tracker/TrackerInitialState.cpp

     
    460460    // make the large Haiku Logo the default background
    461461
    462462//  BPath path;
    463     BPath path("/boot/beos/etc/artwork");
     463    BPath path("/boot/haiku/etc/artwork");
    464464//  FSFindTrackerSettingsDir(&path, false);
    465465//  path.Append(kDefaultFolderTemplate);
    466466