Flat commit of all changes from package-management branch in svn
This commit is contained in:
Oliver Tappe
committed by
Ingo Weinhold
Ingo Weinhold
parent
b353a9a30a
commit
3dfd9cb95c
@@ -1,63 +0,0 @@
|
||||
# This file defines what ends up in the alternative GCC archive and it executes
|
||||
# the rules building the archive. Included by HaikuImage.
|
||||
|
||||
|
||||
#sanity check - make sure the primary gcc is different than the alternative gcc
|
||||
if $(HAIKU_PRIMARY_GCC) = $(HAIKU_GCC_VERSION[1]) {
|
||||
Exit "Error: Your alternative gcc is the same as the main gcc!"
|
||||
"You need to reconfigure your generated directories." ;
|
||||
}
|
||||
|
||||
#pragma mark - Build The Archive
|
||||
|
||||
|
||||
# archive target
|
||||
HAIKU_ALTERNATIVE_GCC_ARCHIVE = alternative_system_libs.zip ;
|
||||
MakeLocate $(HAIKU_ALTERNATIVE_GCC_ARCHIVE) : $(HAIKU_OUTPUT_DIR) ;
|
||||
|
||||
# the pseudo target all archive contents is attached to
|
||||
NotFile $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME) ;
|
||||
|
||||
# prepare the script that initializes the shell variables
|
||||
local initVarsScript = <AlternativeGCCArchive>haiku-alternative-gcc-init-vars ;
|
||||
local script = $(initVarsScript) ;
|
||||
MakeLocate $(script) : $(HAIKU_OUTPUT_DIR) ;
|
||||
Always $(script) ;
|
||||
|
||||
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
|
||||
AddVariableToScript $(script) : addBuildCompatibilityLibDir
|
||||
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
|
||||
AddTargetVariableToScript $(script) : <build>copyattr ;
|
||||
AddTargetVariableToScript $(script) : <build>zip ;
|
||||
if $(HOST_RM_ATTRS_TARGET) {
|
||||
AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
|
||||
} else {
|
||||
AddVariableToScript $(script) : rmAttrs : rm ;
|
||||
}
|
||||
|
||||
# create the other scripts
|
||||
local makeDirsScript = <AlternativeGCCArchive>haiku-alternative-gcc-make-dirs ;
|
||||
local copyFilesScript
|
||||
= <AlternativeGCCArchive>haiku-alternative-gcc-copy-files ;
|
||||
MakeLocate $(makeDirsScript) $(copyFilesScript) : $(HAIKU_OUTPUT_DIR) ;
|
||||
|
||||
CreateAlternativeGCCArchiveMakeDirectoriesScript $(makeDirsScript) ;
|
||||
CreateAlternativeGCCArchiveCopyFilesScript $(copyFilesScript) ;
|
||||
|
||||
# build the archive
|
||||
|
||||
BuildAlternativeGCCArchive $(HAIKU_ALTERNATIVE_GCC_ARCHIVE) :
|
||||
$(initVarsScript)
|
||||
$(makeDirsScript)
|
||||
$(copyFilesScript)
|
||||
;
|
||||
|
||||
# remove the scripts we have generated
|
||||
RmTemps $(HAIKU_ALTERNATIVE_GCC_ARCHIVE) :
|
||||
$(initVarsScript)
|
||||
$(makeDirsScript)
|
||||
$(copyFilesScript)
|
||||
;
|
||||
|
||||
NotFile haiku-alternative-gcc-archive ;
|
||||
Depends haiku-alternative-gcc-archive : $(HAIKU_ALTERNATIVE_GCC_ARCHIVE) ;
|
||||
@@ -29,15 +29,6 @@ HAIKU_CONTAINER_GRIST on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
|
||||
HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
|
||||
= HAIKU_NET_BOOT_ARCHIVE_INSTALL_TARGETS ;
|
||||
|
||||
# alternative gcc archive
|
||||
HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME
|
||||
= haiku-alternative-gcc-archive-container ;
|
||||
HAIKU_CONTAINER_GRIST on $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME)
|
||||
= AlternativeGCCArchive ;
|
||||
# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
|
||||
HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME)
|
||||
= HAIKU_ALTERNATIVE_GCC_ARCHIVE_INSTALL_TARGETS ;
|
||||
|
||||
# boot floppy
|
||||
HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-floppy-container ;
|
||||
HAIKU_CONTAINER_GRIST on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
|
||||
@@ -151,13 +142,6 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
HAIKU_GCC_HEADERS_DIR = [ FDirName $(HAIKU_TOP) headers build gcc-2.95.3 ] ;
|
||||
}
|
||||
|
||||
# the subdirectory into which the alternative GCC libraries are to be installed
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
HAIKU_ALTERNATIVE_GCC_LIB_SUBDIR = gcc2 ;
|
||||
} else {
|
||||
HAIKU_ALTERNATIVE_GCC_LIB_SUBDIR = gcc4 ;
|
||||
}
|
||||
|
||||
# initial state for flags etc.
|
||||
HAIKU_C++ ?= $(HAIKU_CC) ;
|
||||
HAIKU_LINK = $(HAIKU_CC) ;
|
||||
|
||||
+20
-10
@@ -59,23 +59,28 @@ AddFilesToFloppyBootArchive system 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
|
||||
: ahci ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel console
|
||||
: vga_text ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel file_systems
|
||||
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
|
||||
AddFilesToFloppyBootArchive system 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 add-ons kernel partitioning_systems
|
||||
: intel session ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
|
||||
AddFilesToFloppyBootArchive
|
||||
system add-ons kernel interrupt_controllers
|
||||
: $(PPC_ONLY)openpic ;
|
||||
|
||||
if $(USB_BOOT) = 1 {
|
||||
AddFilesToFloppyBootArchive system add-ons kernel busses usb
|
||||
AddFilesToFloppyBootArchive
|
||||
system 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 add-ons kernel cpu
|
||||
: generic_x86 ;
|
||||
}
|
||||
|
||||
# drivers
|
||||
@@ -89,7 +94,8 @@ if $(NET_BOOT) = 1 {
|
||||
}
|
||||
|
||||
# kernel
|
||||
AddFilesToFloppyBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
|
||||
AddFilesToFloppyBootArchive system
|
||||
: <revisioned>kernel_$(TARGET_ARCH) ;
|
||||
|
||||
# scripts and data files
|
||||
|
||||
@@ -103,13 +109,17 @@ if $(NET_BOOT) = 1 {
|
||||
# add-ons
|
||||
AddFilesToFloppyBootArchive system add-ons kernel network
|
||||
: stack socket ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel network devices
|
||||
AddFilesToFloppyBootArchive
|
||||
system add-ons kernel network devices
|
||||
: $(SYSTEM_NETWORK_DEVICES) ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols
|
||||
AddFilesToFloppyBootArchive
|
||||
system add-ons kernel network datalink_protocols
|
||||
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel network ppp
|
||||
AddFilesToFloppyBootArchive
|
||||
system add-ons kernel network ppp
|
||||
: $(SYSTEM_NETWORK_PPP) ;
|
||||
AddFilesToFloppyBootArchive system add-ons kernel network protocols
|
||||
AddFilesToFloppyBootArchive
|
||||
system add-ons kernel network protocols
|
||||
: $(SYSTEM_NETWORK_PROTOCOLS) ;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,13 +8,6 @@ HAIKU_CD = $(HAIKU_CD_NAME) ;
|
||||
HAIKU_CD_LABEL ?= $(HAIKU_DEFAULT_CD_LABEL) ;
|
||||
MakeLocate $(HAIKU_CD) : $(HAIKU_CD_DIR) ;
|
||||
|
||||
# Detect a hybrid GCC2/GCC4 image.
|
||||
local isHybridBuild ;
|
||||
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
|
||||
isHybridBuild = 1 ;
|
||||
}
|
||||
|
||||
# prepare the script that initializes the shell variables
|
||||
HAIKU_CD_INIT_VARIABLES_SCRIPT = <HaikuCD>haiku.cd-init-vars ;
|
||||
local script = $(HAIKU_CD_INIT_VARIABLES_SCRIPT) ;
|
||||
|
||||
+91
-108
@@ -47,14 +47,14 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bzip2
|
||||
mkfifo mkfs mkindex mktemp modifiers mount mount_nfs mountvolume mv
|
||||
netcat netstat nl nohup notify nproc
|
||||
od open
|
||||
passwd paste patch pathchk pc ping ping6 play playfile playsound playwav
|
||||
pr prio printenv printf profile ps ptx pwd
|
||||
package package_repo passwd paste patch pathchk pc ping ping6 pkgman play
|
||||
playfile playsound playwav pr prio printenv printf profile ps ptx pwd
|
||||
query quit
|
||||
rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
|
||||
rmindex rmdir roster route
|
||||
safemode screen_blanker screenmode screenshot sdiff setdecor settype
|
||||
setversion setvolume seq sha1sum shar shred shuf shutdown sleep sort
|
||||
spamdbm
|
||||
setversion setvolume seq sha1sum sha256sum shar shred shuf shutdown sleep
|
||||
sort spamdbm
|
||||
split stat strace stty su sum sync sysinfo
|
||||
tac tail tcpdump tcptester tee telnet telnetd test timeout top touch
|
||||
tput tr traceroute translate trash true truncate tsort tty
|
||||
@@ -89,8 +89,8 @@ SYSTEM_LIBS =
|
||||
liblocale.so
|
||||
libmail.so libmedia.so libmidi.so libmidi2.so
|
||||
libnetwork.so
|
||||
libpng.so
|
||||
<revisioned>libroot.so libroot-addon-icu.so
|
||||
libpackage.so libpng.so
|
||||
<revisioned>libroot.so
|
||||
libscreensaver.so
|
||||
libtextencoding.so libtiff.so libtracker.so libtranslation.so
|
||||
libz.so
|
||||
@@ -101,6 +101,7 @@ PRIVATE_SYSTEM_LIBS =
|
||||
libfluidsynth.so
|
||||
libilmimf.so
|
||||
liblpsolve55.so
|
||||
libroot-addon-icu.so
|
||||
;
|
||||
SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
|
||||
media_addon_server media_server midi_server mount_server net_server
|
||||
@@ -190,8 +191,8 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
|
||||
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
|
||||
$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
|
||||
;
|
||||
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs
|
||||
attribute_overlay write_overlay ntfs reiserfs udf googlefs ;
|
||||
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs
|
||||
attribute_overlay write_overlay ntfs packagefs reiserfs udf googlefs ;
|
||||
|
||||
# wifi firmware
|
||||
for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
|
||||
@@ -232,7 +233,8 @@ AddFilesToHaikuImage system add-ons kernel busses scsi
|
||||
: ahci ;
|
||||
AddFilesToHaikuImage system add-ons kernel busses usb
|
||||
: <usb>uhci <usb>ohci <usb>ehci ;
|
||||
AddFilesToHaikuImage system add-ons kernel console : vga_text ;
|
||||
AddFilesToHaikuImage system add-ons kernel console
|
||||
: vga_text ;
|
||||
AddFilesToHaikuImage system add-ons kernel debugger
|
||||
: <kdebug>demangle $(X86_ONLY)<kdebug>disasm
|
||||
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ;
|
||||
@@ -241,13 +243,16 @@ AddFilesToHaikuImage system add-ons kernel file_systems
|
||||
AddFilesToHaikuImage system add-ons kernel generic
|
||||
: $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
|
||||
scsi_periph <module>tty ;
|
||||
AddFilesToHaikuImage system add-ons kernel partitioning_systems
|
||||
AddFilesToHaikuImage
|
||||
system add-ons kernel partitioning_systems
|
||||
: amiga_rdb apple efi_gpt intel session ;
|
||||
AddFilesToHaikuImage system add-ons kernel interrupt_controllers
|
||||
AddFilesToHaikuImage
|
||||
system add-ons kernel interrupt_controllers
|
||||
: $(PPC_ONLY)openpic ;
|
||||
|
||||
if $(TARGET_ARCH) = x86 {
|
||||
AddFilesToHaikuImage system add-ons kernel cpu : generic_x86 ;
|
||||
AddFilesToHaikuImage system add-ons kernel cpu
|
||||
: generic_x86 ;
|
||||
}
|
||||
|
||||
# drivers
|
||||
@@ -276,10 +281,11 @@ AddDriversToHaikuImage ports : usb_serial ;
|
||||
#AddDriversToHaikuImage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
|
||||
|
||||
# kernel
|
||||
AddFilesToHaikuImage system : <revisioned>kernel_$(TARGET_ARCH) ;
|
||||
AddFilesToHaikuImage system
|
||||
: <revisioned>kernel_$(TARGET_ARCH) ;
|
||||
|
||||
# libs
|
||||
AddLibrariesToHaikuHybridImage system lib
|
||||
AddLibrariesToHaikuImage system lib
|
||||
: $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
|
||||
|
||||
# libnetwork.so replaces quite a few libraries
|
||||
@@ -289,12 +295,12 @@ SYSTEM_LIBS_LIBNETWORK_ALIASES
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
local lib ;
|
||||
for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
|
||||
AddSymlinkToHaikuHybridImage system lib : libnetwork.so : $(lib)
|
||||
: : true ;
|
||||
AddSymlinkToHaikuImage system lib
|
||||
: libnetwork.so : $(lib) ;
|
||||
}
|
||||
|
||||
AddSymlinkToHaikuHybridImage system lib : libbnetapi.so : libnetapi.so
|
||||
: : true ;
|
||||
AddSymlinkToHaikuImage system lib : libbnetapi.so
|
||||
: libnetapi.so ;
|
||||
}
|
||||
|
||||
|
||||
@@ -305,7 +311,8 @@ SYSTEM_LIBS_LIBGL_ALIASES
|
||||
if $(TARGET_ARCH) = x86 {
|
||||
local lib ;
|
||||
for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
|
||||
AddSymlinkToHaikuHybridImage system lib : libGL.so : $(lib) : : true ;
|
||||
AddSymlinkToHaikuImage system lib
|
||||
: libGL.so : $(lib) ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -319,10 +326,12 @@ SYSTEM_LIBS_ALIASES =
|
||||
AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
|
||||
|
||||
# apps
|
||||
AddFilesToHaikuImage system : runtime_loader Deskbar Tracker ;
|
||||
AddFilesToHaikuImage system : runtime_loader ;
|
||||
AddFilesToHaikuImage system : Deskbar Tracker ;
|
||||
AddFilesToHaikuImage system bin : $(SYSTEM_BIN) consoled ;
|
||||
AddFilesToHaikuImage system apps : $(SYSTEM_APPS) ;
|
||||
AddFilesToHaikuImage system preferences : $(SYSTEM_PREFERENCES) ;
|
||||
AddFilesToHaikuImage system preferences
|
||||
: $(SYSTEM_PREFERENCES) ;
|
||||
AddFilesToHaikuImage system demos : $(SYSTEM_DEMOS) ;
|
||||
|
||||
SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||
@@ -330,15 +339,18 @@ AddFilesToHaikuImage system bin : which ;
|
||||
SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||
AddFilesToHaikuImage system bin : installoptionalpackage ;
|
||||
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||
AddFilesToHaikuImage system bin : install-wifi-firmwares.sh ;
|
||||
AddFilesToHaikuImage system bin
|
||||
: install-wifi-firmwares.sh ;
|
||||
|
||||
# TODO: remove!
|
||||
# Add the files to be used by installoptionalpackage.
|
||||
AddDirectoryToHaikuImage common 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 data optional-packages
|
||||
: $(file) ;
|
||||
}
|
||||
AddInstalledPackagesFileToHaikuImage ;
|
||||
|
||||
@@ -352,8 +364,9 @@ AddDirectoryToHaikuImage home mail draft ;
|
||||
AddDirectoryToHaikuImage home mail in ;
|
||||
AddDirectoryToHaikuImage home mail out ;
|
||||
|
||||
AddSymlinkToHaikuImage home config settings : deskbar : be ;
|
||||
# Deskbar Application links
|
||||
AddDirectoryToHaikuImage home config be Applications ;
|
||||
AddDirectoryToHaikuImage home config settings deskbar Applications ;
|
||||
DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
|
||||
Devices DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Installer
|
||||
Magnify Mail MediaConverter MediaPlayer MidiPlayer People PoorMan
|
||||
@@ -361,32 +374,33 @@ DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
|
||||
;
|
||||
local linkTarget ;
|
||||
for linkTarget in $(DESKBAR_APPLICATIONS) {
|
||||
AddSymlinkToHaikuImage home config be Applications
|
||||
AddSymlinkToHaikuImage home config settings deskbar Applications
|
||||
: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
|
||||
}
|
||||
|
||||
# Deskbar Desktop applets links
|
||||
AddDirectoryToHaikuImage home config be Desktop\ applets ;
|
||||
AddDirectoryToHaikuImage home config settings deskbar Desktop\ applets ;
|
||||
DESKBAR_DESKTOP_APPLETS = LaunchBox NetworkStatus PowerStatus ProcessController
|
||||
Workspaces
|
||||
;
|
||||
for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {
|
||||
AddSymlinkToHaikuImage home config be Desktop\ applets
|
||||
AddSymlinkToHaikuImage home config settings deskbar Desktop\ applets
|
||||
: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
|
||||
}
|
||||
|
||||
# Deskbar Preferences links
|
||||
AddDirectoryToHaikuImage home config be Preferences ;
|
||||
AddDirectoryToHaikuImage home config settings deskbar Preferences ;
|
||||
DESKBAR_PREFERENCES = $(SYSTEM_PREFERENCES:B) ;
|
||||
for linkTarget in $(DESKBAR_PREFERENCES) {
|
||||
AddSymlinkToHaikuImage home config be Preferences
|
||||
: /boot/system/preferences/$(linkTarget) : $(linkTarget) ;
|
||||
AddSymlinkToHaikuImage home config settings deskbar Preferences
|
||||
: /boot/system/preferences/$(linkTarget)
|
||||
: $(linkTarget) ;
|
||||
}
|
||||
|
||||
# Deskbar Demo links
|
||||
AddDirectoryToHaikuImage home config be Demos ;
|
||||
AddDirectoryToHaikuImage home config settings deskbar Demos ;
|
||||
for linkTarget in $(SYSTEM_DEMOS) {
|
||||
AddSymlinkToHaikuImage home config be Demos
|
||||
AddSymlinkToHaikuImage home config settings deskbar Demos
|
||||
: /boot/system/demos/$(linkTarget) : $(linkTarget) ;
|
||||
}
|
||||
|
||||
@@ -431,14 +445,15 @@ local spellFiles = words geekspeak ;
|
||||
spellFiles = $(spellFiles:G=spell) ;
|
||||
SEARCH on $(spellFiles)
|
||||
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
|
||||
AddFilesToHaikuImage system data spell_check word_dictionary : $(spellFiles) ;
|
||||
AddFilesToHaikuImage system data spell_check word_dictionary
|
||||
: $(spellFiles) ;
|
||||
|
||||
local etcDir = [ FDirName $(HAIKU_TOP) data etc ] ;
|
||||
local etcFiles = inputrc profile ;
|
||||
etcFiles = $(etcFiles:G=etc) ;
|
||||
SEARCH on $(etcFiles) = [ FDirName $(etcDir) ] ;
|
||||
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
|
||||
AddFilesToHaikuImage common etc : $(etcFiles) ;
|
||||
AddFilesToHaikuImage common settings etc : $(etcFiles) ;
|
||||
|
||||
local profileFiles = [ Glob $(etcDir)/profile.d : *.sh ] ;
|
||||
profileFiles = $(profileFiles:G=profile-d) ;
|
||||
@@ -477,9 +492,11 @@ 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 default
|
||||
: $(cannaDefault) ;
|
||||
AddFilesToHaikuImage system data Canna dic : $(cannaDic) ;
|
||||
AddFilesToHaikuImage system data Canna dic canna : $(cannaDicCanna) ;
|
||||
AddFilesToHaikuImage system data Canna dic canna
|
||||
: $(cannaDicCanna) ;
|
||||
AddDirectoryToHaikuImage system data Canna dic group ;
|
||||
AddDirectoryToHaikuImage system data Canna dic user ;
|
||||
|
||||
@@ -487,14 +504,18 @@ 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 ;
|
||||
AddSymlinkToHaikuImage system data Keymaps : Swedish
|
||||
: Finnish ;
|
||||
AddSymlinkToHaikuImage system data Keymaps : Slovene
|
||||
: Croatian ;
|
||||
AddSymlinkToHaikuImage system 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 data KeyboardLayouts
|
||||
: $(keyboardLayouts) ;
|
||||
|
||||
local driverSettingsFiles = <driver-settings>kernel ;
|
||||
SEARCH on $(driverSettingsFiles)
|
||||
@@ -515,7 +536,8 @@ SEARCH on $(postInstallFiles)
|
||||
= [ 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 boot post_install
|
||||
: $(postInstallFiles) ;
|
||||
AddFilesToHaikuImage common settings : <post-install>fresh_install ;
|
||||
|
||||
# boot loader
|
||||
@@ -538,20 +560,27 @@ AddBootModuleSymlinksToHaikuImage
|
||||
# add-ons
|
||||
AddFilesToHaikuImage system add-ons accelerants
|
||||
: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
|
||||
AddFilesToHaikuHybridImage system add-ons opengl
|
||||
: Mesa\ Software\ Renderer : : true ;
|
||||
AddFilesToHaikuHybridImage system add-ons Translators
|
||||
: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
|
||||
AddFilesToHaikuImage system add-ons opengl
|
||||
: Mesa\ Software\ Renderer ;
|
||||
AddFilesToHaikuImage system add-ons Translators
|
||||
: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
|
||||
AddFilesToHaikuImage system add-ons locale catalogs
|
||||
: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
|
||||
AddFilesToHaikuHybridImage system 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 add-ons locale catalogs
|
||||
: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
|
||||
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
|
||||
: 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 mail_daemon outbound_filters
|
||||
: Fortune ;
|
||||
AddFilesToHaikuImage system add-ons media
|
||||
: $(SYSTEM_ADD_ONS_MEDIA) ;
|
||||
AddFilesToHaikuImage system add-ons media plugins
|
||||
: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
|
||||
AddFilesToHaikuImage system add-ons Tracker
|
||||
@@ -571,13 +600,15 @@ AddFilesToHaikuImage system add-ons kernel network
|
||||
: <net>notifications stack ;
|
||||
AddFilesToHaikuImage system add-ons kernel network devices
|
||||
: $(SYSTEM_NETWORK_DEVICES) ;
|
||||
AddFilesToHaikuImage system add-ons kernel network datalink_protocols
|
||||
AddFilesToHaikuImage
|
||||
system add-ons kernel network datalink_protocols
|
||||
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
|
||||
AddFilesToHaikuImage system add-ons kernel network ppp
|
||||
: $(SYSTEM_NETWORK_PPP) ;
|
||||
AddFilesToHaikuImage system add-ons kernel network protocols
|
||||
: $(SYSTEM_NETWORK_PROTOCOLS) ;
|
||||
AddFilesToHaikuImage system add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
|
||||
AddFilesToHaikuImage system add-ons Print
|
||||
: $(SYSTEM_ADD_ONS_PRINT) ;
|
||||
AddFilesToHaikuImage system add-ons Print transport
|
||||
: $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
|
||||
AddFilesToHaikuImage system add-ons Screen\ Savers
|
||||
@@ -593,15 +624,17 @@ AddFilesToHaikuImage home config add-ons decorators :
|
||||
|
||||
# create directories that will remain empty
|
||||
AddDirectoryToHaikuImage common bin ;
|
||||
AddDirectoryToHaikuImage common include ;
|
||||
AddDirectoryToHaikuImage common cache tmp ;
|
||||
AddDirectoryToHaikuImage common develop headers ;
|
||||
AddDirectoryToHaikuImage common lib ;
|
||||
AddDirectoryToHaikuImage common non-packaged ;
|
||||
AddDirectoryToHaikuImage common var empty ;
|
||||
AddDirectoryToHaikuImage common var log ;
|
||||
AddDirectoryToHaikuImage home Desktop ;
|
||||
AddDirectoryToHaikuImage home config bin ;
|
||||
AddDirectoryToHaikuImage home config lib ;
|
||||
AddDirectoryToHaikuImage home config non-packaged ;
|
||||
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 ;
|
||||
@@ -688,49 +721,6 @@ if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) {
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - Alternative GCC Libraries
|
||||
|
||||
|
||||
# We build a zip archive containing the libraries built with the alternative
|
||||
# GCC and unzip onto our image. Building the archive is done by a sub-jam.
|
||||
include [ FDirName $(HAIKU_BUILD_RULES_DIR) AlternativeGCCArchive ] ;
|
||||
|
||||
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
|
||||
# let another jam build a zip with the system libraries
|
||||
rule InvokeSubJam target : directory : jamLine
|
||||
{
|
||||
DIRECTORY on $(target) = $(directory) ;
|
||||
COMMAND_LINE on $(target) = $(jamLine) ;
|
||||
local optionalPackages = $(HAIKU_ADDED_OPTIONAL_PACKAGES:J=/) ;
|
||||
OPTIONAL_PACKAGES on $(target) = $(optionalPackages:E="") ;
|
||||
Always $(target) ;
|
||||
InvokeSubJam1 $(target) ;
|
||||
}
|
||||
|
||||
actions InvokeSubJam1
|
||||
{
|
||||
cd $(DIRECTORY)
|
||||
export HAIKU_IGNORE_USER_BUILD_CONFIG=1
|
||||
export HAIKU_ADD_OPTIONAL_PACKAGES=$(OPTIONAL_PACKAGES)
|
||||
export HAIKU_PRIMARY_GCC=$(HAIKU_GCC_VERSION[1])
|
||||
$(JAM:E=jam) -q $(COMMAND_LINE) ;
|
||||
}
|
||||
|
||||
local otherAlternativeSystemLibsZip
|
||||
= <other-image>alternative_system_libs.zip ;
|
||||
MakeLocate $(otherAlternativeSystemLibsZip)
|
||||
: $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) ;
|
||||
|
||||
InvokeSubJam $(otherAlternativeSystemLibsZip)
|
||||
: $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR)
|
||||
: "haiku-alternative-gcc-archive" ;
|
||||
|
||||
# install the alternative libs in the right directory
|
||||
ExtractArchiveToHaikuImage : $(otherAlternativeSystemLibsZip) ;
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - User/Group Setup
|
||||
|
||||
|
||||
@@ -778,13 +768,6 @@ HAIKU_INSTALL_DIR ?= $(HAIKU_DEFAULT_INSTALL_DIR) ;
|
||||
# the pseudo target all image contents is attached to
|
||||
NotFile $(HAIKU_IMAGE_CONTAINER_NAME) ;
|
||||
|
||||
# Detect a hybrid GCC2/GCC4 image.
|
||||
local isHybridBuild ;
|
||||
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
|
||||
isHybridBuild = 1 ;
|
||||
}
|
||||
|
||||
# prepare the script that initializes the shell variables
|
||||
HAIKU_IMAGE_INIT_VARIABLES_SCRIPT = <HaikuImage>haiku.image-init-vars ;
|
||||
local script = $(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT) ;
|
||||
|
||||
+30
-144
@@ -195,7 +195,8 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
|
||||
if $(catalogs) {
|
||||
local signature
|
||||
= [ on $(target) return $(HAIKU_CATALOG_SIGNATURE) ] ;
|
||||
AddFilesToHaikuImage system data locale catalogs $(signature)
|
||||
AddFilesToHaikuImage
|
||||
system data locale catalogs $(signature)
|
||||
: $(catalogs) ;
|
||||
}
|
||||
}
|
||||
@@ -302,7 +303,8 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
|
||||
local directoryTokens = system add-ons kernel drivers dev
|
||||
$(relativeDirectoryTokens) ;
|
||||
|
||||
AddFilesToContainer $(container) : system add-ons kernel drivers bin
|
||||
AddFilesToContainer $(container)
|
||||
: system add-ons kernel drivers bin
|
||||
: $(targets) ;
|
||||
|
||||
# If the image shall only be updated, we don't add any symlinks.
|
||||
@@ -367,7 +369,8 @@ rule AddBootModuleSymlinksToContainer container : targets
|
||||
local name = $(target:BS) ;
|
||||
local linkTarget = [ FDirName /boot $(installDir:G=) $(name) ] ;
|
||||
|
||||
AddSymlinkToContainer $(container) : system add-ons kernel boot
|
||||
AddSymlinkToContainer $(container)
|
||||
: system add-ons kernel boot
|
||||
: $(linkTarget) : $(name) ;
|
||||
}
|
||||
}
|
||||
@@ -672,6 +675,8 @@ rule AddSymlinkToHaikuImage directoryTokens : linkTarget : linkName
|
||||
{
|
||||
# AddSymlinkToHaikuImage <directory> : <link target> [ : <link name> ] ;
|
||||
|
||||
linkTarget = $(linkTarget:J=/) ;
|
||||
|
||||
AddSymlinkToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(directoryTokens)
|
||||
: $(linkTarget) : $(linkName) ;
|
||||
}
|
||||
@@ -704,7 +709,7 @@ rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
|
||||
# AddHeaderDirectoryToHaikuImage <dirTokens> : [ <dirName> ]
|
||||
# : <alwaysUpdate> ;
|
||||
|
||||
CopyDirectoryToHaikuImage develop headers
|
||||
CopyDirectoryToHaikuImage system develop headers
|
||||
: [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
|
||||
: $(dirName) : -x .svn : $(alwaysUpdate) ;
|
||||
}
|
||||
@@ -822,6 +827,15 @@ rule InstallSourceArchive file : url
|
||||
}
|
||||
}
|
||||
|
||||
rule InstallCommonPackage package : url
|
||||
{
|
||||
# download archive file
|
||||
local archiveFile = [ DownloadFile $(package) : $(url) ] ;
|
||||
|
||||
# copy onto image
|
||||
ExtractArchiveToHaikuImage common packages : $(archiveFile) ;
|
||||
}
|
||||
|
||||
rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
|
||||
{
|
||||
# download archive file
|
||||
@@ -850,7 +864,7 @@ rule AddEntryToHaikuImageUserGroupFile file : entry
|
||||
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) ;
|
||||
@@ -917,7 +931,8 @@ rule AddExpanderRuleToHaikuImage mimetype : extension : list : extract
|
||||
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) ;
|
||||
}
|
||||
@@ -930,7 +945,8 @@ rule AddInstalledPackagesFileToHaikuImage
|
||||
Always $(file) ;
|
||||
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
|
||||
BuildHaikuImageInstalledPackagesFile $(file) ;
|
||||
AddFilesToHaikuImage common data optional-packages : $(file) ;
|
||||
AddFilesToHaikuImage common data optional-packages
|
||||
: $(file) ;
|
||||
}
|
||||
|
||||
actions BuildHaikuImageInstalledPackagesFile
|
||||
@@ -957,7 +973,8 @@ rule AddLicenseToHaikuImage file : name : searchPath
|
||||
name = ;
|
||||
}
|
||||
|
||||
AddFilesToHaikuImage system data licenses : $(file) : $(name) ;
|
||||
AddFilesToHaikuImage system data licenses : $(file)
|
||||
: $(name) ;
|
||||
}
|
||||
|
||||
|
||||
@@ -1116,138 +1133,9 @@ actions BuildNetBootArchive1
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - Alternative GCC Archive rules
|
||||
|
||||
|
||||
rule AddDirectoryToAlternativeGCCArchive directoryTokens
|
||||
rule AddLibrariesToHaikuImage directory : libs
|
||||
{
|
||||
# AddDirectoryToAlternativeGCCArchive <directoryTokens>
|
||||
|
||||
return [ AddDirectoryToContainer
|
||||
$(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME) : $(directoryTokens) ] ;
|
||||
}
|
||||
|
||||
rule AddFilesToAlternativeGCCArchive directory : targets : destName
|
||||
{
|
||||
# AddFilesToAlternativeGCCArchive <directory> : <targets> [ : dest name ]
|
||||
|
||||
AddFilesToContainer $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME)
|
||||
: $(directory) : $(targets) : $(destName) ;
|
||||
}
|
||||
|
||||
rule AddSymlinkToAlternativeGCCArchive directoryTokens : linkTarget : linkName
|
||||
{
|
||||
# AddSymlinkToAlternativeGCCArchive <directory> : <link target>
|
||||
# [ : <link name> ] ;
|
||||
|
||||
AddSymlinkToContainer $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME)
|
||||
: $(directoryTokens) : $(linkTarget) : $(linkName) ;
|
||||
}
|
||||
|
||||
rule CopyDirectoryToAlternativeGCCArchive directoryTokens : sourceDirectory
|
||||
: targetDirectoryName : excludePatterns : alwaysUpdate
|
||||
{
|
||||
CopyDirectoryToContainer $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME)
|
||||
: $(directoryTokens) : $(sourceDirectory) : $(targetDirectoryName)
|
||||
: $(excludePatterns) : $(alwaysUpdate) ;
|
||||
}
|
||||
|
||||
rule CreateAlternativeGCCArchiveMakeDirectoriesScript script
|
||||
{
|
||||
CreateContainerMakeDirectoriesScript
|
||||
$(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME) : $(script) ;
|
||||
}
|
||||
|
||||
rule CreateAlternativeGCCArchiveCopyFilesScript script
|
||||
{
|
||||
CreateContainerCopyFilesScript
|
||||
$(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME) : $(script) ;
|
||||
}
|
||||
|
||||
rule BuildAlternativeGCCArchive archive : scripts
|
||||
{
|
||||
# BuildAlternativeGCCArchive <archive> : <scripts> ;
|
||||
|
||||
local mainScript = build_archive ;
|
||||
SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ;
|
||||
|
||||
Depends $(archive) : $(mainScript) $(scripts) ;
|
||||
BuildAlternativeGCCArchive1 $(archive) : $(mainScript) $(scripts) ;
|
||||
}
|
||||
|
||||
actions BuildAlternativeGCCArchive1
|
||||
{
|
||||
$(2[1]) $(1) $(2[2-])
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - Haiku Hybrid Image rules
|
||||
|
||||
|
||||
rule AddFilesToHaikuHybridImage directory : targets : destName
|
||||
: useABISubDir
|
||||
{
|
||||
# AddFilesToHaikuHybridImage <directory> : <targets> : <destName>
|
||||
# : <useABISubDir>
|
||||
#
|
||||
# Convenience rule calling both AddFilesToHaikuImage and
|
||||
# AddFilesToAlternativeGCCArchive.
|
||||
#
|
||||
# <useABISubDir>
|
||||
# if non-empty, specifies that an ABI subdirectory shall be appended to
|
||||
# <directory> for the alternative GCC archive.
|
||||
|
||||
local alternativeSubDir ;
|
||||
if $(useABISubDir) {
|
||||
alternativeSubDir = gcc$(HAIKU_GCC_VERSION[1]) ;
|
||||
}
|
||||
|
||||
AddFilesToHaikuImage $(directory) : $(targets) : $(destName) ;
|
||||
AddFilesToAlternativeGCCArchive $(directory) $(alternativeSubDir)
|
||||
: $(targets) : $(destName) ;
|
||||
}
|
||||
|
||||
rule AddSymlinkToHaikuHybridImage directoryTokens : linkTarget : linkName
|
||||
: useSymlinkTargetABISubDir : useABISubDir
|
||||
{
|
||||
# AddSymlinkToHaikuHybridImage <directoryTokens> : <linkTarget> : <linkName>
|
||||
# [ : <useSymlinkTargetABISubDir> [ : <useABISubDir> ] ]
|
||||
#
|
||||
# Convenience rule calling both AddSymlinkToHaikuImage and
|
||||
# AddSymlinkToAlternativeGCCArchive.
|
||||
#
|
||||
# <linkTarget>
|
||||
# Can be a list of components that will be joined to path inserting
|
||||
# "/"s inbetween.
|
||||
# <useSymlinkTargetABISubDir>
|
||||
# If non-empty, specifies that an ABI subdirectory shall be inserted
|
||||
# into <linkTarget> (between the first and second component) for the
|
||||
# alternative GCC archive.
|
||||
# <useABISubDir>
|
||||
# If non-empty, specifies that an ABI subdirectory part shall be appended
|
||||
# to the directory tokens for the alternative GCC archive.
|
||||
|
||||
local alternativeDirTokens = $(directoryTokens) ;
|
||||
if $(useABISubDir) {
|
||||
alternativeDirTokens += gcc$(HAIKU_GCC_VERSION[1]) ;
|
||||
}
|
||||
|
||||
local alternativeLinkTarget = $(linkTarget) ;
|
||||
if $(useSymlinkTargetABISubDir) {
|
||||
alternativeLinkTarget = $(linkTarget[1]) gcc$(HAIKU_GCC_VERSION[1])
|
||||
$(linkTarget[2-]) ;
|
||||
}
|
||||
linkTarget = $(linkTarget:J=/) ;
|
||||
alternativeLinkTarget = $(alternativeLinkTarget:J=/) ;
|
||||
|
||||
AddSymlinkToHaikuImage $(directoryTokens) : $(linkTarget) : $(linkName) ;
|
||||
AddSymlinkToAlternativeGCCArchive $(alternativeDirTokens)
|
||||
: $(alternativeLinkTarget) : $(linkName) ;
|
||||
}
|
||||
|
||||
rule AddLibrariesToHaikuHybridImage directory : libs
|
||||
{
|
||||
# AddLibraryToHaikuHybridImage <directory> : <libs>
|
||||
# AddLibraryToHaikuImage <directory> : <libs>
|
||||
#
|
||||
# Installs libraries with the appropriate links onto the image.
|
||||
#
|
||||
@@ -1257,12 +1145,10 @@ rule AddLibrariesToHaikuHybridImage directory : libs
|
||||
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
|
||||
if $(abiVersion) {
|
||||
local abiVersionedLib = $(lib).$(abiVersion) ;
|
||||
AddFilesToHaikuHybridImage $(directory)
|
||||
: $(lib) : $(abiVersionedLib) : true ;
|
||||
AddSymlinkToHaikuHybridImage $(directory)
|
||||
: $(abiVersionedLib) : $(lib) : : true ;
|
||||
AddFilesToHaikuImage $(directory) : $(lib) : $(abiVersionedLib) ;
|
||||
AddSymlinkToHaikuImage $(directory) : $(abiVersionedLib) : $(lib) ;
|
||||
} else {
|
||||
AddFilesToHaikuHybridImage $(directory) : $(lib) : : true ;
|
||||
AddFilesToHaikuImage $(directory) : $(lib) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,18 +50,22 @@ AddFilesToNetBootArchive system add-ons kernel busses ide
|
||||
: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
|
||||
AddFilesToNetBootArchive system add-ons kernel busses scsi
|
||||
: ahci ;
|
||||
AddFilesToNetBootArchive system add-ons kernel console : vga_text ;
|
||||
AddFilesToNetBootArchive system add-ons kernel console
|
||||
: vga_text ;
|
||||
AddFilesToNetBootArchive system add-ons kernel file_systems
|
||||
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
|
||||
AddFilesToNetBootArchive system 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 add-ons kernel partitioning_systems
|
||||
: intel session ;
|
||||
AddFilesToNetBootArchive system add-ons kernel interrupt_controllers
|
||||
AddFilesToNetBootArchive
|
||||
system add-ons kernel interrupt_controllers
|
||||
: $(PPC_ONLY)openpic ;
|
||||
|
||||
if $(TARGET_ARCH) = x86 {
|
||||
AddFilesToNetBootArchive system add-ons kernel cpu : generic_x86 ;
|
||||
AddFilesToNetBootArchive system add-ons kernel cpu
|
||||
: generic_x86 ;
|
||||
}
|
||||
|
||||
# drivers
|
||||
@@ -71,7 +75,8 @@ AddDriversToNetBootArchive disk virtual : remote_disk ;
|
||||
AddDriversToNetBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
|
||||
|
||||
# kernel
|
||||
AddFilesToNetBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
|
||||
AddFilesToNetBootArchive system
|
||||
: <revisioned>kernel_$(TARGET_ARCH) ;
|
||||
|
||||
# scripts and data files
|
||||
|
||||
@@ -86,11 +91,13 @@ AddFilesToNetBootArchive system add-ons kernel network
|
||||
: <net>notifications stack ;
|
||||
AddFilesToNetBootArchive system add-ons kernel network devices
|
||||
: $(SYSTEM_NETWORK_DEVICES) ;
|
||||
AddFilesToNetBootArchive system add-ons kernel network datalink_protocols
|
||||
AddFilesToNetBootArchive
|
||||
system add-ons kernel network datalink_protocols
|
||||
: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
|
||||
AddFilesToNetBootArchive system add-ons kernel network ppp
|
||||
: $(SYSTEM_NETWORK_PPP) ;
|
||||
AddFilesToNetBootArchive system add-ons kernel network protocols
|
||||
AddFilesToNetBootArchive
|
||||
system add-ons kernel network protocols
|
||||
: $(SYSTEM_NETWORK_PROTOCOLS) ;
|
||||
|
||||
# boot module links
|
||||
|
||||
@@ -2,15 +2,6 @@
|
||||
# It is directly included from HaikuImage -- all variables defined there can
|
||||
# be used
|
||||
|
||||
# Detect a hybrid GCC2/GCC4 image and disable the checks for unavailable GCC4
|
||||
# packages. (It does not matter if a package was built with either compiler,
|
||||
# the system should have the respective other system libs.)
|
||||
local isHybridBuild ;
|
||||
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
|
||||
isHybridBuild = 1 ;
|
||||
}
|
||||
|
||||
|
||||
# Available Optional Lib Packages:
|
||||
# AllegroLibs
|
||||
@@ -65,7 +56,7 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package box2d available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
box2d-2.1.2-r1a3-r1a3-x86-gcc4-2011-05-26.zip
|
||||
: $(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-26.zip
|
||||
|
||||
+96
-132
@@ -2,15 +2,6 @@
|
||||
# It is directly included from HaikuImage -- all variables defined there can
|
||||
# be used
|
||||
|
||||
# Detect a hybrid GCC2/GCC4 image and disable the checks for unavailable GCC4
|
||||
# packages. (It does not matter if a package was built with either compiler,
|
||||
# the system should have the respective other system libs.)
|
||||
local isHybridBuild ;
|
||||
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
|
||||
isHybridBuild = 1 ;
|
||||
}
|
||||
|
||||
|
||||
# Available Optional Packages:
|
||||
# ABI-compliance-checker - tool for checking ABI compatibility between libs
|
||||
@@ -99,7 +90,7 @@ local baseSourceURL = http://haiku-files.org/files/sources ;
|
||||
|
||||
# ABI-compliance-checker
|
||||
if [ IsOptionalHaikuImagePackageAdded ABI-compliance-checker ] {
|
||||
if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
|
||||
if $(HAIKU_GCC_VERSION[1]) < 4 {
|
||||
Echo "No optional package ABI-compliance-checker for gcc2" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
@@ -114,12 +105,12 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package APR available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
apr-1.4.2-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/apr-1.4.2-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip
|
||||
: $(baseURL)/apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip
|
||||
: : true ;
|
||||
@@ -132,12 +123,12 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
apr-util-1.3.10-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip
|
||||
: $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip
|
||||
: : true ;
|
||||
@@ -149,10 +140,10 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package ArmyKnife available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package ArmyKnife for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
armyknife-63-r1a3-x86-gcc2-2011-06-04.zip
|
||||
: $(baseURL)/armyknife-63-r1a3-x86-gcc2-2011-06-04.zip ;
|
||||
AddSymlinkToHaikuImage home config be Applications
|
||||
@@ -181,7 +172,7 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
|
||||
Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
beae-22-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
} else {
|
||||
@@ -199,7 +190,7 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded Beam ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Beam available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package Beam available for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage Beam-1.2alpha-x86-gcc2-2010-04-29.zip
|
||||
@@ -216,7 +207,8 @@ if [ IsOptionalHaikuImagePackageAdded BeBook ] {
|
||||
: $(baseURL)/bebook_20081026.zip
|
||||
: system documentation ;
|
||||
AddSymlinkToHaikuImage home Desktop
|
||||
: /boot/system/documentation/bebook/index.html : BeBook ;
|
||||
: /boot/system/documentation/bebook/index.html
|
||||
: BeBook ;
|
||||
}
|
||||
|
||||
|
||||
@@ -224,7 +216,7 @@ if [ IsOptionalHaikuImagePackageAdded BeBook ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded BeHappy ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package BeHappy available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package BeHappy available for gcc4" ;
|
||||
} else {
|
||||
Echo "No optional package BeHappy available for gcc2" ;
|
||||
@@ -236,14 +228,15 @@ if [ IsOptionalHaikuImagePackageAdded BeHappy ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package BeOSCompatibility available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
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/apps ;
|
||||
AddSymlinkToHaikuImage beos : ../system/bin ;
|
||||
AddSymlinkToHaikuImage beos : ../system/documentation ;
|
||||
AddSymlinkToHaikuImage beos : ../common/etc ;
|
||||
AddSymlinkToHaikuImage beos
|
||||
: ../system/documentation ;
|
||||
AddSymlinkToHaikuImage beos : ../common/settings/etc ;
|
||||
AddSymlinkToHaikuImage beos : ../system/preferences ;
|
||||
AddSymlinkToHaikuImage beos : ../system ;
|
||||
AddDirectoryToHaikuImage var ;
|
||||
@@ -257,7 +250,7 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded BePDF ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package BePDF available for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
@@ -297,18 +290,21 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
|
||||
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 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 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 develop abi $(arch) $(abi) lib
|
||||
: /system/lib libbluetooth.so : : true ;
|
||||
AddSymlinkToHaikuImage system develop lib
|
||||
: /system/lib libbluetooth.so ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -407,7 +403,7 @@ if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded CLucene ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package CLucene available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) < 4 {
|
||||
Echo "No optional package CLucene available for GCC2" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
@@ -517,37 +513,20 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
|
||||
if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
|
||||
&& $(TARGET_ARCH) = x86 {
|
||||
# gcc and binutils
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
|
||||
InstallOptionalHaikuImagePackage
|
||||
gcc-2.95.3-r1a3-x86-gcc2-2010-08-18.zip
|
||||
: $(baseURL)/gcc-2.95.3-r1a3-x86-gcc2-2010-08-18.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 ;
|
||||
}
|
||||
InstallCommonPackage gcc-2.95.3_110304-1.hpkg
|
||||
: $(baseURL)/gcc-2.95.3_110304.hpkg ;
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
|
||||
InstallOptionalHaikuImagePackage
|
||||
gcc-4.5.3-r1a3-x86-gcc4-2011-06-20.zip
|
||||
: $(baseURL)/gcc-4.5.3-r1a3-x86-gcc4-2011-06-20.zip ;
|
||||
# TODO: remove this when we have a mechanism to switch gcc via PATH
|
||||
AddSymlinkToHaikuImage common settings develop tools
|
||||
: /boot/common/develop/tools/gcc-2.95.3-110304
|
||||
: current ;
|
||||
}
|
||||
|
||||
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.5.3-haiku-110620 lib
|
||||
: /system/lib $(lib) : : true ;
|
||||
}
|
||||
InstallOptionalHaikuImagePackage
|
||||
gcc-4.5.3-r1a3-x86-gcc4-2011-06-20.zip
|
||||
: $(baseURL)/gcc-4.5.3-r1a3-x86-gcc4-2011-06-20.zip ;
|
||||
}
|
||||
|
||||
# other commonly used tools
|
||||
@@ -606,7 +585,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentJava ] {
|
||||
InstallOptionalHaikuImagePackage
|
||||
jamvm-1.5.4-r1a3-x86-gcc4-2011-06-08.zip
|
||||
: $(baseURL)/jamvm-1.5.4-r1a3-x86-gcc4-2011-06-08.zip ;
|
||||
AddSymlinkToHaikuImage common bin : /boot/common/bin/jamvm : java ;
|
||||
AddSymlinkToHaikuImage common bin
|
||||
: /boot/common/bin/jamvm : java ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
ecj-3.6.2-haiku-2011-06-08.zip
|
||||
: $(baseURL)/ecj-3.6.2-haiku-2011-06-08.zip ;
|
||||
@@ -622,11 +602,10 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
||||
}
|
||||
|
||||
local arch = $(TARGET_ARCH) ;
|
||||
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
|
||||
local abiDirTokens = develop abi $(arch) $(abi) ;
|
||||
local developDirTokens = system 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
|
||||
@@ -635,44 +614,31 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
||||
;
|
||||
|
||||
# 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 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 ;
|
||||
|
||||
# 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 ;
|
||||
AddFilesToHaikuImage $(developDirTokens) lib : libposix_error_mapper.a ;
|
||||
|
||||
# ABI independent stuff
|
||||
|
||||
@@ -688,7 +654,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
||||
;
|
||||
SEARCH on $(makefileEngineFiles)
|
||||
= [ FDirName $(HAIKU_TOP) data develop ] ;
|
||||
AddFilesToHaikuImage develop etc : $(makefileEngineFiles) ;
|
||||
AddFilesToHaikuImage common develop etc
|
||||
: $(makefileEngineFiles) ;
|
||||
|
||||
# headers
|
||||
AddHeaderDirectoryToHaikuImage config ;
|
||||
@@ -697,7 +664,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
||||
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 ;
|
||||
@@ -715,10 +682,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
||||
# cpp headers
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
# GCC 2 only -- for GCC 4 they come with the DevelopmentBase package
|
||||
CopyDirectoryToHaikuImage $(abiDirTokens) headers
|
||||
: [ FDirName $(HAIKU_TOP) headers cpp ] : : -x .svn ;
|
||||
CopyDirectoryToAlternativeGCCArchive $(abiDirTokens) headers
|
||||
: [ FDirName $(HAIKU_TOP) headers cpp ] : : -x .svn ;
|
||||
CopyDirectoryToHaikuImage $(developDirTokens) headers c++
|
||||
: [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 : -x .svn ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -783,9 +748,13 @@ if [ IsOptionalHaikuImagePackageAdded Fastdep ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded friss ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package friss available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip
|
||||
: $(baseURL)/friss-0.5pre7-x86-gcc4.zip
|
||||
: : true ;
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
friss-24-r1a3-x86-gcc4-2011-05-31.zip
|
||||
: $(baseURL)/friss-24-r1a3-x86-gcc4-2011-05-31.zip ;
|
||||
} else {
|
||||
@@ -889,26 +858,14 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] {
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE)
|
||||
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
|
||||
: system lib ;
|
||||
if $(isHybridBuild) {
|
||||
# unzip gcc4 to gcc4 subdir
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_4_PACKAGE)
|
||||
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
|
||||
: system lib gcc4 ;
|
||||
}
|
||||
} else {
|
||||
# unzip gcc4
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_4_PACKAGE)
|
||||
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
|
||||
: system lib ;
|
||||
if $(isHybridBuild) {
|
||||
# unzip gcc2 to gcc2 subdir
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE)
|
||||
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
|
||||
: system lib gcc2 ;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# ICU-devel
|
||||
@@ -921,9 +878,9 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
|
||||
for abiVersionedLib in $(HAIKU_ICU_LIBS) {
|
||||
abiVersionedLib = $(abiVersionedLib:G=) ;
|
||||
local lib = $(abiVersionedLib:B) ;
|
||||
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
|
||||
: /system/lib $(abiVersionedLib) : : true ;
|
||||
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
|
||||
AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib
|
||||
: /system/lib $(abiVersionedLib) ;
|
||||
AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib
|
||||
: $(abiVersionedLib) : $(lib) ;
|
||||
}
|
||||
}
|
||||
@@ -991,7 +948,7 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package LibLayout available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package LibLayout available for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08.zip
|
||||
@@ -1005,11 +962,11 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip
|
||||
: $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip ;
|
||||
}
|
||||
@@ -1041,7 +998,7 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
: $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip
|
||||
@@ -1055,7 +1012,7 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded Links ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Links available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package Links available for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage Links.zip
|
||||
@@ -1093,7 +1050,7 @@ if [ IsOptionalHaikuImagePackageAdded Man ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
man-1.6f-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
: $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
man-1.6f-r1a3-x86-gcc2-2011-05-18.zip
|
||||
@@ -1167,11 +1124,13 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
|
||||
# NetFS network file system
|
||||
if [ IsOptionalHaikuImagePackageAdded NetFS ] {
|
||||
# userlandfs module
|
||||
AddFilesToHaikuImage home config add-ons userlandfs : netfs ;
|
||||
AddFilesToHaikuImage home config add-ons userlandfs
|
||||
: netfs ;
|
||||
|
||||
# servers
|
||||
AddFilesToHaikuImage system servers : netfs_server ;
|
||||
AddFilesToHaikuImage system servers : authentication_server ;
|
||||
AddFilesToHaikuImage system servers
|
||||
: authentication_server ;
|
||||
|
||||
# tools
|
||||
AddFilesToHaikuImage system bin : netfs_config ;
|
||||
@@ -1197,10 +1156,10 @@ if [ IsOptionalHaikuImagePackageAdded NetFS ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package NetSurf available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package NetSurf available for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip
|
||||
: $(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ;
|
||||
AddSymlinkToHaikuImage home config be Applications
|
||||
@@ -1213,7 +1172,7 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded OCaml ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package OCaml available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package OCaml available for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
@@ -1309,11 +1268,11 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] {
|
||||
Echo "No optional package Paladin available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip
|
||||
: $(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ;
|
||||
}
|
||||
@@ -1332,7 +1291,7 @@ if [ IsOptionalHaikuImagePackageAdded PCRE ] {
|
||||
Echo "No optional package PCRE available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip ;
|
||||
} else {
|
||||
@@ -1503,7 +1462,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip
|
||||
: $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ;
|
||||
: $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip
|
||||
@@ -1572,7 +1531,8 @@ if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
|
||||
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
|
||||
|
||||
# kernel module
|
||||
AddFilesToHaikuImage system add-ons kernel file_systems : userlandfs ;
|
||||
AddFilesToHaikuImage system add-ons kernel file_systems
|
||||
: userlandfs ;
|
||||
|
||||
# server
|
||||
AddFilesToHaikuImage system servers : userlandfs_server ;
|
||||
@@ -1583,7 +1543,7 @@ if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
|
||||
libuserlandfs_haiku_kernel.so
|
||||
libuserlandfs_fuse.so
|
||||
;
|
||||
AddFilesToHaikuHybridImage system lib : $(userlandfsLibs) : : true ;
|
||||
AddFilesToHaikuImage system lib : $(userlandfsLibs) ;
|
||||
|
||||
# development goodies
|
||||
if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] {
|
||||
@@ -1597,8 +1557,6 @@ if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
|
||||
for lib in $(userlandfsLibs) {
|
||||
AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib
|
||||
: /system/lib/$(lib:BS) ;
|
||||
AddSymlinkToAlternativeGCCArchive develop abi $(arch) $(abi) lib
|
||||
: /system/lib/$(arch)/$(lib:BS) ;
|
||||
}
|
||||
|
||||
# FUSE headers
|
||||
@@ -1650,7 +1608,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
|
||||
InstallOptionalHaikuImagePackage vision-908-r1a3-x86-gcc4-2011-06-07.zip
|
||||
: $(baseURL)/vision-908-r1a3-x86-gcc4-2011-06-07.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
InstallOptionalHaikuImagePackage
|
||||
vision-908-r1a3-x86-gcc2-2011-06-07.zip
|
||||
: $(baseURL)/vision-908-r1a3-x86-gcc2-2011-06-07.zip ;
|
||||
}
|
||||
@@ -1664,7 +1622,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package WebPositive available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) < 4 {
|
||||
Echo "No optional package WebPositive available for gcc2" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
@@ -1685,9 +1643,11 @@ if [ IsOptionalHaikuImagePackageAdded Welcome ] {
|
||||
: [ FDirName $(HAIKU_TOP) docs userguide ]
|
||||
: userguide : -x .svn ;
|
||||
AddSymlinkToHaikuImage home Desktop
|
||||
: /boot/system/documentation/welcome/welcome_en.html : Welcome ;
|
||||
: /boot/system/documentation/welcome/welcome_en.html
|
||||
: Welcome ;
|
||||
AddSymlinkToHaikuImage home Desktop
|
||||
: /boot/system/documentation/userguide/en/contents.html : User\ Guide ;
|
||||
: /boot/system/documentation/userguide/en/contents.html
|
||||
: User\ Guide ;
|
||||
}
|
||||
|
||||
|
||||
@@ -1707,18 +1667,21 @@ if [ IsOptionalHaikuImagePackageAdded WifiFirmwareScriptData ] {
|
||||
http://bu3sch.de/b43/fwcutter/$(broadcomFWCutterArchive) ;
|
||||
local broadcomFWCutterFile = [ DownloadFile $(broadcomFWCutterArchive)
|
||||
: $(broadcomFWCutterURL) ] ;
|
||||
AddFilesToHaikuImage system data firmware broadcom43xx b43-fwcutter
|
||||
AddFilesToHaikuImage
|
||||
system data firmware broadcom43xx b43-fwcutter
|
||||
: $(broadcomFWCutterFile) ;
|
||||
|
||||
# headers needed to compile firmware cutter
|
||||
local glibcDir = [ FDirName
|
||||
$(HAIKU_TOP) src system libroot posix glibc ] ;
|
||||
local byteswapHeader = [ FDirName $(glibcDir) string byteswap.h ] ;
|
||||
AddFilesToHaikuImage system data firmware broadcom43xx b43-fwcutter
|
||||
AddFilesToHaikuImage
|
||||
system data firmware broadcom43xx b43-fwcutter
|
||||
: $(byteswapHeader) ;
|
||||
local bitByteswapHeader = [ FDirName
|
||||
$(glibcDir) include arch x86 bits byteswap.h ] ;
|
||||
AddFilesToHaikuImage system data firmware broadcom43xx b43-fwcutter bits
|
||||
AddFilesToHaikuImage
|
||||
system data firmware broadcom43xx b43-fwcutter bits
|
||||
: $(bitByteswapHeader) ;
|
||||
|
||||
# file containing firmware
|
||||
@@ -1732,7 +1695,8 @@ if [ IsOptionalHaikuImagePackageAdded WifiFirmwareScriptData ] {
|
||||
local marvelArchive = malo-firmware-1.4.tgz ;
|
||||
local marvelURL = http://www.nazgul.ch/malo/$(marvelArchive) ;
|
||||
local marvelFile = [ DownloadFile $(marvelArchive) : $(marvelURL) ] ;
|
||||
AddFilesToHaikuImage system data firmware marvell88w8335
|
||||
AddFilesToHaikuImage
|
||||
system data firmware marvell88w8335
|
||||
: $(marvelFile) ;
|
||||
}
|
||||
}
|
||||
@@ -1742,7 +1706,7 @@ if [ IsOptionalHaikuImagePackageAdded WifiFirmwareScriptData ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package WonderBrush available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
Echo "No optional package WonderBrush available for gcc4" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip
|
||||
|
||||
@@ -137,14 +137,6 @@ AddOptionalHaikuImagePackages WonderBrush ;
|
||||
AddOptionalHaikuImagePackages WebPositive ;
|
||||
SuppressOptionalHaikuImagePackages SQLite ;
|
||||
|
||||
# Don't add the libraries built with the alternative gcc version.
|
||||
# If the alternative gcc generated directory has been specified via the
|
||||
# configure option --alternative-gcc-output-dir, the libraries for the
|
||||
# alternative gcc version are added by default. Unsetting this variable disables
|
||||
# building and adding the libraries. Ignored, if --alternative-gcc-output-dir
|
||||
# was not specified.
|
||||
HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 0 ;
|
||||
|
||||
# Specify scripts that shall be run when populating the image/installation
|
||||
# directory. The "early" script is run before anything has been copied onto
|
||||
# the image/into the installation directory. The "late" script is run after
|
||||
|
||||
@@ -27,6 +27,3 @@
|
||||
|
||||
# Add the optional package WonderBrush to the image.
|
||||
#AddOptionalHaikuImagePackages WonderBrush ;
|
||||
|
||||
# Don't add the libraries built with the alternative gcc version.
|
||||
#HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 0 ;
|
||||
|
||||
@@ -163,19 +163,23 @@ extractFile()
|
||||
targetExtractedDir=$2
|
||||
extractedSubDir=$3
|
||||
|
||||
echo "Extracting $archiveFile ..."
|
||||
|
||||
extractDir=$tmpDir/extract
|
||||
$rmAttrs -rf "$extractDir"
|
||||
mkdir -p "$extractDir"
|
||||
|
||||
case "$archiveFile" in
|
||||
*.zip)
|
||||
echo "Extracting $archiveFile ..."
|
||||
$unzip -q -d "$extractDir" "$archiveFile"
|
||||
;;
|
||||
*.tgz|*.tar.gz)
|
||||
echo "Extracting $archiveFile ..."
|
||||
tar -C "$extractDir" -xf "$archiveFile"
|
||||
;;
|
||||
*.hpkg)
|
||||
echo "Adding package $archiveFile ..."
|
||||
cp "$archiveFile" "$extractDir"
|
||||
;;
|
||||
*)
|
||||
echo "Unhandled archive extension in build_haiku_image extractFile()"
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user