[haiku-commits] r40675 - in haiku/branches/features/package-management: build/jam build/scripts data/system/boot headers/os/storage src/system/boot/loader ...
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 25 Feb 2011 00:22:31 +0100 (CET)
Author: zooey
Date: 2011-02-25 00:22:31 +0100 (Fri, 25 Feb 2011)
New Revision: 40675
Changeset: http://dev.haiku-os.org/changeset/40675
Modified:
haiku/branches/features/package-management/build/jam/BuildSetup
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/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/main.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/runtime_loader/runtime_loader.cpp
Log:
First stab at adjusted filesystem layout for package management:
* adjusted find_directory() to move several folders into 'tree'
subdirectory (which will be populated by package-fs at a later
stage)
* adjusted build system to move files to their new targets
* adjusted bootloader, kernel, runtime_loader and bootscripts to new
paths
Not finished, but the system is booting ...
Modified: haiku/branches/features/package-management/build/jam/BuildSetup
===================================================================
--- haiku/branches/features/package-management/build/jam/BuildSetup
2011-02-24 22:53:01 UTC (rev 40674)
+++ haiku/branches/features/package-management/build/jam/BuildSetup
2011-02-24 23:22:31 UTC (rev 40675)
@@ -193,7 +193,7 @@
# analyze the gcc machine spec to determine HAIKU_CPU
switch $(HAIKU_GCC_MACHINE) {
case i?86-* : HAIKU_CPU = x86 ;
- case x86_64-* : HAIKU_CPU = x86_64 ;
+ case x86_64-* : HAIKU_CPU = x86_64 ;
case powerpc-* : HAIKU_CPU = ppc ;
case m68k-* : HAIKU_CPU = m68k ;
case mipsel-* : HAIKU_CPU = mipsel ;
Modified: haiku/branches/features/package-management/build/jam/FloppyBootImage
===================================================================
--- haiku/branches/features/package-management/build/jam/FloppyBootImage
2011-02-24 22:53:01 UTC (rev 40674)
+++ haiku/branches/features/package-management/build/jam/FloppyBootImage
2011-02-24 23:22:31 UTC (rev 40675)
@@ -53,29 +53,29 @@
# modules
-AddFilesToFloppyBootArchive system add-ons kernel bus_managers
+AddFilesToFloppyBootArchive system tree add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToFloppyBootArchive system add-ons kernel busses ide
+AddFilesToFloppyBootArchive system tree add-ons kernel busses ide
: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
it8211 ;
-AddFilesToFloppyBootArchive system add-ons kernel busses scsi
+AddFilesToFloppyBootArchive system tree add-ons kernel busses scsi
: ahci ;
-AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ;
-AddFilesToFloppyBootArchive system add-ons kernel file_systems
+AddFilesToFloppyBootArchive system tree add-ons kernel console : vga_text ;
+AddFilesToFloppyBootArchive system tree add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToFloppyBootArchive system add-ons kernel generic
+AddFilesToFloppyBootArchive system tree add-ons kernel generic
: $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph
;
-AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
+AddFilesToFloppyBootArchive system tree add-ons kernel partitioning_systems
: intel session ;
-AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
+AddFilesToFloppyBootArchive system tree add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ;
if $(USB_BOOT) = 1 {
- AddFilesToFloppyBootArchive system add-ons kernel busses usb
+ AddFilesToFloppyBootArchive system tree add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ;
}
if $(TARGET_ARCH) = x86 {
- AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
+ AddFilesToFloppyBootArchive system tree add-ons kernel cpu :
generic_x86 ;
}
# drivers
@@ -89,7 +89,7 @@
}
# kernel
-AddFilesToFloppyBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToFloppyBootArchive system tree : <revisioned>kernel_$(TARGET_ARCH) ;
# scripts and data files
@@ -101,15 +101,16 @@
if $(NET_BOOT) = 1 {
# add-ons
- AddFilesToFloppyBootArchive system add-ons kernel network
+ AddFilesToFloppyBootArchive system tree add-ons kernel network
: stack socket ;
- AddFilesToFloppyBootArchive system add-ons kernel network devices
+ AddFilesToFloppyBootArchive system tree add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ;
- AddFilesToFloppyBootArchive system add-ons kernel network
datalink_protocols
+ AddFilesToFloppyBootArchive
+ system tree add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
- AddFilesToFloppyBootArchive system add-ons kernel network ppp
+ AddFilesToFloppyBootArchive system tree add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
- AddFilesToFloppyBootArchive system add-ons kernel network protocols
+ AddFilesToFloppyBootArchive system tree 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-24 22:53:01 UTC (rev 40674)
+++ haiku/branches/features/package-management/build/jam/HaikuImage
2011-02-24 23:22:31 UTC (rev 40675)
@@ -207,41 +207,41 @@
# modules
-AddFilesToHaikuImage system add-ons kernel bus_managers
+AddFilesToHaikuImage system tree add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToHaikuImage system add-ons kernel busses agp_gart
+AddFilesToHaikuImage system tree add-ons kernel busses agp_gart
: $(X86_ONLY)<agp_gart>intel ;
if $(HAIKU_ATA_STACK) = 1 {
- AddFilesToHaikuImage system add-ons kernel busses ata
+ AddFilesToHaikuImage system tree add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112
$(X86_ONLY)ide_isa ;
} else {
- AddFilesToHaikuImage system add-ons kernel busses ide
+ AddFilesToHaikuImage system tree add-ons kernel busses ide
: generic_ide_pci it8211 legacy_sata silicon_image_3112
$(X86_ONLY)ide_isa ;
}
-AddFilesToHaikuImage system add-ons kernel busses scsi
+AddFilesToHaikuImage system tree add-ons kernel busses scsi
: ahci ;
-AddFilesToHaikuImage system add-ons kernel busses usb
+AddFilesToHaikuImage system tree add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ;
-AddFilesToHaikuImage system add-ons kernel console : vga_text ;
-AddFilesToHaikuImage system add-ons kernel debugger
+AddFilesToHaikuImage system tree add-ons kernel console : vga_text ;
+AddFilesToHaikuImage system tree add-ons kernel debugger
: <kdebug>demangle $(X86_ONLY)<kdebug>disasm
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ;
-AddFilesToHaikuImage system add-ons kernel file_systems
+AddFilesToHaikuImage system tree add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToHaikuImage system add-ons kernel generic
+AddFilesToHaikuImage system tree add-ons kernel generic
: $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
scsi_periph ;
-AddFilesToHaikuImage system add-ons kernel partitioning_systems
+AddFilesToHaikuImage system tree add-ons kernel partitioning_systems
: amiga_rdb apple efi_gpt intel session ;
-AddFilesToHaikuImage system add-ons kernel interrupt_controllers
+AddFilesToHaikuImage system tree add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ;
if $(TARGET_ARCH) = x86 {
- AddFilesToHaikuImage system add-ons kernel cpu : generic_x86 ;
+ AddFilesToHaikuImage system tree add-ons kernel cpu : generic_x86 ;
}
# drivers
@@ -269,10 +269,10 @@
#AddDriversToHaikuImage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
# kernel
-AddFilesToHaikuImage system : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToHaikuImage system tree : <revisioned>kernel_$(TARGET_ARCH) ;
# libs
-AddLibrariesToHaikuHybridImage system lib
+AddLibrariesToHaikuHybridImage system tree lib
: $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
# libnetwork.so replaces quite a few libraries
@@ -282,11 +282,11 @@
if $(HAIKU_GCC_VERSION[1]) = 2 {
local lib ;
for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
- AddSymlinkToHaikuHybridImage system lib : libnetwork.so : $(lib)
+ AddSymlinkToHaikuHybridImage system tree lib : libnetwork.so :
$(lib)
: : true ;
}
- AddSymlinkToHaikuHybridImage system lib : libbnetapi.so : libnetapi.so
+ AddSymlinkToHaikuHybridImage system tree lib : libbnetapi.so :
libnetapi.so
: : true ;
}
@@ -298,7 +298,8 @@
if $(TARGET_ARCH) = x86 {
local lib ;
for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
- AddSymlinkToHaikuHybridImage system lib : libGL.so : $(lib) : :
true ;
+ AddSymlinkToHaikuHybridImage system tree lib
+ : libGL.so : $(lib) : : true ;
}
}
@@ -309,34 +310,35 @@
;
# servers
-AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
+AddFilesToHaikuImage system tree servers : $(SYSTEM_SERVERS) ;
# apps
-AddFilesToHaikuImage system : runtime_loader
Deskbar Tracker ;
-AddFilesToHaikuImage system bin : $(SYSTEM_BIN)
consoled ;
-AddFilesToHaikuImage system apps : $(SYSTEM_APPS) ;
-AddFilesToHaikuImage system preferences : $(SYSTEM_PREFERENCES) ;
-AddFilesToHaikuImage system demos : $(SYSTEM_DEMOS) ;
+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) ;
SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system bin : which ;
+AddFilesToHaikuImage system tree bin : which ;
SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system bin :
installoptionalpackage ;
+AddFilesToHaikuImage system tree bin :
installoptionalpackage ;
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system bin :
install-wifi-firmwares.sh ;
+AddFilesToHaikuImage system tree bin :
install-wifi-firmwares.sh ;
# Add the files to be used by installoptionalpackage.
-AddDirectoryToHaikuImage common data optional-packages ;
+AddDirectoryToHaikuImage common tree 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 data optional-packages : $(file) ;
+ AddFilesToHaikuImage common tree data optional-packages : $(file) ;
}
AddInstalledPackagesFileToHaikuImage ;
-AddSymlinkToHaikuImage system bin : bash : sh ;
-AddSymlinkToHaikuImage system bin : trash : untrash ;
+AddSymlinkToHaikuImage system tree bin : bash : sh ;
+AddSymlinkToHaikuImage system tree bin : trash : untrash ;
AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
@@ -383,22 +385,22 @@
: /boot/system/demos/$(linkTarget) : $(linkTarget) ;
}
-AddSymlinkToHaikuImage system bin : bzip2 : bunzip2 ;
-AddSymlinkToHaikuImage system bin : less : more ;
-AddSymlinkToHaikuImage system bin : gzip : gunzip ;
-AddSymlinkToHaikuImage system bin : gzip : zcat ;
-AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
-AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
-AddSymlinkToHaikuImage system bin : gawk : awk ;
-AddSymlinkToHaikuImage system bin : grep : egrep ;
-AddSymlinkToHaikuImage system bin : grep : fgrep ;
+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 ;
# scripts and data files
local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
InstallerInitScript InstallerFinishScript ;
SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
-AddFilesToHaikuImage system boot : $(bootScripts) ;
+AddFilesToHaikuImage system tree boot : $(bootScripts) ;
local userBootScripts = UserBootscript UserSetupEnvironment.sample ;
SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ;
@@ -411,9 +413,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 data artwork : $(logoArtwork) ;
+AddFilesToHaikuImage system tree data artwork : $(logoArtwork) ;
-AddDirectoryToHaikuImage system data sounds ;
+AddDirectoryToHaikuImage system tree data sounds ;
# Add mail provider infos.
AddFilesToHaikuImage home config settings Mail ProviderInfo :
@@ -424,53 +426,54 @@
spellFiles = $(spellFiles:G=spell) ;
SEARCH on $(spellFiles)
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToHaikuImage system data spell_check word_dictionary : $(spellFiles) ;
+AddFilesToHaikuImage system tree data spell_check word_dictionary
+ : $(spellFiles) ;
local etcFiles = inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
-AddFilesToHaikuImage common etc : $(etcFiles) ;
+AddFilesToHaikuImage common settings etc : $(etcFiles) ;
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
-AddFilesToHaikuImage system data : $(dataFiles) ;
+AddFilesToHaikuImage system tree data : $(dataFiles) ;
local fortuneFiles = [ Glob $(HAIKU_TOP)/data/system/data/fortunes
: [a-zA-Z0-9]* ] ;
fortuneFiles = $(fortuneFiles:G=data!fortunes) ;
-AddFilesToHaikuImage system data fortunes : $(fortuneFiles) ;
+AddFilesToHaikuImage system tree 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 data fonts psfonts : $(psFonts) ;
-AddFilesToHaikuImage system data fonts ttfonts : $(ttFonts) ;
+AddFilesToHaikuImage system tree data fonts psfonts : $(psFonts) ;
+AddFilesToHaikuImage system tree 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 data Canna default : $(cannaDefault) ;
-AddFilesToHaikuImage system data Canna dic : $(cannaDic) ;
-AddFilesToHaikuImage system data Canna dic canna : $(cannaDicCanna) ;
-AddDirectoryToHaikuImage system data Canna dic group ;
-AddDirectoryToHaikuImage system data Canna dic user ;
+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 ;
local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data keymaps ]
: *.keymap ] ;
keymapFiles = $(keymapFiles:BG=keymap) ;
-AddFilesToHaikuImage system data Keymaps : $(keymapFiles) ;
-AddSymlinkToHaikuImage system data Keymaps : Swedish : Finnish ;
-AddSymlinkToHaikuImage system data Keymaps : Slovene : Croatian ;
-AddSymlinkToHaikuImage system data Keymaps : US-International : Brazilian ;
+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
;
local keyboardLayoutsDir
= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
-AddFilesToHaikuImage system data KeyboardLayouts : $(keyboardLayouts) ;
+AddFilesToHaikuImage system tree data KeyboardLayouts : $(keyboardLayouts) ;
local driverSettingsFiles = <driver-settings>kernel ;
SEARCH on $(driverSettingsFiles)
@@ -490,7 +493,7 @@
= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
SEARCH on <post-install>fresh_install
= [ FDirName $(HAIKU_TOP) data common settings ] ;
-AddFilesToHaikuImage common boot post_install : $(postInstallFiles) ;
+AddFilesToHaikuImage common tree boot post_install : $(postInstallFiles) ;
AddFilesToHaikuImage common settings : <post-install>fresh_install ;
# boot loader
@@ -511,85 +514,87 @@
;
# add-ons
-AddFilesToHaikuImage system add-ons accelerants
+AddFilesToHaikuImage system tree add-ons accelerants
: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-AddFilesToHaikuHybridImage system add-ons opengl
+AddFilesToHaikuHybridImage system tree add-ons opengl
: Mesa\ Software\ Renderer : : true ;
-AddFilesToHaikuHybridImage system add-ons Translators
+AddFilesToHaikuHybridImage system tree add-ons Translators
: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
-AddFilesToHaikuImage system add-ons locale catalogs
+AddFilesToHaikuImage system tree add-ons locale catalogs
: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
-AddFilesToHaikuHybridImage system add-ons locale catalogs
+AddFilesToHaikuHybridImage system tree add-ons locale catalogs
: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) : : true ;
-AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
-AddFilesToHaikuImage system add-ons mail_daemon outbound_protocols : SMTP ;
-AddFilesToHaikuImage system add-ons mail_daemon inbound_filters
+AddFilesToHaikuImage system tree 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
: MatchHeader SpamFilter NewMailNotification ;
-AddFilesToHaikuImage system add-ons mail_daemon outbound_filters : Fortune ;
-AddFilesToHaikuImage system add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
-AddFilesToHaikuImage system add-ons media plugins
+AddFilesToHaikuImage system tree add-ons mail_daemon outbound_filters
+ : Fortune ;
+AddFilesToHaikuImage system tree add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
+AddFilesToHaikuImage system tree add-ons media plugins
: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
-AddFilesToHaikuImage system add-ons Tracker
+AddFilesToHaikuImage system tree add-ons Tracker
: FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
Open\ Terminal-T ZipOMatic-Z ;
-AddSymlinkToHaikuImage system add-ons Tracker
+AddSymlinkToHaikuImage system tree add-ons Tracker
: /boot/system/preferences/Backgrounds : Background-B ;
-AddSymlinkToHaikuImage system add-ons Tracker
+AddSymlinkToHaikuImage system tree add-ons Tracker
: /boot/system/apps/TextSearch : TextSearch-G ;
-AddSymlinkToHaikuImage system add-ons Tracker
+AddSymlinkToHaikuImage system tree add-ons Tracker
: /boot/system/apps/DiskUsage : DiskUsage-I ;
-AddFilesToHaikuImage system add-ons input_server devices
+AddFilesToHaikuImage system tree add-ons input_server devices
: <input>keyboard <input>mouse <input>wacom ;
-AddFilesToHaikuImage system add-ons input_server filters
+AddFilesToHaikuImage system tree add-ons input_server filters
: screen_saver shortcut_catcher ;
-AddFilesToHaikuImage system add-ons kernel network
+AddFilesToHaikuImage system tree add-ons kernel network
: <net>notifications stack ;
-AddFilesToHaikuImage system add-ons kernel network devices
+AddFilesToHaikuImage system tree add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ;
-AddFilesToHaikuImage system add-ons kernel network datalink_protocols
+AddFilesToHaikuImage system tree add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToHaikuImage system add-ons kernel network ppp
+AddFilesToHaikuImage system tree add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
-AddFilesToHaikuImage system add-ons kernel network protocols
+AddFilesToHaikuImage system tree add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
-AddFilesToHaikuImage system add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
-AddFilesToHaikuImage system add-ons Print transport
+AddFilesToHaikuImage system tree add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
+AddFilesToHaikuImage system tree add-ons Print transport
: $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
-AddFilesToHaikuImage system add-ons Screen\ Savers
+AddFilesToHaikuImage system tree add-ons Screen\ Savers
: $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
-AddFilesToHaikuImage system add-ons disk_systems
+AddFilesToHaikuImage system tree add-ons disk_systems
: <disk_system>intel <disk_system>bfs ;
# decorators
-AddDirectoryToHaikuImage home config add-ons decorators ;
-AddFilesToHaikuImage home config add-ons decorators :
+AddDirectoryToHaikuImage home config tree add-ons decorators ;
+AddFilesToHaikuImage home config tree add-ons decorators :
MacDecorator WinDecorator ClassicBe SATDecorator ;
# create directories that will remain empty
-AddDirectoryToHaikuImage common bin ;
-AddDirectoryToHaikuImage common include ;
-AddDirectoryToHaikuImage common lib ;
+AddDirectoryToHaikuImage common tree bin ;
+AddDirectoryToHaikuImage common tree include ;
+AddDirectoryToHaikuImage common tree lib ;
AddDirectoryToHaikuImage home Desktop ;
-AddDirectoryToHaikuImage home config bin ;
-AddDirectoryToHaikuImage home config lib ;
+AddDirectoryToHaikuImage home config tree bin ;
+AddDirectoryToHaikuImage home config tree lib ;
AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage common var empty ;
AddDirectoryToHaikuImage common var log ;
AddDirectoryToHaikuImage common cache tmp ;
-AddDirectoryToHaikuImage home config add-ons kernel drivers bin ;
-AddDirectoryToHaikuImage home config add-ons kernel drivers dev ;
-AddDirectoryToHaikuImage home config add-ons input_server devices ;
-AddDirectoryToHaikuImage home config add-ons input_server filters ;
-AddDirectoryToHaikuImage home config add-ons input_server methods ;
-AddDirectoryToHaikuImage home config add-ons media plugins ;
-AddDirectoryToHaikuImage home config add-ons Tracker ;
-AddDirectoryToHaikuImage home config add-ons Print ;
-AddDirectoryToHaikuImage home config add-ons Screen\ Savers ;
-AddDirectoryToHaikuImage home config add-ons Translators ;
-AddDirectoryToHaikuImage system data synth ;
-AddDirectoryToHaikuImage system add-ons input_server methods ;
+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 ;
# optional
AddFilesToHaikuImage optional system add-ons input_server methods : canna ;
@@ -601,12 +606,12 @@
: home-config-settings-printers-save-as-pdf.rdef ;
# PDF Writer enconding files
-CopyDirectoryToHaikuImage system data
+CopyDirectoryToHaikuImage system tree data
: [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
: "PDF Writer" : -x .svn -x Jamfile ;
# Gutenprint data files
-CopyDirectoryToHaikuImage common data
+CopyDirectoryToHaikuImage common tree data
: [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ]
: gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ;
@@ -616,17 +621,17 @@
: dvb : -x .svn -x Jamfile ;
# licenses
-CopyDirectoryToHaikuImage system data
+CopyDirectoryToHaikuImage system tree data
: [ FDirName $(HAIKU_TOP) data system data licenses ]
: licenses : -x .svn ;
# Copy documentation as per DiskUsage's license requirement.
-CopyDirectoryToHaikuImage system documentation
+CopyDirectoryToHaikuImage system tree documentation
: [ FDirName $(HAIKU_TOP) docs apps diskusage ]
: diskusage : -x .svn ;
# Copy documentation as per PDFlib Lite's license requirement.
-CopyDirectoryToHaikuImage system documentation
+CopyDirectoryToHaikuImage system tree 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-24 22:53:01 UTC (rev 40674)
+++ haiku/branches/features/package-management/build/jam/ImageRules
2011-02-24 23:22:31 UTC (rev 40675)
@@ -195,7 +195,7 @@
if $(catalogs) {
local signature
= [ on $(target) return
$(HAIKU_CATALOG_SIGNATURE) ] ;
- AddFilesToHaikuImage system data locale catalogs
$(signature)
+ AddFilesToHaikuImage system tree data locale catalogs
$(signature)
: $(catalogs) ;
}
}
@@ -300,10 +300,10 @@
{
# AddDriversToContainer <container> : <relative directory> : <targets> ;
#
- local directoryTokens = system add-ons kernel drivers dev
+ local directoryTokens = system tree add-ons kernel drivers dev
$(relativeDirectoryTokens) ;
- AddFilesToContainer $(container) : system add-ons kernel drivers bin
+ AddFilesToContainer $(container) : system tree add-ons kernel drivers
bin
: $(targets) ;
# If the image shall only be updated, we don't add any symlinks.
@@ -332,7 +332,7 @@
{
# AddNewDriversToContainer <container> : <directory> : <targets> ;
#
- local directoryTokens = system add-ons kernel drivers
+ local directoryTokens = system tree add-ons kernel drivers
$(relativeDirectoryTokens) ;
AddFilesToContainer $(container) : $(directoryTokens)
@@ -368,7 +368,7 @@
local name = $(target:BS) ;
local linkTarget = [ FDirName /boot $(installDir:G=) $(name) ] ;
- AddSymlinkToContainer $(container) : system add-ons kernel boot
+ AddSymlinkToContainer $(container) : system tree add-ons kernel
boot
: $(linkTarget) : $(name) ;
}
}
@@ -711,7 +711,7 @@
# AddHeaderDirectoryToHaikuImage <dirTokens> : [ <dirName> ]
# : <alwaysUpdate> ;
- CopyDirectoryToHaikuImage develop headers
+ CopyDirectoryToHaikuImage system tree develop headers
: [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
: $(dirName) : -x .svn : $(alwaysUpdate) ;
}
@@ -724,7 +724,7 @@
local firmwareArchive = [ FDirName
$(HAIKU_TOP) data system data firmware $(driver) $(archive) ] ;
- local dirTokens = system data firmware $(driver) ;
+ local dirTokens = system tree data firmware $(driver) ;
if $(extract) = true || $(extract) = 1 {
ExtractArchiveToHaikuImage $(dirTokens) : $(firmwareArchive) :
: $(package) ;
@@ -865,7 +865,7 @@
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageUserGroupFile $(file) ;
- AddFilesToHaikuImage common etc : $(file) ;
+ AddFilesToHaikuImage common settings etc : $(file) ;
}
HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;
@@ -913,7 +913,7 @@
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageExpanderRules $(file) ;
- AddFilesToHaikuImage common data : $(file) ;
+ AddFilesToHaikuImage common tree data : $(file) ;
}
HAIKU_IMAGE_EXPANDER_RULES_ENTRIES on $(file) = $(allEntries) ;
@@ -945,7 +945,7 @@
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageInstalledPackagesFile $(file) ;
- AddFilesToHaikuImage common data optional-packages : $(file) ;
+ AddFilesToHaikuImage common tree data optional-packages : $(file) ;
}
actions BuildHaikuImageInstalledPackagesFile
@@ -972,7 +972,7 @@
name = ;
}
- AddFilesToHaikuImage system data licenses : $(file) : $(name) ;
+ AddFilesToHaikuImage system tree data licenses : $(file) : $(name) ;
}
Modified: haiku/branches/features/package-management/build/jam/NetBootArchive
===================================================================
--- haiku/branches/features/package-management/build/jam/NetBootArchive
2011-02-24 22:53:01 UTC (rev 40674)
+++ haiku/branches/features/package-management/build/jam/NetBootArchive
2011-02-24 23:22:31 UTC (rev 40675)
@@ -42,26 +42,26 @@
# modules
-AddFilesToNetBootArchive system add-ons kernel bus_managers
+AddFilesToNetBootArchive system tree add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToNetBootArchive system add-ons kernel busses agp_gart
+AddFilesToNetBootArchive system tree add-ons kernel busses agp_gart
: $(X86_ONLY)<agp_gart>intel ;
-AddFilesToNetBootArchive system add-ons kernel busses ide
+AddFilesToNetBootArchive system tree add-ons kernel busses ide
: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
-AddFilesToNetBootArchive system add-ons kernel busses scsi
+AddFilesToNetBootArchive system tree add-ons kernel busses scsi
: ahci ;
-AddFilesToNetBootArchive system add-ons kernel console : vga_text ;
-AddFilesToNetBootArchive system add-ons kernel file_systems
+AddFilesToNetBootArchive system tree add-ons kernel console : vga_text ;
+AddFilesToNetBootArchive system tree add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToNetBootArchive system add-ons kernel generic
+AddFilesToNetBootArchive system tree add-ons kernel generic
: $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph
;
-AddFilesToNetBootArchive system add-ons kernel partitioning_systems
+AddFilesToNetBootArchive system tree add-ons kernel partitioning_systems
: intel session ;
-AddFilesToNetBootArchive system add-ons kernel interrupt_controllers
+AddFilesToNetBootArchive system tree add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ;
if $(TARGET_ARCH) = x86 {
- AddFilesToNetBootArchive system add-ons kernel cpu : generic_x86 ;
+ AddFilesToNetBootArchive system tree add-ons kernel cpu : generic_x86 ;
}
# drivers
@@ -71,7 +71,7 @@
AddDriversToNetBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
# kernel
-AddFilesToNetBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToNetBootArchive system tree : <revisioned>kernel_$(TARGET_ARCH) ;
# scripts and data files
@@ -82,15 +82,15 @@
: $(driverSettingsFiles) ;
# add-ons
-AddFilesToNetBootArchive system add-ons kernel network
+AddFilesToNetBootArchive system tree add-ons kernel network
: <net>notifications stack ;
-AddFilesToNetBootArchive system add-ons kernel network devices
+AddFilesToNetBootArchive system tree add-ons kernel network devices
: $(SYSTEM_NETWORK_DEVICES) ;
-AddFilesToNetBootArchive system add-ons kernel network datalink_protocols
+AddFilesToNetBootArchive system tree add-ons kernel network datalink_protocols
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToNetBootArchive system add-ons kernel network ppp
+AddFilesToNetBootArchive system tree add-ons kernel network ppp
: $(SYSTEM_NETWORK_PPP) ;
-AddFilesToNetBootArchive system add-ons kernel network protocols
+AddFilesToNetBootArchive system tree 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-24 22:53:01 UTC (rev 40674)
+++ haiku/branches/features/package-management/build/jam/OptionalPackages
2011-02-24 23:22:31 UTC (rev 40675)
@@ -220,7 +220,7 @@
if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip
- : system documentation
+ : system tree documentation
;
AddSymlinkToHaikuImage home Desktop
: /boot/system/documentation/bebook/index.html : BeBook ;
@@ -279,10 +279,10 @@
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BePDF/BePDF ;
- AddSymlinkToHaikuImage common data licenses
+ AddSymlinkToHaikuImage common tree data licenses
: "/boot/apps/BePDF/license/locale DevKit/Open Tracker
License"
: "Open Tracker" ;
- AddSymlinkToHaikuImage common data licenses
+ AddSymlinkToHaikuImage common tree data licenses
: "/boot/apps/BePDF/license/locale DevKit/LICENSE"
: "48HRS Public License" ;
InstallSourceArchive bepdf-1.1.1b3-2010-05-05.tar.xz
@@ -323,12 +323,12 @@
if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
local bluetoothDrivers = h2generic ;
AddDriversToHaikuImage bluetooth : $(bluetoothDrivers) ;
- AddFilesToHaikuImage system servers : bluetooth_server ;
- AddFilesToHaikuImage system lib : libbluetooth.so ;
- AddFilesToHaikuImage system add-ons kernel network protocols : l2cap ;
- AddFilesToHaikuImage system add-ons kernel bluetooth : btCoreData hci ;
- AddFilesToHaikuImage system preferences : Bluetooth ;
- AddFilesToHaikuImage system bin : bt_dev_info bt_discovery ;
+ 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 ;
AddSymlinkToHaikuImage home config be Preferences
: /boot/system/preferences/Bluetooth ;
if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
@@ -572,36 +572,15 @@
# gcc and binutils
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage
- gcc-2.95.3-x86-gcc2-2010-08-18.zip
- : $(baseURL)/gcc-2.95.3-x86-gcc2-2010-08-18.zip ;
+ gcc-2.95.3-x86-2011-02-24.zip
+ : $(myBaseURL)/gcc-2.95.3-x86-2011-02-24.zip ;
}
- if $(HAIKU_GCC_VERSION[1]) = 2 {
- # symlink to the appropriate system/lib[/gcc2] folder
- AddSymlinkToHaikuHybridImage
- develop abi x86 gcc2 tools gcc-2.95.3-haiku-100818 lib
- : /system/lib libstdc++.r4.so : : true ;
- }
-
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage
gcc-4.4.4-x86-gcc4-2010-11-11.zip
: $(baseURL)/gcc-4.4.4-x86-gcc4-2010-11-11.zip ;
}
- if $(HAIKU_GCC_VERSION[1]) = 4 {
- # symlink cpp to g++'s headers
- AddSymlinkToHaikuHybridImage develop abi x86 gcc4 headers
- : ../tools/current/include/g++ : cpp ;
-
- # symlink to the appropriate system/lib[/gcc4] folder
- local libs = libstdc++.so libsupc++.so ;
- for lib in $(libs) {
- AddSymlinkToHaikuHybridImage
- develop abi x86 gcc4 tools
gcc-4.4.4-haiku-101111 lib
- : /system/lib $(lib) : : true ;
- }
- }
-
# other commonly used tools
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
@@ -653,11 +632,10 @@
}
local arch = $(TARGET_ARCH) ;
- local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
- local abiDirTokens = develop abi $(arch) $(abi) ;
+ local developDirTokens = system tree develop ;
# glue code
- AddFilesToHaikuHybridImage $(abiDirTokens) lib :
+ AddFilesToHaikuImage ($developDirTokens) lib :
<src!system!glue!arch!$(arch)>crti.o
<src!system!glue!arch!$(arch)>crtn.o
<src!system!glue>init_term_dyn.o
@@ -666,51 +644,37 @@
;
# kernel
- AddFilesToHaikuHybridImage $(abiDirTokens) lib : kernel.so : _KERNEL_ ;
+ AddFilesToHaikuImage $(developDirTokens) lib : kernel.so : _KERNEL_ ;
# additional libraries
local developmentLibs = <revisioned>libroot_debug.so ;
- AddFilesToHaikuHybridImage system lib : $(developmentLibs) : : true ;
+ AddFilesToHaikuImage system tree lib : $(developmentLibs) ;
# library symlinks
local lib ;
for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES)
$(developmentLibs) {
- AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
- : /system/lib $(lib:BS) : : true ;
+ AddSymlinkToHaikuImage $(developDirTokens) lib : /system/lib
$(lib:BS) ;
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION)
] ;
if $(abiVersion) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ;
- AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
- : /system/lib $(abiVersionedLib) : : true ;
+ AddSymlinkToHaikuImage $(developDirTokens) lib
+ : /system/lib $(abiVersionedLib) ;
}
}
# static libraries
- AddFilesToHaikuHybridImage $(abiDirTokens) lib : libncurses.a ;
- AddFilesToHaikuHybridImage $(abiDirTokens) lib : liblocalestub.a ;
+ AddFilesToHaikuImage $(developDirTokens) lib : libncurses.a ;
+ AddFilesToHaikuImage $(developDirTokens) lib : liblocalestub.a ;
# the POSIX error code mapper library
- AddFilesToHaikuHybridImage $(abiDirTokens) lib :
libposix_error_mapper.a ;
+ AddFilesToHaikuImage $(developDirTokens) lib : libposix_error_mapper.a ;
- # symlinks for ABI abstraction
- AddSymlinkToHaikuImage develop abi : $(arch)/$(abi) : current ;
- AddSymlinkToHaikuImage develop lib : /boot/develop/abi/current/lib
- : $(arch) ;
- AddSymlinkToHaikuImage develop tools
- : /boot/develop/abi/current/tools/current : gnupro ;
- AddSymlinkToHaikuImage develop headers
- : /boot/develop/abi/current/headers/cpp ;
- AddSymlinkToHaikuHybridImage $(abiDirTokens) library-paths
- : /boot/common/lib : common : true ;
- AddSymlinkToHaikuHybridImage $(abiDirTokens) library-paths
- : /boot/home/config/lib : home : true ;
-
# ABI independent stuff
# 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 bin : $(scripts) ;
+ AddFilesToHaikuImage system tree bin : $(scripts) ;
# skeleton makefile and makefile-engine
local makefileEngineFiles =
@@ -719,7 +683,7 @@
;
SEARCH on $(makefileEngineFiles)
= [ FDirName $(HAIKU_TOP) data develop ] ;
- AddFilesToHaikuImage develop etc : $(makefileEngineFiles) ;
+ AddFilesToHaikuImage common tree develop etc : $(makefileEngineFiles) ;
# headers
AddHeaderDirectoryToHaikuImage config ;
@@ -728,7 +692,7 @@
AddHeaderDirectoryToHaikuImage posix ;
# create be -> os symlink for now
- AddSymlinkToHaikuImage develop headers : os : be ;
+ AddSymlinkToHaikuImage $(developDirTokens) headers : os : be ;
# BSD and GNU compatibility headers
AddHeaderDirectoryToHaikuImage compatibility bsd : bsd ;
@@ -746,10 +710,8 @@
# cpp headers
if $(HAIKU_GCC_VERSION[1]) = 2 {
# GCC 2 only -- for GCC 4 they come with the DevelopmentBase
package
- CopyDirectoryToHaikuImage $(abiDirTokens) headers
+ CopyDirectoryToHaikuImage $(developDirTokens) headers
: [ FDirName $(HAIKU_TOP) headers cpp ] : : -x .svn ;
- CopyDirectoryToAlternativeGCCArchive $(abiDirTokens) headers
- : [ FDirName $(HAIKU_TOP) headers cpp ] : : -x .svn ;
}
}
@@ -924,24 +886,24 @@
# unzip gcc2
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_2_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
- : system lib ;
+ : system tree lib ;
if $(isHybridBuild) {
# unzip gcc4 to gcc4 subdir
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_4_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
- : system lib gcc4
+ : system tree lib gcc4
;
}
} else {
# unzip gcc4
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_4_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
- : system lib ;
+ : system tree lib ;
if $(isHybridBuild) {
# unzip gcc2 to gcc2 subdir
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_2_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
- : system lib gcc2
+ : system tree lib gcc2
;
}
}
@@ -976,7 +938,7 @@
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 bin : /boot/common/bin/jamvm :
java ;
+ AddSymlinkToHaikuImage common tree bin : /boot/common/bin/jamvm
: java ;
} else {
Echo "No optional package JamVM available for gcc2" ;
}
@@ -1243,15 +1205,15 @@
# NetFS network file system
if [ IsOptionalHaikuImagePackageAdded NetFS ] {
# userlandfs module
- AddFilesToHaikuImage home config add-ons userlandfs : netfs ;
+ AddFilesToHaikuImage home config tree add-ons userlandfs : netfs ;
# servers
- AddFilesToHaikuImage system servers : netfs_server ;
- AddFilesToHaikuImage system servers : authentication_server ;
+ AddFilesToHaikuImage system tree servers : netfs_server ;
+ AddFilesToHaikuImage system tree servers : authentication_server ;
# tools
- AddFilesToHaikuImage system bin : netfs_config ;
- AddFilesToHaikuImage system bin : netfs_server_prefs ;
+ AddFilesToHaikuImage system tree bin : netfs_config ;
+ AddFilesToHaikuImage system tree bin : netfs_server_prefs ;
#example settings for netfs_server
local netfsServerSettingsFiles = <driver-settings>netfs-server ;
@@ -1407,7 +1369,7 @@
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Paladin/Paladin ;
- AddSymlinkToHaikuImage common bin
+ AddSymlinkToHaikuImage common tree bin
: /boot/apps/Paladin/Paladin ;
}
}
@@ -1452,7 +1414,7 @@
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Pe/Pe ;
- AddSymlinkToHaikuImage common bin
+ AddSymlinkToHaikuImage common tree bin
: /boot/apps/Pe/lpe ;
}
}
@@ -1670,10 +1632,10 @@
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
# kernel module
- AddFilesToHaikuImage system add-ons kernel file_systems : userlandfs ;
+ AddFilesToHaikuImage system tree add-ons kernel file_systems :
userlandfs ;
# server
- AddFilesToHaikuImage system servers : userlandfs_server ;
+ AddFilesToHaikuImage system tree servers : userlandfs_server ;
# libs
local userlandfsLibs =
@@ -1681,7 +1643,7 @@
libuserlandfs_haiku_kernel.so
libuserlandfs_fuse.so
;
- AddFilesToHaikuHybridImage system lib : $(userlandfsLibs) : : true ;
+ AddFilesToHaikuHybridImage system tree lib : $(userlandfsLibs) : : true
;
# development goodies
if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] {
@@ -1729,7 +1691,7 @@
AddSymlinkToHaikuImage home config be Applications
: /boot/common/bin/gvim ;
# TODO: move this symlink to the archive
- AddSymlinkToHaikuImage common bin : vim : vi ;
+ AddSymlinkToHaikuImage common tree bin : vim : vi ;
} else {
InstallOptionalHaikuImagePackage vim-7.3-x86-gcc2-2010-08-22.zip
: $(baseURL)/vim-7.3-x86-gcc2-2010-08-22.zip
@@ -1738,7 +1700,7 @@
AddSymlinkToHaikuImage home config be Applications
[... truncated: 560 lines follow ...]
Other related posts:
