[haiku-commits] r40709 - in haiku/branches/features/package-management: build/jam build/scripts data/system/boot headers/os/storage src/add-ons/input_server/filters/screen_saver ...
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 27 Feb 2011 00:14:35 +0100 (CET)
Author: zooey
Date: 2011-02-27 00:14:34 +0100 (Sun, 27 Feb 2011)
New Revision: 40709
Changeset: http://dev.haiku-os.org/changeset/40709
Modified:
haiku/branches/features/package-management/build/jam/FloppyBootImage
haiku/branches/features/package-management/build/jam/HaikuImage
haiku/branches/features/package-management/build/jam/ImageRules
haiku/branches/features/package-management/build/jam/NetBootArchive
haiku/branches/features/package-management/build/jam/OptionalPackages
haiku/branches/features/package-management/build/scripts/build_haiku_image
haiku/branches/features/package-management/data/system/boot/Bootscript
haiku/branches/features/package-management/data/system/boot/Bootscript.cd
haiku/branches/features/package-management/data/system/boot/SetupEnvironment
haiku/branches/features/package-management/headers/os/storage/FindDirectory.h
haiku/branches/features/package-management/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
haiku/branches/features/package-management/src/add-ons/input_server/filters/shortcut_catcher/ParseCommandLine.cpp
haiku/branches/features/package-management/src/add-ons/kernel/debugger/hangman/hangman.c
haiku/branches/features/package-management/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Driver.h
haiku/branches/features/package-management/src/add-ons/kernel/drivers/network/wlan/ipw2100/ipw2100.cpp
haiku/branches/features/package-management/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/FileSystemInitializer.cpp
haiku/branches/features/package-management/src/add-ons/media/plugins/ffmpeg/config.h
haiku/branches/features/package-management/src/apps/aboutsystem/AboutSystem.cpp
haiku/branches/features/package-management/src/apps/installer/InstallerWindow.cpp
haiku/branches/features/package-management/src/apps/processcontroller/PCWorld.cpp
haiku/branches/features/package-management/src/apps/processcontroller/ProcessController.cpp
haiku/branches/features/package-management/src/apps/remotedesktop/RemoteDesktop.cpp
haiku/branches/features/package-management/src/bin/bash/Jamfile
haiku/branches/features/package-management/src/bin/bash/config-top.h
haiku/branches/features/package-management/src/bin/bash/pathnames.h
haiku/branches/features/package-management/src/bin/debug/profile/profile.cpp
haiku/branches/features/package-management/src/kits/app/Roster.cpp
haiku/branches/features/package-management/src/libs/print/libgutenprint/config.h
haiku/branches/features/package-management/src/preferences/joysticks/JoyWin.cpp
haiku/branches/features/package-management/src/preferences/screensaver/ScreenSaverWindow.cpp
haiku/branches/features/package-management/src/servers/app/Desktop.cpp
haiku/branches/features/package-management/src/servers/debug/DebugServer.cpp
haiku/branches/features/package-management/src/servers/registrar/TRoster.cpp
haiku/branches/features/package-management/src/servers/registrar/TRoster.h
haiku/branches/features/package-management/src/system/boot/loader/loader.cpp
haiku/branches/features/package-management/src/system/kernel/fs/vfs_boot.cpp
haiku/branches/features/package-management/src/system/kernel/team.cpp
haiku/branches/features/package-management/src/system/libroot/os/find_directory.cpp
haiku/branches/features/package-management/src/system/libroot/posix/time/localtime_fading_out.c
haiku/branches/features/package-management/src/system/libroot/posix/unistd/conf.c
haiku/branches/features/package-management/src/system/runtime_loader/runtime_loader.cpp
haiku/branches/features/package-management/src/tests/kits/translation/TranslationUtilsTest.cpp
haiku/branches/features/package-management/src/tests/kits/translation/TranslatorRosterTest.cpp
haiku/branches/features/package-management/src/tools/translation/inspector/InspectorApp.cpp
Log:
* switched from 'tree' to 'packages/contents'
* replaced several uses of fixed paths by appropriate find_directory()
calls
* adjusted most other instances of defined system paths accordingly
System boots and can be shutdown again, too.
Modified: haiku/branches/features/package-management/build/jam/FloppyBootImage
===================================================================
--- haiku/branches/features/package-management/build/jam/FloppyBootImage
2011-02-26 23:10:20 UTC (rev 40708)
+++ haiku/branches/features/package-management/build/jam/FloppyBootImage
2011-02-26 23:14:34 UTC (rev 40709)
@@ -53,29 +53,34 @@
# modules
-AddFilesToFloppyBootArchive system tree add-ons kernel bus_managers
+AddFilesToFloppyBootArchive system packages contents add-ons kernel
bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToFloppyBootArchive system tree add-ons kernel busses ide
+AddFilesToFloppyBootArchive system packages contents add-ons kernel busses ide
: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
it8211 ;
-AddFilesToFloppyBootArchive system tree add-ons kernel busses scsi
+AddFilesToFloppyBootArchive system packages contents add-ons kernel busses scsi
: ahci ;
-AddFilesToFloppyBootArchive system tree add-ons kernel console : vga_text ;
-AddFilesToFloppyBootArchive system tree add-ons kernel file_systems
+AddFilesToFloppyBootArchive system packages contents add-ons kernel console
+ : vga_text ;
+AddFilesToFloppyBootArchive system packages contents add-ons kernel
file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToFloppyBootArchive system tree add-ons kernel generic
+AddFilesToFloppyBootArchive system packages contents add-ons kernel generic
: $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph
;
-AddFilesToFloppyBootArchive system tree add-ons kernel partitioning_systems
+AddFilesToFloppyBootArchive
+ system packages contents add-ons kernel partitioning_systems
: intel session ;
-AddFilesToFloppyBootArchive system tree add-ons kernel interrupt_controllers
+AddFilesToFloppyBootArchive
+ system packages contents add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ;
if $(USB_BOOT) = 1 {
- AddFilesToFloppyBootArchive system tree add-ons kernel busses usb
+ AddFilesToFloppyBootArchive
+ system packages contents add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ;
}
if $(TARGET_ARCH) = x86 {
- AddFilesToFloppyBootArchive system tree add-ons kernel cpu :
generic_x86 ;
+ AddFilesToFloppyBootArchive system packages contents add-ons kernel cpu
+ : generic_x86 ;
}
# drivers
@@ -89,7 +94,8 @@
}
# kernel
-AddFilesToFloppyBootArchive system tree : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToFloppyBootArchive system packages contents
+ : <revisioned>kernel_$(TARGET_ARCH) ;
# scripts and data files
@@ -101,16 +107,19 @@
if $(NET_BOOT) = 1 {
# add-ons
- AddFilesToFloppyBootArchive system tree add-ons kernel network
+ AddFilesToFloppyBootArchive system packages contents add-ons kernel
network
: stack socket ;
- AddFilesToFloppyBootArchive system tree add-ons kernel network devices
+ AddFilesToFloppyBootArchive
+ system packages contents add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ;
AddFilesToFloppyBootArchive
- system tree add-ons kernel network datalink_protocols
+ system packages contents add-ons kernel network
datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
- AddFilesToFloppyBootArchive system tree add-ons kernel network ppp
+ AddFilesToFloppyBootArchive
+ system packages contents add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
- AddFilesToFloppyBootArchive system tree add-ons kernel network protocols
+ AddFilesToFloppyBootArchive
+ system packages contents add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
}
Modified: haiku/branches/features/package-management/build/jam/HaikuImage
===================================================================
--- haiku/branches/features/package-management/build/jam/HaikuImage
2011-02-26 23:10:20 UTC (rev 40708)
+++ haiku/branches/features/package-management/build/jam/HaikuImage
2011-02-26 23:14:34 UTC (rev 40709)
@@ -208,41 +208,45 @@
# modules
-AddFilesToHaikuImage system tree add-ons kernel bus_managers
+AddFilesToHaikuImage system packages contents add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToHaikuImage system tree add-ons kernel busses agp_gart
+AddFilesToHaikuImage system packages contents add-ons kernel busses agp_gart
: $(X86_ONLY)<agp_gart>intel ;
if $(HAIKU_ATA_STACK) = 1 {
- AddFilesToHaikuImage system tree add-ons kernel busses ata
+ AddFilesToHaikuImage system packages contents add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112
$(X86_ONLY)ide_isa ;
} else {
- AddFilesToHaikuImage system tree add-ons kernel busses ide
+ AddFilesToHaikuImage system packages contents add-ons kernel busses ide
: generic_ide_pci it8211 legacy_sata silicon_image_3112
$(X86_ONLY)ide_isa ;
}
-AddFilesToHaikuImage system tree add-ons kernel busses scsi
+AddFilesToHaikuImage system packages contents add-ons kernel busses scsi
: ahci ;
-AddFilesToHaikuImage system tree add-ons kernel busses usb
+AddFilesToHaikuImage system packages contents add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ;
-AddFilesToHaikuImage system tree add-ons kernel console : vga_text ;
-AddFilesToHaikuImage system tree add-ons kernel debugger
+AddFilesToHaikuImage system packages contents add-ons kernel console
+ : vga_text ;
+AddFilesToHaikuImage system packages contents add-ons kernel debugger
: <kdebug>demangle $(X86_ONLY)<kdebug>disasm
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ;
-AddFilesToHaikuImage system tree add-ons kernel file_systems
+AddFilesToHaikuImage system packages contents add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToHaikuImage system tree add-ons kernel generic
+AddFilesToHaikuImage system packages contents add-ons kernel generic
: $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
scsi_periph ;
-AddFilesToHaikuImage system tree add-ons kernel partitioning_systems
+AddFilesToHaikuImage
+ system packages contents add-ons kernel partitioning_systems
: amiga_rdb apple efi_gpt intel session ;
-AddFilesToHaikuImage system tree add-ons kernel interrupt_controllers
+AddFilesToHaikuImage
+ system packages contents add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ;
if $(TARGET_ARCH) = x86 {
- AddFilesToHaikuImage system tree add-ons kernel cpu : generic_x86 ;
+ AddFilesToHaikuImage system packages contents add-ons kernel cpu
+ : generic_x86 ;
}
# drivers
@@ -270,10 +274,11 @@
#AddDriversToHaikuImage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
# kernel
-AddFilesToHaikuImage system tree : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToHaikuImage system packages contents
+ : <revisioned>kernel_$(TARGET_ARCH) ;
# libs
-AddLibrariesToHaikuHybridImage system tree lib
+AddLibrariesToHaikuHybridImage system packages contents lib
: $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
# libnetwork.so replaces quite a few libraries
@@ -283,12 +288,12 @@
if $(HAIKU_GCC_VERSION[1]) = 2 {
local lib ;
for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
- AddSymlinkToHaikuHybridImage system tree lib : libnetwork.so :
$(lib)
- : : true ;
+ AddSymlinkToHaikuHybridImage system packages contents lib
+ : libnetwork.so : $(lib) : : true ;
}
- AddSymlinkToHaikuHybridImage system tree lib : libbnetapi.so :
libnetapi.so
- : : true ;
+ AddSymlinkToHaikuHybridImage system packages contents lib :
libbnetapi.so
+ : libnetapi.so : : true ;
}
@@ -299,7 +304,7 @@
if $(TARGET_ARCH) = x86 {
local lib ;
for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
- AddSymlinkToHaikuHybridImage system tree lib
+ AddSymlinkToHaikuHybridImage system packages contents lib
: libGL.so : $(lib) : : true ;
}
}
@@ -311,35 +316,38 @@
;
# servers
-AddFilesToHaikuImage system tree servers : $(SYSTEM_SERVERS) ;
+AddFilesToHaikuImage system packages contents servers : $(SYSTEM_SERVERS) ;
# apps
-AddFilesToHaikuImage system tree :
runtime_loader ;
-AddFilesToHaikuImage system tree : Deskbar
Tracker ;
-AddFilesToHaikuImage system tree bin : $(SYSTEM_BIN)
consoled ;
-AddFilesToHaikuImage system tree apps : $(SYSTEM_APPS) ;
-AddFilesToHaikuImage system tree preferences : $(SYSTEM_PREFERENCES) ;
-AddFilesToHaikuImage system tree demos : $(SYSTEM_DEMOS) ;
+AddFilesToHaikuImage system packages contents : runtime_loader ;
+AddFilesToHaikuImage system packages contents : Deskbar Tracker ;
+AddFilesToHaikuImage system packages contents bin : $(SYSTEM_BIN)
consoled ;
+AddFilesToHaikuImage system packages contents apps : $(SYSTEM_APPS) ;
+AddFilesToHaikuImage system packages contents preferences
+ : $(SYSTEM_PREFERENCES) ;
+AddFilesToHaikuImage system packages contents demos : $(SYSTEM_DEMOS) ;
SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system tree bin : which ;
+AddFilesToHaikuImage system packages contents bin : which ;
SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system tree bin :
installoptionalpackage ;
+AddFilesToHaikuImage system packages contents bin :
installoptionalpackage ;
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system tree bin :
install-wifi-firmwares.sh ;
+AddFilesToHaikuImage system packages contents bin
+ : install-wifi-firmwares.sh ;
# Add the files to be used by installoptionalpackage.
-AddDirectoryToHaikuImage common tree data optional-packages ;
+AddDirectoryToHaikuImage common packages contents data optional-packages ;
local optional-pkg-files = OptionalBuildFeatures OptionalPackageDependencies
OptionalPackages OptionalLibPackages ;
for name in $(optional-pkg-files) {
local file = [ FDirName $(HAIKU_TOP) build jam $(name) ] ;
- AddFilesToHaikuImage common tree data optional-packages : $(file) ;
+ AddFilesToHaikuImage common packages contents data optional-packages
+ : $(file) ;
}
AddInstalledPackagesFileToHaikuImage ;
-AddSymlinkToHaikuImage system tree bin : bash : sh ;
-AddSymlinkToHaikuImage system tree bin : trash : untrash ;
+AddSymlinkToHaikuImage system packages contents bin : bash : sh ;
+AddSymlinkToHaikuImage system packages contents bin : trash : untrash ;
AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
@@ -358,7 +366,7 @@
local linkTarget ;
for linkTarget in $(DESKBAR_APPLICATIONS) {
AddSymlinkToHaikuImage home config be Applications
- : /boot/system/tree/apps/$(linkTarget) : $(linkTarget) ;
+ : /boot/system/packages/contents/apps/$(linkTarget) :
$(linkTarget) ;
}
# Deskbar Desktop applets links
@@ -368,7 +376,7 @@
;
for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {
AddSymlinkToHaikuImage home config be Desktop\ applets
- : /boot/system/tree/apps/$(linkTarget) : $(linkTarget) ;
+ : /boot/system/packages/contents/apps/$(linkTarget) :
$(linkTarget) ;
}
# Deskbar Preferences links
@@ -376,32 +384,33 @@
DESKBAR_PREFERENCES = $(SYSTEM_PREFERENCES:B) ;
for linkTarget in $(DESKBAR_PREFERENCES) {
AddSymlinkToHaikuImage home config be Preferences
- : /boot/system/tree/preferences/$(linkTarget) : $(linkTarget) ;
+ : /boot/system/packages/contents/preferences/$(linkTarget)
+ : $(linkTarget) ;
}
# Deskbar Demo links
AddDirectoryToHaikuImage home config be Demos ;
for linkTarget in $(SYSTEM_DEMOS) {
AddSymlinkToHaikuImage home config be Demos
- : /boot/system/tree/demos/$(linkTarget) : $(linkTarget) ;
+ : /boot/system/packages/contents/demos/$(linkTarget) :
$(linkTarget) ;
}
-AddSymlinkToHaikuImage system tree bin : bzip2 : bunzip2 ;
-AddSymlinkToHaikuImage system tree bin : less : more ;
-AddSymlinkToHaikuImage system tree bin : gzip : gunzip ;
-AddSymlinkToHaikuImage system tree bin : gzip : zcat ;
-AddSymlinkToHaikuImage system tree bin : zdiff : zcmp ;
-AddSymlinkToHaikuImage system tree bin : unzip : zipinfo ;
-AddSymlinkToHaikuImage system tree bin : gawk : awk ;
-AddSymlinkToHaikuImage system tree bin : grep : egrep ;
-AddSymlinkToHaikuImage system tree bin : grep : fgrep ;
+AddSymlinkToHaikuImage system packages contents bin : bzip2 : bunzip2 ;
+AddSymlinkToHaikuImage system packages contents bin : less : more ;
+AddSymlinkToHaikuImage system packages contents bin : gzip : gunzip ;
+AddSymlinkToHaikuImage system packages contents bin : gzip : zcat ;
+AddSymlinkToHaikuImage system packages contents bin : zdiff : zcmp ;
+AddSymlinkToHaikuImage system packages contents bin : unzip : zipinfo ;
+AddSymlinkToHaikuImage system packages contents bin : gawk : awk ;
+AddSymlinkToHaikuImage system packages contents bin : grep : egrep ;
+AddSymlinkToHaikuImage system packages contents bin : grep : fgrep ;
# scripts and data files
local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
InstallerInitScript InstallerFinishScript ;
SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
-AddFilesToHaikuImage system tree boot : $(bootScripts) ;
+AddFilesToHaikuImage system packages contents boot : $(bootScripts) ;
local userBootScripts = UserBootscript UserSetupEnvironment.sample ;
SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ;
@@ -414,9 +423,9 @@
$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"
$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - normal.png" ;
SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
-AddFilesToHaikuImage system tree data artwork : $(logoArtwork) ;
+AddFilesToHaikuImage system packages contents data artwork : $(logoArtwork) ;
-AddDirectoryToHaikuImage system tree data sounds ;
+AddDirectoryToHaikuImage system packages contents data sounds ;
# Add mail provider infos.
AddFilesToHaikuImage home config settings Mail ProviderInfo :
@@ -427,7 +436,7 @@
spellFiles = $(spellFiles:G=spell) ;
SEARCH on $(spellFiles)
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToHaikuImage system tree data spell_check word_dictionary
+AddFilesToHaikuImage system packages contents data spell_check word_dictionary
: $(spellFiles) ;
local etcFiles = inputrc profile ;
@@ -439,42 +448,48 @@
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
-AddFilesToHaikuImage system tree data : $(dataFiles) ;
+AddFilesToHaikuImage system packages contents data : $(dataFiles) ;
local fortuneFiles = [ Glob $(HAIKU_TOP)/data/system/data/fortunes
: [a-zA-Z0-9]* ] ;
fortuneFiles = $(fortuneFiles:G=data!fortunes) ;
-AddFilesToHaikuImage system tree data fortunes : $(fortuneFiles) ;
+AddFilesToHaikuImage system packages contents data fortunes : $(fortuneFiles) ;
local fontDir = [ FDirName $(HAIKU_TOP) data system data fonts ] ;
local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ;
local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
-AddFilesToHaikuImage system tree data fonts psfonts : $(psFonts) ;
-AddFilesToHaikuImage system tree data fonts ttfonts : $(ttFonts) ;
+AddFilesToHaikuImage system packages contents data fonts psfonts : $(psFonts) ;
+AddFilesToHaikuImage system packages contents data fonts ttfonts : $(ttFonts) ;
local cannaDir = [ FDirName $(HAIKU_TOP) data system data Canna ] ;
local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ;
local cannaDic = [ Glob $(cannaDir)/dic : *.cbp ] ;
local cannaDicCanna = [ Glob $(cannaDir)/dic/canna
: *.cld *.ctd *.cbd *.dir ] ;
-AddFilesToHaikuImage system tree data Canna default : $(cannaDefault) ;
-AddFilesToHaikuImage system tree data Canna dic : $(cannaDic) ;
-AddFilesToHaikuImage system tree data Canna dic canna : $(cannaDicCanna) ;
-AddDirectoryToHaikuImage system tree data Canna dic group ;
-AddDirectoryToHaikuImage system tree data Canna dic user ;
+AddFilesToHaikuImage system packages contents data Canna default
+ : $(cannaDefault) ;
+AddFilesToHaikuImage system packages contents data Canna dic : $(cannaDic) ;
+AddFilesToHaikuImage system packages contents data Canna dic canna
+ : $(cannaDicCanna) ;
+AddDirectoryToHaikuImage system packages contents data Canna dic group ;
+AddDirectoryToHaikuImage system packages contents data Canna dic user ;
local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data keymaps ]
: *.keymap ] ;
keymapFiles = $(keymapFiles:BG=keymap) ;
-AddFilesToHaikuImage system tree data Keymaps : $(keymapFiles) ;
-AddSymlinkToHaikuImage system tree data Keymaps : Swedish : Finnish ;
-AddSymlinkToHaikuImage system tree data Keymaps : Slovene : Croatian ;
-AddSymlinkToHaikuImage system tree data Keymaps : US-International : Brazilian
;
+AddFilesToHaikuImage system packages contents data Keymaps : $(keymapFiles) ;
+AddSymlinkToHaikuImage system packages contents data Keymaps : Swedish
+ : Finnish ;
+AddSymlinkToHaikuImage system packages contents data Keymaps : Slovene
+ : Croatian ;
+AddSymlinkToHaikuImage system packages contents data Keymaps : US-International
+ : Brazilian ;
local keyboardLayoutsDir
= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
-AddFilesToHaikuImage system tree data KeyboardLayouts : $(keyboardLayouts) ;
+AddFilesToHaikuImage system packages contents data KeyboardLayouts
+ : $(keyboardLayouts) ;
local driverSettingsFiles = <driver-settings>kernel ;
SEARCH on $(driverSettingsFiles)
@@ -494,7 +509,8 @@
= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
SEARCH on <post-install>fresh_install
= [ FDirName $(HAIKU_TOP) data common settings ] ;
-AddFilesToHaikuImage common tree boot post_install : $(postInstallFiles) ;
+AddFilesToHaikuImage common packages contents boot post_install
+ : $(postInstallFiles) ;
AddFilesToHaikuImage common settings : <post-install>fresh_install ;
# boot loader
@@ -515,87 +531,100 @@
;
# add-ons
-AddFilesToHaikuImage system tree add-ons accelerants
+AddFilesToHaikuImage system packages contents add-ons accelerants
: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-AddFilesToHaikuHybridImage system tree add-ons opengl
+AddFilesToHaikuHybridImage system packages contents add-ons opengl
: Mesa\ Software\ Renderer : : true ;
-AddFilesToHaikuHybridImage system tree add-ons Translators
+AddFilesToHaikuHybridImage system packages contents add-ons Translators
: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
-AddFilesToHaikuImage system tree add-ons locale catalogs
+AddFilesToHaikuImage system packages contents add-ons locale catalogs
: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
-AddFilesToHaikuHybridImage system tree add-ons locale catalogs
+AddFilesToHaikuHybridImage system packages contents add-ons locale catalogs
: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) : : true ;
-AddFilesToHaikuImage system tree add-ons mail_daemon inbound_protocols
+AddFilesToHaikuImage
+ system packages contents add-ons mail_daemon inbound_protocols
: POP3 IMAP ;
-AddFilesToHaikuImage system tree add-ons mail_daemon outbound_protocols : SMTP
;
-AddFilesToHaikuImage system tree add-ons mail_daemon inbound_filters
+AddFilesToHaikuImage
+ system packages contents add-ons mail_daemon outbound_protocols : SMTP ;
+AddFilesToHaikuImage
+ system packages contents add-ons mail_daemon inbound_filters
: MatchHeader SpamFilter NewMailNotification ;
-AddFilesToHaikuImage system tree add-ons mail_daemon outbound_filters
+AddFilesToHaikuImage
+ system packages contents add-ons mail_daemon outbound_filters
: Fortune ;
-AddFilesToHaikuImage system tree add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
-AddFilesToHaikuImage system tree add-ons media plugins
+AddFilesToHaikuImage system packages contents add-ons media
+ : $(SYSTEM_ADD_ONS_MEDIA) ;
+AddFilesToHaikuImage system packages contents add-ons media plugins
: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
-AddFilesToHaikuImage system tree add-ons Tracker
+AddFilesToHaikuImage system packages contents add-ons Tracker
: FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
Open\ Terminal-T ZipOMatic-Z ;
-AddSymlinkToHaikuImage system tree add-ons Tracker
- : /boot/system/tree/preferences/Backgrounds : Background-B ;
-AddSymlinkToHaikuImage system tree add-ons Tracker
- : /boot/system/tree/apps/TextSearch : TextSearch-G ;
-AddSymlinkToHaikuImage system tree add-ons Tracker
- : /boot/system/tree/apps/DiskUsage : DiskUsage-I ;
-AddFilesToHaikuImage system tree add-ons input_server devices
+AddSymlinkToHaikuImage system packages contents add-ons Tracker
+ : /boot/system/packages/contents/preferences/Backgrounds : Background-B
;
+AddSymlinkToHaikuImage system packages contents add-ons Tracker
+ : /boot/system/packages/contents/apps/TextSearch : TextSearch-G ;
+AddSymlinkToHaikuImage system packages contents add-ons Tracker
+ : /boot/system/packages/contents/apps/DiskUsage : DiskUsage-I ;
+AddFilesToHaikuImage system packages contents add-ons input_server devices
: <input>keyboard <input>mouse <input>wacom ;
-AddFilesToHaikuImage system tree add-ons input_server filters
+AddFilesToHaikuImage system packages contents add-ons input_server filters
: screen_saver shortcut_catcher ;
-AddFilesToHaikuImage system tree add-ons kernel network
+AddFilesToHaikuImage system packages contents add-ons kernel network
: <net>notifications stack ;
-AddFilesToHaikuImage system tree add-ons kernel network devices
+AddFilesToHaikuImage system packages contents add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ;
-AddFilesToHaikuImage system tree add-ons kernel network datalink_protocols
+AddFilesToHaikuImage
+ system packages contents add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToHaikuImage system tree add-ons kernel network ppp
+AddFilesToHaikuImage system packages contents add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
-AddFilesToHaikuImage system tree add-ons kernel network protocols
+AddFilesToHaikuImage system packages contents add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
-AddFilesToHaikuImage system tree add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
-AddFilesToHaikuImage system tree add-ons Print transport
+AddFilesToHaikuImage system packages contents add-ons Print
+ : $(SYSTEM_ADD_ONS_PRINT) ;
+AddFilesToHaikuImage system packages contents add-ons Print transport
: $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
-AddFilesToHaikuImage system tree add-ons Screen\ Savers
+AddFilesToHaikuImage system packages contents add-ons Screen\ Savers
: $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
-AddFilesToHaikuImage system tree add-ons disk_systems
+AddFilesToHaikuImage system packages contents add-ons disk_systems
: <disk_system>intel <disk_system>bfs ;
# decorators
-AddDirectoryToHaikuImage home config tree add-ons decorators ;
-AddFilesToHaikuImage home config tree add-ons decorators :
+AddDirectoryToHaikuImage home config packages contents add-ons decorators ;
+AddFilesToHaikuImage home config packages contents add-ons decorators :
MacDecorator WinDecorator ClassicBe SATDecorator ;
# create directories that will remain empty
-AddDirectoryToHaikuImage common tree bin ;
-AddDirectoryToHaikuImage common tree include ;
-AddDirectoryToHaikuImage common tree lib ;
+AddDirectoryToHaikuImage common packages contents bin ;
+AddDirectoryToHaikuImage common packages contents include ;
+AddDirectoryToHaikuImage common packages contents lib ;
AddDirectoryToHaikuImage home Desktop ;
-AddDirectoryToHaikuImage home config tree bin ;
-AddDirectoryToHaikuImage home config tree lib ;
+AddDirectoryToHaikuImage home config packages contents bin ;
+AddDirectoryToHaikuImage home config packages contents lib ;
AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage common var empty ;
AddDirectoryToHaikuImage common var log ;
AddDirectoryToHaikuImage common cache tmp ;
-AddDirectoryToHaikuImage home config tree add-ons kernel drivers bin ;
-AddDirectoryToHaikuImage home config tree add-ons kernel drivers dev ;
-AddDirectoryToHaikuImage home config tree add-ons input_server devices ;
-AddDirectoryToHaikuImage home config tree add-ons input_server filters ;
-AddDirectoryToHaikuImage home config tree add-ons input_server methods ;
-AddDirectoryToHaikuImage home config tree add-ons media plugins ;
-AddDirectoryToHaikuImage home config tree add-ons Tracker ;
-AddDirectoryToHaikuImage home config tree add-ons Print ;
-AddDirectoryToHaikuImage home config tree add-ons Screen\ Savers ;
-AddDirectoryToHaikuImage home config tree add-ons Translators ;
-AddDirectoryToHaikuImage system tree data synth ;
-AddDirectoryToHaikuImage system tree add-ons input_server methods ;
+AddDirectoryToHaikuImage
+ home config packages contents add-ons kernel drivers bin ;
+AddDirectoryToHaikuImage
+ home config packages contents add-ons kernel drivers dev ;
+AddDirectoryToHaikuImage
+ home config packages contents add-ons input_server devices ;
+AddDirectoryToHaikuImage
+ home config packages contents add-ons input_server filters ;
+AddDirectoryToHaikuImage
+ home config packages contents add-ons input_server methods ;
+AddDirectoryToHaikuImage
+ home config packages contents add-ons media plugins ;
+AddDirectoryToHaikuImage home config packages contents add-ons Tracker ;
+AddDirectoryToHaikuImage home config packages contents add-ons Print ;
+AddDirectoryToHaikuImage home config packages contents add-ons Screen\ Savers ;
+AddDirectoryToHaikuImage home config packages contents add-ons Translators ;
+AddDirectoryToHaikuImage system packages contents data synth ;
+AddDirectoryToHaikuImage system packages contents add-ons input_server methods
;
# optional
AddFilesToHaikuImage optional system add-ons input_server methods : canna ;
@@ -607,12 +636,12 @@
: home-config-settings-printers-save-as-pdf.rdef ;
# PDF Writer enconding files
-CopyDirectoryToHaikuImage system tree data
+CopyDirectoryToHaikuImage system packages contents data
: [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
: "PDF Writer" : -x .svn -x Jamfile ;
# Gutenprint data files
-CopyDirectoryToHaikuImage common tree data
+CopyDirectoryToHaikuImage common packages contents data
: [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ]
: gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ;
@@ -622,17 +651,17 @@
: dvb : -x .svn -x Jamfile ;
# licenses
-CopyDirectoryToHaikuImage system tree data
+CopyDirectoryToHaikuImage system packages contents data
: [ FDirName $(HAIKU_TOP) data system data licenses ]
: licenses : -x .svn ;
# Copy documentation as per DiskUsage's license requirement.
-CopyDirectoryToHaikuImage system tree documentation
+CopyDirectoryToHaikuImage system packages contents documentation
: [ FDirName $(HAIKU_TOP) docs apps diskusage ]
: diskusage : -x .svn ;
# Copy documentation as per PDFlib Lite's license requirement.
-CopyDirectoryToHaikuImage system tree documentation
+CopyDirectoryToHaikuImage system packages contents documentation
: [ FDirName $(HAIKU_TOP) src libs pdflib doc ]
: pdflib : -x .svn ;
Modified: haiku/branches/features/package-management/build/jam/ImageRules
===================================================================
--- haiku/branches/features/package-management/build/jam/ImageRules
2011-02-26 23:10:20 UTC (rev 40708)
+++ haiku/branches/features/package-management/build/jam/ImageRules
2011-02-26 23:14:34 UTC (rev 40709)
@@ -195,7 +195,8 @@
if $(catalogs) {
local signature
= [ on $(target) return
$(HAIKU_CATALOG_SIGNATURE) ] ;
- AddFilesToHaikuImage system tree data locale catalogs
$(signature)
+ AddFilesToHaikuImage
+ system packages contents data locale catalogs
$(signature)
: $(catalogs) ;
}
}
@@ -300,10 +301,11 @@
{
# AddDriversToContainer <container> : <relative directory> : <targets> ;
#
- local directoryTokens = system tree add-ons kernel drivers dev
+ local directoryTokens = system packages contents add-ons kernel drivers
dev
$(relativeDirectoryTokens) ;
- AddFilesToContainer $(container) : system tree add-ons kernel drivers
bin
+ AddFilesToContainer $(container)
+ : system packages contents add-ons kernel drivers bin
: $(targets) ;
# If the image shall only be updated, we don't add any symlinks.
@@ -332,7 +334,7 @@
{
# AddNewDriversToContainer <container> : <directory> : <targets> ;
#
- local directoryTokens = system tree add-ons kernel drivers
+ local directoryTokens = system packages contents add-ons kernel drivers
$(relativeDirectoryTokens) ;
AddFilesToContainer $(container) : $(directoryTokens)
@@ -368,7 +370,8 @@
local name = $(target:BS) ;
local linkTarget = [ FDirName /boot $(installDir:G=) $(name) ] ;
- AddSymlinkToContainer $(container) : system tree add-ons kernel
boot
+ AddSymlinkToContainer $(container)
+ : system packages contents add-ons kernel boot
: $(linkTarget) : $(name) ;
}
}
@@ -713,7 +716,7 @@
# AddHeaderDirectoryToHaikuImage <dirTokens> : [ <dirName> ]
# : <alwaysUpdate> ;
- CopyDirectoryToHaikuImage system tree develop headers
+ CopyDirectoryToHaikuImage system packages contents develop headers
: [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
: $(dirName) : -x .svn : $(alwaysUpdate) ;
}
@@ -726,7 +729,7 @@
local firmwareArchive = [ FDirName
$(HAIKU_TOP) data system data firmware $(driver) $(archive) ] ;
- local dirTokens = system tree data firmware $(driver) ;
+ local dirTokens = system packages contents data firmware $(driver) ;
if $(extract) = true || $(extract) = 1 {
ExtractArchiveToHaikuImage $(dirTokens) : $(firmwareArchive) :
: $(package) ;
@@ -924,7 +927,7 @@
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageExpanderRules $(file) ;
- AddFilesToHaikuImage common tree data : $(file) ;
+ AddFilesToHaikuImage common packages contents data : $(file) ;
}
HAIKU_IMAGE_EXPANDER_RULES_ENTRIES on $(file) = $(allEntries) ;
@@ -943,7 +946,8 @@
Exit "Invalid expander rule specification passed to
AddExpanderRule." ;
}
- local entry =
"\\\"$(mimetype)\\\"\\\t$(extension)\\\t\\\"$(list)\\\"\\\t\\\"$(extract)\\\"" ;
+ local entry
+ =
"\\\"$(mimetype)\\\"\\\t$(extension)\\\t\\\"$(list)\\\"\\\t\\\"$(extract)\\\"" ;
AddEntryToHaikuImageExpanderRuleFile <haiku-image>expander.rules
: $(entry) ;
}
@@ -956,7 +960,8 @@
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageInstalledPackagesFile $(file) ;
- AddFilesToHaikuImage common tree data optional-packages : $(file) ;
+ AddFilesToHaikuImage common packages contents data optional-packages
+ : $(file) ;
}
actions BuildHaikuImageInstalledPackagesFile
@@ -983,7 +988,8 @@
name = ;
}
- AddFilesToHaikuImage system tree data licenses : $(file) : $(name) ;
+ AddFilesToHaikuImage system packages contents data licenses : $(file)
+ : $(name) ;
}
Modified: haiku/branches/features/package-management/build/jam/NetBootArchive
===================================================================
--- haiku/branches/features/package-management/build/jam/NetBootArchive
2011-02-26 23:10:20 UTC (rev 40708)
+++ haiku/branches/features/package-management/build/jam/NetBootArchive
2011-02-26 23:14:34 UTC (rev 40709)
@@ -42,26 +42,30 @@
# modules
-AddFilesToNetBootArchive system tree add-ons kernel bus_managers
+AddFilesToNetBootArchive system packages contents add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToNetBootArchive system tree add-ons kernel busses agp_gart
+AddFilesToNetBootArchive system packages contents add-ons kernel busses
agp_gart
: $(X86_ONLY)<agp_gart>intel ;
-AddFilesToNetBootArchive system tree add-ons kernel busses ide
+AddFilesToNetBootArchive system packages contents add-ons kernel busses ide
: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
-AddFilesToNetBootArchive system tree add-ons kernel busses scsi
+AddFilesToNetBootArchive system packages contents add-ons kernel busses scsi
: ahci ;
-AddFilesToNetBootArchive system tree add-ons kernel console : vga_text ;
-AddFilesToNetBootArchive system tree add-ons kernel file_systems
+AddFilesToNetBootArchive system packages contents add-ons kernel console
+ : vga_text ;
+AddFilesToNetBootArchive system packages contents add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToNetBootArchive system tree add-ons kernel generic
+AddFilesToNetBootArchive system packages contents add-ons kernel generic
: $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph
;
-AddFilesToNetBootArchive system tree add-ons kernel partitioning_systems
+AddFilesToNetBootArchive
+ system packages contents add-ons kernel partitioning_systems
: intel session ;
-AddFilesToNetBootArchive system tree add-ons kernel interrupt_controllers
+AddFilesToNetBootArchive
+ system packages contents add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ;
if $(TARGET_ARCH) = x86 {
- AddFilesToNetBootArchive system tree add-ons kernel cpu : generic_x86 ;
+ AddFilesToNetBootArchive system packages contents add-ons kernel cpu
+ : generic_x86 ;
}
# drivers
@@ -71,7 +75,8 @@
AddDriversToNetBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
# kernel
-AddFilesToNetBootArchive system tree : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToNetBootArchive system packages contents
+ : <revisioned>kernel_$(TARGET_ARCH) ;
# scripts and data files
@@ -82,15 +87,17 @@
: $(driverSettingsFiles) ;
# add-ons
-AddFilesToNetBootArchive system tree add-ons kernel network
+AddFilesToNetBootArchive system packages contents add-ons kernel network
: <net>notifications stack ;
-AddFilesToNetBootArchive system tree add-ons kernel network devices
+AddFilesToNetBootArchive system packages contents add-ons kernel network
devices
: $(SYSTEM_NETWORK_DEVICES) ;
-AddFilesToNetBootArchive system tree add-ons kernel network datalink_protocols
+AddFilesToNetBootArchive
+ system packages contents add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToNetBootArchive system tree add-ons kernel network ppp
+AddFilesToNetBootArchive system packages contents add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
-AddFilesToNetBootArchive system tree add-ons kernel network protocols
+AddFilesToNetBootArchive
+ system packages contents add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
# boot module links
Modified: haiku/branches/features/package-management/build/jam/OptionalPackages
===================================================================
--- haiku/branches/features/package-management/build/jam/OptionalPackages
2011-02-26 23:10:20 UTC (rev 40708)
+++ haiku/branches/features/package-management/build/jam/OptionalPackages
2011-02-26 23:14:34 UTC (rev 40709)
@@ -220,10 +220,11 @@
if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip
- : system tree documentation
+ : system packages contents documentation
;
AddSymlinkToHaikuImage home Desktop
- : /boot/system/tree/documentation/bebook/index.html : BeBook ;
+ : /boot/system/packages/contents/documentation/bebook/index.html
+ : BeBook ;
}
@@ -252,12 +253,13 @@
Echo "No optional package BeOSCompatibility available for gcc4"
;
} else {
Echo "Warning: Adding BeOS compatibility symlinks. This will go
away. Please fix your apps!" ;
- AddSymlinkToHaikuImage beos : ../system/tree/apps ;
- AddSymlinkToHaikuImage beos : ../system/tree/bin ;
- AddSymlinkToHaikuImage beos : ../system/tree/documentation ;
+ AddSymlinkToHaikuImage beos : ../system/packages/contents/apps ;
+ AddSymlinkToHaikuImage beos : ../system/packages/contents/bin ;
+ AddSymlinkToHaikuImage beos
+ : ../system/packages/contents/documentation ;
AddSymlinkToHaikuImage beos : ../common/settings/etc ;
- AddSymlinkToHaikuImage beos : ../system/tree/preferences ;
- AddSymlinkToHaikuImage beos : ../system/tree ;
+ AddSymlinkToHaikuImage beos :
../system/packages/contents/preferences ;
+ AddSymlinkToHaikuImage beos : ../system ;
AddDirectoryToHaikuImage var ;
AddSymlinkToHaikuImage var : /boot/common/var/log ;
AddSymlinkToHaikuImage var : /boot/common/cache/tmp ;
@@ -279,10 +281,10 @@
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BePDF/BePDF ;
- AddSymlinkToHaikuImage common tree data licenses
+ AddSymlinkToHaikuImage common packages contents data licenses
: "/boot/apps/BePDF/license/locale DevKit/Open Tracker
License"
: "Open Tracker" ;
- AddSymlinkToHaikuImage common tree data licenses
+ AddSymlinkToHaikuImage common packages contents data licenses
: "/boot/apps/BePDF/license/locale DevKit/LICENSE"
: "48HRS Public License" ;
InstallSourceArchive bepdf-1.1.1b3-2010-05-05.tar.xz
@@ -323,20 +325,23 @@
if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
local bluetoothDrivers = h2generic ;
AddDriversToHaikuImage bluetooth : $(bluetoothDrivers) ;
- AddFilesToHaikuImage system tree servers : bluetooth_server ;
- AddFilesToHaikuImage system tree lib : libbluetooth.so ;
- AddFilesToHaikuImage system tree add-ons kernel network protocols :
l2cap ;
- AddFilesToHaikuImage system tree add-ons kernel bluetooth : btCoreData
hci ;
- AddFilesToHaikuImage system tree preferences : Bluetooth ;
- AddFilesToHaikuImage system tree bin : bt_dev_info bt_discovery ;
+ AddFilesToHaikuImage system packages contents servers :
bluetooth_server ;
+ AddFilesToHaikuImage system packages contents lib : libbluetooth.so ;
+ AddFilesToHaikuImage
+ system packages contents add-ons kernel network protocols :
l2cap ;
+ AddFilesToHaikuImage system packages contents add-ons kernel bluetooth
+ : btCoreData hci ;
+ AddFilesToHaikuImage system packages contents preferences : Bluetooth ;
+ AddFilesToHaikuImage system packages contents bin
+ : bt_dev_info bt_discovery ;
AddSymlinkToHaikuImage home config be Preferences
: /boot/system/preferences/Bluetooth ;
if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
&& $(HAIKU_GCC_VERSION[1]) in 2 4 {
local arch = $(TARGET_ARCH) ;
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
- AddSymlinkToHaikuHybridImage system tree develop lib
- : /system/tree/lib libbluetooth.so : : true ;
+ AddSymlinkToHaikuHybridImage system packages contents develop
lib
+ : /system/packages/contents/lib libbluetooth.so : :
true ;
}
}
@@ -577,7 +582,8 @@
# TODO: remove this when we have a mechanism to switch gcc via
PATH
AddSymlinkToHaikuImage common settings develop tools
- : /boot/common/tree/develop/tools/gcc-2.95.3-110225 :
current ;
+ :
/boot/common/packages/contents/develop/tools/gcc-2.95.3-110225
+ : current ;
}
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
@@ -636,7 +642,7 @@
}
local arch = $(TARGET_ARCH) ;
- local developDirTokens = system tree develop ;
+ local developDirTokens = system packages contents develop ;
# glue code
AddFilesToHaikuImage $(developDirTokens) lib :
@@ -652,18 +658,18 @@
# additional libraries
local developmentLibs = <revisioned>libroot_debug.so ;
- AddFilesToHaikuImage system tree lib : $(developmentLibs) ;
+ AddFilesToHaikuImage system packages contents lib : $(developmentLibs) ;
# library symlinks
local lib ;
for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES)
$(developmentLibs) {
AddSymlinkToHaikuImage $(developDirTokens) lib
- : /system/tree/lib $(lib:BS) ;
+ : /system/packages/contents/lib $(lib:BS) ;
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION)
] ;
if $(abiVersion) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ;
AddSymlinkToHaikuImage $(developDirTokens) lib
- : /system/tree/lib $(abiVersionedLib) ;
+ : /system/packages/contents/lib
$(abiVersionedLib) ;
}
}
@@ -679,7 +685,7 @@
# scripts: cc and c++ wrapper, freetype-config, setgcc
local scripts = cc c++ freetype-config setgcc ;
SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
- AddFilesToHaikuImage system tree bin : $(scripts) ;
+ AddFilesToHaikuImage system packages contents bin : $(scripts) ;
# skeleton makefile and makefile-engine
local makefileEngineFiles =
@@ -688,7 +694,8 @@
;
SEARCH on $(makefileEngineFiles)
= [ FDirName $(HAIKU_TOP) data develop ] ;
- AddFilesToHaikuImage common tree develop etc : $(makefileEngineFiles) ;
+ AddFilesToHaikuImage common packages contents develop etc
+ : $(makefileEngineFiles) ;
# headers
AddHeaderDirectoryToHaikuImage config ;
@@ -891,24 +898,24 @@
# unzip gcc2
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_2_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
- : system tree lib ;
+ : system packages contents lib ;
if $(isHybridBuild) {
# unzip gcc4 to gcc4 subdir
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_4_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
- : system tree lib gcc4
+ : system packages contents lib gcc4
;
}
} else {
# unzip gcc4
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_4_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
- : system tree lib ;
+ : system packages contents lib ;
if $(isHybridBuild) {
# unzip gcc2 to gcc2 subdir
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_2_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
- : system tree lib gcc2
+ : system packages contents lib gcc2
;
}
}
@@ -928,7 +935,7 @@
abiVersionedLib = $(abiVersionedLib:G=) ;
local lib = $(abiVersionedLib:B) ;
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
- : /system/tree/lib $(abiVersionedLib) : : true ;
+ : /system/packages/contents/lib $(abiVersionedLib) : :
true ;
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
: $(abiVersionedLib) : $(lib) ;
}
@@ -943,7 +950,8 @@
InstallOptionalHaikuImagePackage
jamvm-1.5.4-x86-gcc4-2011-02-13.zip
:
http://jerome.duval.free.fr/obos/jamvm-1.5.4-x86-gcc4-2011-02-13.zip ;
- AddSymlinkToHaikuImage common tree bin : /boot/common/bin/jamvm
: java ;
+ AddSymlinkToHaikuImage common packages contents bin
+ : /boot/common/bin/jamvm : java ;
} else {
Echo "No optional package JamVM available for gcc2" ;
}
@@ -1210,15 +1218,17 @@
# NetFS network file system
if [ IsOptionalHaikuImagePackageAdded NetFS ] {
# userlandfs module
- AddFilesToHaikuImage home config tree add-ons userlandfs : netfs ;
+ AddFilesToHaikuImage home config packages contents add-ons userlandfs
+ : netfs ;
# servers
- AddFilesToHaikuImage system tree servers : netfs_server ;
- AddFilesToHaikuImage system tree servers : authentication_server ;
+ AddFilesToHaikuImage system packages contents servers : netfs_server ;
+ AddFilesToHaikuImage system packages contents servers
+ : authentication_server ;
# tools
- AddFilesToHaikuImage system tree bin : netfs_config ;
- AddFilesToHaikuImage system tree bin : netfs_server_prefs ;
+ AddFilesToHaikuImage system packages contents bin : netfs_config ;
+ AddFilesToHaikuImage system packages contents bin : netfs_server_prefs ;
#example settings for netfs_server
local netfsServerSettingsFiles = <driver-settings>netfs-server ;
@@ -1374,7 +1384,7 @@
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Paladin/Paladin ;
- AddSymlinkToHaikuImage common tree bin
+ AddSymlinkToHaikuImage common packages contents bin
: /boot/apps/Paladin/Paladin ;
}
}
@@ -1419,7 +1429,7 @@
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Pe/Pe ;
- AddSymlinkToHaikuImage common tree bin
+ AddSymlinkToHaikuImage common packages contents bin
: /boot/apps/Pe/lpe ;
}
}
[... truncated: 2497 lines follow ...]
Other related posts:
- » [haiku-commits] r40709 - in haiku/branches/features/package-management: build/jam build/scripts data/system/boot headers/os/storage src/add-ons/input_server/filters/screen_saver ... - zooey
