Whitespace cleanup in root and 'build' folder.
* Removed trailing whitespace and empty lines at top of files.
This commit is contained in:
Oliver Tappe
@@ -13,11 +13,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
|
||||
# Include required packages:
|
||||
# primary architecture
|
||||
AddHaikuImagePackages [ FFilterByBuildFeatures
|
||||
AddHaikuImagePackages [ FFilterByBuildFeatures
|
||||
curl freetype icu libsolv zlib
|
||||
|
||||
regular_image @{
|
||||
bzip2 ctags ffmpeg findutils gawk glu grep jpeg less libpng
|
||||
bzip2 ctags ffmpeg findutils gawk glu grep jpeg less libpng
|
||||
mesa mesa_devel mesa_swrast sed sharutils tar which
|
||||
}@
|
||||
] ;
|
||||
@@ -26,7 +26,7 @@ local architectureObject ;
|
||||
for architectureObject
|
||||
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
|
||||
on $(architectureObject) {
|
||||
AddHaikuImagePackages [ FFilterByBuildFeatures
|
||||
AddHaikuImagePackages [ FFilterByBuildFeatures
|
||||
curl freetype icu libsolv zlib
|
||||
|
||||
regular_image @{
|
||||
|
||||
@@ -315,7 +315,7 @@ rule KernelArchitectureSetup architecture
|
||||
Exit "Set HAIKU_BOOT_BOARD for your target ARM device!" ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# offset in floppy image (>= sizeof(haiku_loader))
|
||||
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
rule SetupBoot
|
||||
{
|
||||
# Usage SetupBoot <sources_or_objects> : <extra_cc_flags> : <include_private_headers> ;
|
||||
|
||||
@@ -169,7 +169,7 @@ if [ IsPackageAvailable mesa_devel ] {
|
||||
if [ IsPackageAvailable ffmpeg_devel ] {
|
||||
local ffmpegLibs = libavformat.so libavcodec.so libavdevice.so
|
||||
libavfilter.so libswscale.so libavutil.so ;
|
||||
|
||||
|
||||
ExtractBuildFeatureArchives ffmpeg :
|
||||
file: base ffmpeg
|
||||
runtime: lib
|
||||
@@ -180,7 +180,7 @@ if [ IsPackageAvailable ffmpeg_devel ] {
|
||||
;
|
||||
|
||||
EnableBuildFeatures ffmpeg ;
|
||||
|
||||
|
||||
} else {
|
||||
Echo "FFMpeg support not available on $(TARGET_PACKAGING_ARCH)" ;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
# Variable naming conventions:
|
||||
# TARGET_*: A build system variable specifying a property for building for
|
||||
# the target platform (usually Haiku). E.g. TARGET_CC specifies the
|
||||
@@ -587,7 +586,7 @@ if $(HOST_PLATFORM) = freebsd {
|
||||
# FreeBSD's gcc doesn't include /usr/local/* in its search paths,
|
||||
# though that's where most things from ports wind up being installed.
|
||||
HOST_HDRS += /usr/local/include ;
|
||||
HOST_LINKFLAGS += -L/usr/local/lib ;
|
||||
HOST_LINKFLAGS += -L/usr/local/lib ;
|
||||
}
|
||||
|
||||
if $(HOST_PLATFORM) = darwin {
|
||||
|
||||
@@ -115,7 +115,7 @@ rule PrepareSubDirConfigVariables
|
||||
{
|
||||
local dirTokens = $(1) ;
|
||||
local config = [ ConfigObject $(dirTokens) ] ;
|
||||
|
||||
|
||||
if ! [ on $(config) return $(__prepared) ] {
|
||||
# prepare config for parent dir
|
||||
local parentDir = [ FReverse $(dirTokens) ] ;
|
||||
@@ -146,7 +146,7 @@ rule PrepareConfigVariables
|
||||
# objects to the global values
|
||||
local rootConfig = [ ConfigObject ] ; # the root config object
|
||||
local inheritedRootConfig = [ ConfigObject : __inherited_config__ ] ;
|
||||
|
||||
|
||||
for var in $(AUTO_SET_UP_CONFIG_VARIABLES) {
|
||||
$(var) on $(rootConfig) = $($(var)) ;
|
||||
$(var) on $(inheritedRootConfig) = $($(var)) ;
|
||||
|
||||
@@ -3,16 +3,16 @@ switch $(HAIKU_BUILD_PROFILE) {
|
||||
case "bootstrap-*" : {
|
||||
HAIKU_BUILD_TYPE = bootstrap ;
|
||||
EnableBuildFeatures bootstrap_image ;
|
||||
|
||||
|
||||
HAIKU_DEFINES += HAIKU_BOOTSTRAP_BUILD ;
|
||||
TARGET_DEFINES += HAIKU_BOOTSTRAP_BUILD ;
|
||||
}
|
||||
}
|
||||
|
||||
case "minimum-*" : {
|
||||
HAIKU_BUILD_TYPE = minimum ;
|
||||
EnableBuildFeatures minimum_image ;
|
||||
}
|
||||
|
||||
|
||||
case "*" : {
|
||||
HAIKU_BUILD_TYPE = regular ;
|
||||
EnableBuildFeatures regular_image ;
|
||||
@@ -45,7 +45,7 @@ rule DefineDefaultBuildProfiles
|
||||
# minimum profiles
|
||||
DefineBuildProfile minimum-raw : image : "haiku-minimum.image" ;
|
||||
DefineBuildProfile minimum-vmware : vmware-image : "haiku-minimum.vmdk" ;
|
||||
DefineBuildProfile minimum-anyboot : anyboot-image
|
||||
DefineBuildProfile minimum-anyboot : anyboot-image
|
||||
: "haiku-minimum-anyboot.image" ;
|
||||
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ rule Man2Docs
|
||||
Man2Doc $(target) : $(source) ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
rule Doc2HTML
|
||||
{
|
||||
local source = [ FGristFiles $(1) ] ;
|
||||
@@ -49,7 +49,7 @@ rule Doc2HTML
|
||||
|
||||
MakeLocate $(target) : $(basedir) ;
|
||||
if $(2) {
|
||||
XSLBASEDIR on $(target) = -stringparam base.dir \"$(basedir)/\" ;
|
||||
XSLBASEDIR on $(target) = -stringparam base.dir \"$(basedir)/\" ;
|
||||
}
|
||||
XSLSHEET on $(target) = $(xslsheet) ;
|
||||
XSLOPTIONS on $(target) = $(options) ;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
# FIncludes <dirs> ;
|
||||
#
|
||||
# Overridden to support a second argument, the option to be used.
|
||||
@@ -415,7 +414,7 @@ rule UsePrivateSystemHeaders
|
||||
}
|
||||
|
||||
|
||||
rule UseBuildFeatureHeaders feature : attribute
|
||||
rule UseBuildFeatureHeaders feature : attribute
|
||||
{
|
||||
# UseBuildFeatureHeaders <feature> : [ <attribute> ] ;
|
||||
# A shorthand for
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
rule SetupKernel
|
||||
{
|
||||
# Usage SetupKernel <sources_or_objects> : <extra_cc_flags> : <include_private_headers> ;
|
||||
|
||||
@@ -23,11 +23,11 @@ rule ExtractCatalogEntries target : sources : signature : regexp
|
||||
if $(PLATFORM) = host {
|
||||
sysHeaders += $(HOST_HDRS) ;
|
||||
defines += $(HOST_DEFINES) ;
|
||||
cc = $(HOST_CC) ;
|
||||
cc = $(HOST_CC) ;
|
||||
if $(USES_BE_API) {
|
||||
sysHeaders += $(HOST_BE_API_HEADERS) ;
|
||||
}
|
||||
|
||||
|
||||
includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
|
||||
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
|
||||
systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
|
||||
@@ -171,12 +171,12 @@ rule AddCatalogEntryAttribute target
|
||||
#
|
||||
# <attribute value> should be of the form
|
||||
# "x-vnd.Haiku-App:context:string"
|
||||
|
||||
|
||||
CATALOG_ENTRY on $(target) = "$(2)" ;
|
||||
|
||||
Depends $(target) : <build>addattr ;
|
||||
|
||||
AddCatalogEntryAttribute1 $(target)
|
||||
|
||||
AddCatalogEntryAttribute1 $(target)
|
||||
: <build>addattr ;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
rule AddSharedObjectGlueCode
|
||||
{
|
||||
# AddSharedObjectGlueCode <target> : <isExecutable> ;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
rule SetupObjectsDir
|
||||
{
|
||||
# SetupObjectsDir
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
# # add scripts, tattle executable and README
|
||||
# SEARCH on <libmicro>bench <libmicro>multiview <libmicro>README
|
||||
# = [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ;
|
||||
#
|
||||
#
|
||||
# AddFilesToHaikuImage home benchmarks libmicro
|
||||
# : <libmicro>bench <libmicro>multiview <libmicro>README ;
|
||||
# AddFilesToHaikuImage home benchmarks libmicro bin-BePC : tattle ;
|
||||
#
|
||||
#
|
||||
# # add libmicro benchmarks
|
||||
# AddFilesToHaikuImage home benchmarks libmicro bin-BePC :
|
||||
# atomic <libmicro>bind cachetocache cascade_cond cascade_fcntl
|
||||
@@ -30,9 +30,9 @@
|
||||
# siglongjmp signal sigprocmask <libmicro>socket socketpair <libmicro>stat
|
||||
# strcasecmp strchr strcmp strcpy strftime strlen strtol system time times
|
||||
# write writev ;
|
||||
#
|
||||
#
|
||||
# AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ;
|
||||
#
|
||||
#
|
||||
# AddOptionalPackageDescriptionToHaikuImage
|
||||
# <libmicro>.OptionalPackageDescription
|
||||
# : $(HAIKU_TOP) src tests system benchmarks libMicro ;
|
||||
|
||||
@@ -46,7 +46,7 @@ rule PreprocessPackageInfo source : directory : architecture
|
||||
SEARCH on $(source) +=
|
||||
[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) $(architecture) ]
|
||||
[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) any ]
|
||||
[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) generic ]
|
||||
[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) generic ]
|
||||
;
|
||||
|
||||
local target = $(source:BSG=package-info)-package-info ;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma mark - Private
|
||||
|
||||
# default value for the build profile that defines the set of source packages
|
||||
# default value for the build profile that defines the set of source packages
|
||||
# that will be put onto the bootstrap image
|
||||
HAIKU_BOOTSTRAP_SOURCES_PROFILE ?= @minimum-raw ;
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
# unit test pseudo target
|
||||
NotFile unittests ;
|
||||
|
||||
|
||||
@@ -28,13 +28,13 @@ HAIKU_BOARD_LOADER_STACK_BASE = 0x84000000 ;
|
||||
|
||||
# OMAP x-loader image, must be first file on FAT partition
|
||||
HAIKU_BOARD_MLO_IMAGE ?= MLO ;
|
||||
HAIKU_BOARD_MLO_IMAGE_URL =
|
||||
HAIKU_BOARD_MLO_IMAGE_URL =
|
||||
http://www.angstrom-distribution.org/demo/beagleboard/MLO ;
|
||||
|
||||
# u-boot binary image filename, to build the flash image
|
||||
# XXX: Locate it somehow (for now just put it in generated/)
|
||||
HAIKU_BOARD_UBOOT_IMAGE ?= u-boot.bin ;
|
||||
HAIKU_BOARD_UBOOT_IMAGE_URL =
|
||||
HAIKU_BOARD_UBOOT_IMAGE_URL =
|
||||
http://www.angstrom-distribution.org/demo/beagleboard/u-boot.bin ;
|
||||
|
||||
#
|
||||
|
||||
@@ -28,7 +28,7 @@ HAIKU_BOARD_LOADER_STACK_BASE = 0x34000000 ;
|
||||
# u-boot binary image filename, to build the flash image
|
||||
# XXX: Locate it somehow (for now just put it in generated/)
|
||||
#HAIKU_BOARD_UBOOT_IMAGE ?= u-boot-verdex-400-r1604.bin ;
|
||||
#HAIKU_BOARD_UBOOT_IMAGE_URL =
|
||||
#HAIKU_BOARD_UBOOT_IMAGE_URL =
|
||||
# http://www.gumstix.net/feeds/u-boot/u-boot-verdex-400-r1604.bin ;
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ if mmcinit; then \
|
||||
bootm $(HAIKU_BOARD_LOADER_UIBASE); \
|
||||
fi" ;
|
||||
|
||||
HAIKU_BOARD_SDIMAGE_FILES =
|
||||
HAIKU_BOARD_SDIMAGE_FILES =
|
||||
haiku_loader
|
||||
haiku_loader.ub
|
||||
haiku_loader_nbsd.ub
|
||||
|
||||
@@ -28,7 +28,7 @@ HAIKU_BOARD_LOADER_STACK_BASE = 0xa4000000 ;
|
||||
# u-boot binary image filename, to build the flash image
|
||||
# XXX: Locate it somehow (for now just put it in generated/)
|
||||
HAIKU_BOARD_UBOOT_IMAGE ?= u-boot-verdex-400-r1604.bin ;
|
||||
HAIKU_BOARD_UBOOT_IMAGE_URL =
|
||||
HAIKU_BOARD_UBOOT_IMAGE_URL =
|
||||
http://www.gumstix.net/feeds/u-boot/u-boot-verdex-400-r1604.bin ;
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ if mmcinit; then \
|
||||
bootm $(HAIKU_BOARD_LOADER_UIBASE); \
|
||||
fi" ;
|
||||
|
||||
HAIKU_BOARD_SDIMAGE_FILES =
|
||||
HAIKU_BOARD_SDIMAGE_FILES =
|
||||
haiku_loader
|
||||
haiku_loader.ub
|
||||
haiku_loader_nbsd.ub
|
||||
|
||||
@@ -5,11 +5,11 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
|
||||
addattr alert arp
|
||||
base64 basename bash bc beep bfsinfo
|
||||
cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
|
||||
clockconfig cmp collectcatkeys comm compress copyattr cp csplit cut
|
||||
date dc dd desklink df diff diff3 dircolors dirname diskimage draggers
|
||||
clockconfig cmp collectcatkeys comm compress copyattr cp csplit cut
|
||||
date dc dd desklink df diff diff3 dircolors dirname diskimage draggers
|
||||
driveinfo dstcheck du dumpcatalog
|
||||
echo eject env error expand expr
|
||||
factor false fdinfo ffm filepanel finddir findpaths fmt fold fortune fstrim
|
||||
factor false fdinfo ffm filepanel finddir findpaths fmt fold fortune fstrim
|
||||
ftp ftpd funzip
|
||||
getarch getlimits groupadd groupdel groupmod groups gzip gzexe
|
||||
hd head hey hostname
|
||||
@@ -17,7 +17,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
|
||||
join kernel_debugger keymap keystore kill
|
||||
link linkcatkeys listarea listattr listimage listdev
|
||||
listport listres listsem listusb ln locale logger login logname ls lsindex
|
||||
makebootable md5sum merge message mimeset mkdir mkfifo mkfs mkindex mktemp
|
||||
makebootable md5sum merge message mimeset mkdir mkfifo mkfs mkindex mktemp
|
||||
modifiers mount mountvolume mv
|
||||
netcat netstat nl nohup notify nproc
|
||||
od open
|
||||
@@ -40,44 +40,44 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
|
||||
] ;
|
||||
|
||||
SYSTEM_APPS = [ FFilterByBuildFeatures
|
||||
AboutSystem ActivityMonitor
|
||||
BootManager@x86,x86_64
|
||||
AboutSystem ActivityMonitor
|
||||
BootManager@x86,x86_64
|
||||
CharacterMap
|
||||
Debugger DeskCalc Devices DiskProbe DiskUsage DriveSetup
|
||||
Expander
|
||||
NetworkStatus
|
||||
ProcessController
|
||||
ShowImage StyledEdit
|
||||
Terminal TextSearch
|
||||
ProcessController
|
||||
ShowImage StyledEdit
|
||||
Terminal TextSearch
|
||||
Workspaces
|
||||
] ;
|
||||
|
||||
DESKBAR_APPLICATIONS =
|
||||
ActivityMonitor
|
||||
CharacterMap
|
||||
DeskCalc Devices DiskProbe DiskUsage DriveSetup
|
||||
Expander
|
||||
StyledEdit
|
||||
DESKBAR_APPLICATIONS =
|
||||
ActivityMonitor
|
||||
CharacterMap
|
||||
DeskCalc Devices DiskProbe DiskUsage DriveSetup
|
||||
Expander
|
||||
StyledEdit
|
||||
Terminal
|
||||
;
|
||||
|
||||
DESKBAR_DESKTOP_APPLETS =
|
||||
NetworkStatus
|
||||
DESKBAR_DESKTOP_APPLETS =
|
||||
NetworkStatus
|
||||
ProcessController
|
||||
Workspaces
|
||||
;
|
||||
|
||||
SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
|
||||
Appearance
|
||||
Appearance
|
||||
Backgrounds
|
||||
<preference>Deskbar
|
||||
FileTypes
|
||||
Keyboard Keymap
|
||||
<preference>Deskbar
|
||||
FileTypes
|
||||
Keyboard Keymap
|
||||
Locale
|
||||
Mouse
|
||||
Network Notifications
|
||||
Screen Shortcuts
|
||||
Time Touchpad <preference>Tracker
|
||||
Mouse
|
||||
Network Notifications
|
||||
Screen Shortcuts
|
||||
Time Touchpad <preference>Tracker
|
||||
VirtualMemory
|
||||
] ;
|
||||
|
||||
@@ -115,35 +115,35 @@ rule HaikuImageGetPrivateSystemLibs
|
||||
|
||||
|
||||
SYSTEM_SERVERS = [ FFilterByBuildFeatures
|
||||
app_server
|
||||
debug_server dns_resolver_server
|
||||
app_server
|
||||
debug_server dns_resolver_server
|
||||
input_server
|
||||
keystore_server
|
||||
mount_server
|
||||
mount_server
|
||||
net_server notification_server
|
||||
package_daemon power_daemon
|
||||
package_daemon power_daemon
|
||||
registrar
|
||||
syslog_daemon
|
||||
] ;
|
||||
|
||||
SYSTEM_NETWORK_DEVICES =
|
||||
ethernet
|
||||
loopback
|
||||
SYSTEM_NETWORK_DEVICES =
|
||||
ethernet
|
||||
loopback
|
||||
;
|
||||
|
||||
SYSTEM_NETWORK_DATALINK_PROTOCOLS =
|
||||
<module>arp
|
||||
ethernet_frame
|
||||
ipv6_datagram
|
||||
SYSTEM_NETWORK_DATALINK_PROTOCOLS =
|
||||
<module>arp
|
||||
ethernet_frame
|
||||
ipv6_datagram
|
||||
loopback_frame
|
||||
;
|
||||
|
||||
#SYSTEM_NETWORK_PPP = ipcp modem pap pppoe ;
|
||||
|
||||
SYSTEM_NETWORK_PROTOCOLS =
|
||||
icmp icmp6 ipv4 ipv6
|
||||
tcp
|
||||
udp unix
|
||||
SYSTEM_NETWORK_PROTOCOLS =
|
||||
icmp icmp6 ipv4 ipv6
|
||||
tcp
|
||||
udp unix
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
|
||||
@@ -153,12 +153,12 @@ SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
|
||||
}@ # x86,x86_64
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_TRANSLATORS =
|
||||
STXTTranslator
|
||||
SYSTEM_ADD_ONS_TRANSLATORS =
|
||||
STXTTranslator
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_LOCALE_CATALOGS =
|
||||
<catalog-addon>plaintext
|
||||
SYSTEM_ADD_ONS_LOCALE_CATALOGS =
|
||||
<catalog-addon>plaintext
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_MEDIA = ;
|
||||
@@ -186,33 +186,33 @@ SYSTEM_ADD_ONS_DRIVERS_MIDI = ;
|
||||
|
||||
SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
|
||||
x86,x86_64 @{
|
||||
3com
|
||||
atheros813x ar81xx attansic_l1 attansic_l2
|
||||
broadcom440x broadcom570x
|
||||
dec21xxx
|
||||
ipro100 ipro1000
|
||||
jmicron2x0
|
||||
marvell_yukon
|
||||
3com
|
||||
atheros813x ar81xx attansic_l1 attansic_l2
|
||||
broadcom440x broadcom570x
|
||||
dec21xxx
|
||||
ipro100 ipro1000
|
||||
jmicron2x0
|
||||
marvell_yukon
|
||||
nforce
|
||||
pcnet
|
||||
rtl8139 rtl81xx
|
||||
sis19x syskonnect
|
||||
pcnet
|
||||
rtl8139 rtl81xx
|
||||
sis19x syskonnect
|
||||
via_rhine vt612x
|
||||
}@ # x86_64
|
||||
|
||||
etherpci
|
||||
pegasus
|
||||
sis900
|
||||
usb_asix usb_davicom usb_ecm
|
||||
etherpci
|
||||
pegasus
|
||||
sis900
|
||||
usb_asix usb_davicom usb_ecm
|
||||
wb840
|
||||
|
||||
# WLAN drivers
|
||||
x86 @{
|
||||
aironetwifi atheroswifi
|
||||
aironetwifi atheroswifi
|
||||
broadcom43xx
|
||||
iprowifi2100 iprowifi2200 iprowifi3945 iprowifi4965
|
||||
iprowifi2100 iprowifi2200 iprowifi3945 iprowifi4965
|
||||
marvell88w8363 marvell88w8335
|
||||
ralinkwifi
|
||||
ralinkwifi
|
||||
wavelanwifi
|
||||
}@ # x86
|
||||
|
||||
@@ -220,18 +220,18 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
|
||||
#usb_beceemwmx@gpl
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures
|
||||
acpi_button@x86
|
||||
SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures
|
||||
acpi_button@x86
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
|
||||
acpi@x86,x86_64 agp_gart@x86,x86_64 ata@ata
|
||||
config_manager
|
||||
acpi@x86,x86_64 agp_gart@x86,x86_64 ata@ata
|
||||
config_manager
|
||||
firewire@x86
|
||||
ide@ide scsi isa@x86,x86_64
|
||||
pci ps2@x86,x86_64
|
||||
random
|
||||
usb
|
||||
usb
|
||||
virtio
|
||||
] ;
|
||||
|
||||
|
||||
@@ -10,42 +10,42 @@ SYSTEM_BIN += [ FFilterByBuildFeatures
|
||||
installsound
|
||||
mail2mbox mbox2mail mkdos mount_nfs
|
||||
play playfile playsound playwav
|
||||
screenshot setdecor spamdbm
|
||||
screenshot setdecor spamdbm
|
||||
translate
|
||||
] ;
|
||||
|
||||
SYSTEM_APPS += [ FFilterByBuildFeatures
|
||||
CDPlayer CodyCam
|
||||
GLInfo@mesa
|
||||
HaikuDepot
|
||||
Icon-O-Matic Installer LaunchBox
|
||||
CDPlayer CodyCam
|
||||
GLInfo@mesa
|
||||
HaikuDepot
|
||||
Icon-O-Matic Installer LaunchBox
|
||||
Magnify Mail MediaConverter MediaPlayer MidiPlayer
|
||||
PackageInstaller People PoorMan PowerStatus
|
||||
Screenshot SerialConnect SoundRecorder
|
||||
TV
|
||||
WebWatch
|
||||
Screenshot SerialConnect SoundRecorder
|
||||
TV
|
||||
WebWatch
|
||||
] ;
|
||||
|
||||
DESKBAR_APPLICATIONS +=
|
||||
CodyCam CDPlayer
|
||||
HaikuDepot
|
||||
Icon-O-Matic Installer
|
||||
Magnify Mail MediaConverter MediaPlayer MidiPlayer
|
||||
DESKBAR_APPLICATIONS +=
|
||||
CodyCam CDPlayer
|
||||
HaikuDepot
|
||||
Icon-O-Matic Installer
|
||||
Magnify Mail MediaConverter MediaPlayer MidiPlayer
|
||||
People PoorMan
|
||||
TV
|
||||
;
|
||||
|
||||
DESKBAR_DESKTOP_APPLETS +=
|
||||
LaunchBox
|
||||
DESKBAR_DESKTOP_APPLETS +=
|
||||
LaunchBox
|
||||
PowerStatus
|
||||
;
|
||||
|
||||
SYSTEM_PREFERENCES += [ FFilterByBuildFeatures
|
||||
DataTranslations
|
||||
E-mail
|
||||
Media
|
||||
Printers
|
||||
ScreenSaver Sounds
|
||||
E-mail
|
||||
Media
|
||||
Printers
|
||||
ScreenSaver Sounds
|
||||
] ;
|
||||
|
||||
SYSTEM_DEMOS += [ FFilterByBuildFeatures
|
||||
@@ -72,7 +72,7 @@ rule HaikuImageGetSystemLibs
|
||||
libpackage.so
|
||||
libscreensaver.so
|
||||
libtextencoding.so libtracker.so libtranslation.so
|
||||
libtiff.so
|
||||
libtiff.so
|
||||
] ]
|
||||
;
|
||||
}
|
||||
@@ -91,36 +91,36 @@ rule HaikuImageGetPrivateSystemLibs
|
||||
|
||||
|
||||
SYSTEM_SERVERS += [ FFilterByBuildFeatures
|
||||
cddb_daemon
|
||||
cddb_daemon
|
||||
mail_daemon media_addon_server media_server midi_server
|
||||
nfs4_idmapper_server
|
||||
nfs4_idmapper_server
|
||||
print_server print_addon_server
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
|
||||
x86,x86_64 @{
|
||||
intel_810.accelerant intel_extreme.accelerant
|
||||
intel_810.accelerant intel_extreme.accelerant
|
||||
matrox.accelerant
|
||||
nvidia.accelerant
|
||||
radeon.accelerant radeon_hd.accelerant
|
||||
#via.accelerant
|
||||
nvidia.accelerant
|
||||
radeon.accelerant radeon_hd.accelerant
|
||||
#via.accelerant
|
||||
}@ # x86,x86_64
|
||||
x86 @{
|
||||
3dfx.accelerant ati.accelerant neomagic.accelerant s3.accelerant
|
||||
}@ # x86
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_TRANSLATORS +=
|
||||
BMPTranslator
|
||||
EXRTranslator
|
||||
GIFTranslator
|
||||
HVIFTranslator
|
||||
ICOTranslator ICNSTranslator
|
||||
JPEGTranslator JPEG2000Translator
|
||||
SYSTEM_ADD_ONS_TRANSLATORS +=
|
||||
BMPTranslator
|
||||
EXRTranslator
|
||||
GIFTranslator
|
||||
HVIFTranslator
|
||||
ICOTranslator ICNSTranslator
|
||||
JPEGTranslator JPEG2000Translator
|
||||
PCXTranslator PNGTranslator PPMTranslator PSDTranslator
|
||||
RAWTranslator RTFTranslator
|
||||
RAWTranslator RTFTranslator
|
||||
SGITranslator
|
||||
TGATranslator TIFFTranslator
|
||||
TGATranslator TIFFTranslator
|
||||
WebPTranslator WonderBrushTranslator
|
||||
;
|
||||
|
||||
@@ -140,7 +140,7 @@ SYSTEM_ADD_ONS_MEDIA += [ FFilterByBuildFeatures
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_MEDIA_PLUGINS += [ FFilterByBuildFeatures
|
||||
ffmpeg@ffmpeg
|
||||
ffmpeg@ffmpeg
|
||||
raw_decoder
|
||||
] ;
|
||||
|
||||
@@ -155,70 +155,70 @@ SYSTEM_ADD_ONS_PRINT +=
|
||||
Preview
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_PRINT_TRANSPORT +=
|
||||
HP\ JetDirect
|
||||
IPP
|
||||
SYSTEM_ADD_ONS_PRINT_TRANSPORT +=
|
||||
HP\ JetDirect
|
||||
IPP
|
||||
LPR
|
||||
# Parallel\ Port
|
||||
Print\ To\ File
|
||||
Serial\ Port
|
||||
Print\ To\ File
|
||||
Serial\ Port
|
||||
USB\ Port
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_SCREENSAVERS += [ FFilterByBuildFeatures
|
||||
Butterfly
|
||||
DebugNow
|
||||
Butterfly
|
||||
DebugNow
|
||||
Flurry@mesa
|
||||
GLife@mesa Gravity@mesa
|
||||
$(HAIKU_INCLUDE_TRADEMARKS)Haiku
|
||||
Icons IFS
|
||||
$(HAIKU_INCLUDE_TRADEMARKS)Haiku
|
||||
Icons IFS
|
||||
Leaves
|
||||
Message
|
||||
Message
|
||||
Spider
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_DRIVERS_AUDIO +=
|
||||
auich auvia
|
||||
echo3g emuxki
|
||||
hda
|
||||
ice1712
|
||||
sis7018
|
||||
SYSTEM_ADD_ONS_DRIVERS_AUDIO +=
|
||||
auich auvia
|
||||
echo3g emuxki
|
||||
hda
|
||||
ice1712
|
||||
sis7018
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD +=
|
||||
#cmedia usb_audio
|
||||
SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD +=
|
||||
#cmedia usb_audio
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS += [ FFilterByBuildFeatures
|
||||
x86,x86_64 @{
|
||||
intel_810 intel_extreme
|
||||
matrox
|
||||
nvidia
|
||||
radeon radeon_hd
|
||||
#via
|
||||
intel_810 intel_extreme
|
||||
matrox
|
||||
nvidia
|
||||
radeon radeon_hd
|
||||
#via
|
||||
}@ # x86,x86_64
|
||||
x86 @{
|
||||
3dfx
|
||||
ati
|
||||
neomagic
|
||||
3dfx
|
||||
ati
|
||||
neomagic
|
||||
s3
|
||||
}@ # x86
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_DRIVERS_MIDI +=
|
||||
emuxki
|
||||
ice1712
|
||||
usb_midi
|
||||
SYSTEM_ADD_ONS_DRIVERS_MIDI +=
|
||||
emuxki
|
||||
ice1712
|
||||
usb_midi
|
||||
;
|
||||
|
||||
SYSTEM_ADD_ONS_DRIVERS_POWER += [ FFilterByBuildFeatures
|
||||
acpi_battery@x86,x86_64
|
||||
] ;
|
||||
|
||||
SYSTEM_ADD_ONS_FILE_SYSTEMS +=
|
||||
cdda
|
||||
googlefs
|
||||
nfs nfs4
|
||||
SYSTEM_ADD_ONS_FILE_SYSTEMS +=
|
||||
cdda
|
||||
googlefs
|
||||
nfs nfs4
|
||||
;
|
||||
|
||||
# Mailbox folders and symlink
|
||||
|
||||
@@ -200,16 +200,16 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
|
||||
|
||||
# boot module links
|
||||
AddBootModuleSymlinksToPackage
|
||||
acpi@x86,x86_64 ahci ata@ata ata_adapter@ata
|
||||
bfs
|
||||
config_manager
|
||||
acpi@x86,x86_64 ahci ata@ata ata_adapter@ata
|
||||
bfs
|
||||
config_manager
|
||||
dpc
|
||||
efi_gpt
|
||||
generic_ide_pci
|
||||
ide@ide ide_adapter@ide ide_isa@x86 isa@x86,x86_64 intel it8211
|
||||
legacy_sata locked_pool
|
||||
generic_ide_pci
|
||||
ide@ide ide_adapter@ide ide_isa@x86 isa@x86,x86_64 intel it8211
|
||||
legacy_sata locked_pool
|
||||
openpic@ppc
|
||||
packagefs pci
|
||||
packagefs pci
|
||||
scsi scsi_cd scsi_disk scsi_periph silicon_image_3112
|
||||
usb usb_disk <usb>ehci <usb>ohci <usb>uhci
|
||||
virtio virtio_block virtio_pci virtio_scsi
|
||||
|
||||
@@ -65,7 +65,7 @@ RemotePackageRepository HaikuPorts
|
||||
jpeg_devel-9-3
|
||||
jpeg_tools-9-3
|
||||
keymapswitcher-1.2.7.10-1
|
||||
less-451-4
|
||||
less-451-4
|
||||
libedit-2012_06_01_3.0-1
|
||||
libedit_devel-2012_06_01_3.0-1
|
||||
libiconv-1.13.1-6
|
||||
@@ -229,7 +229,7 @@ RemotePackageRepository HaikuPorts
|
||||
jam
|
||||
jpeg
|
||||
keymapswitcher
|
||||
less
|
||||
less
|
||||
libedit
|
||||
libiconv
|
||||
libogg
|
||||
@@ -272,7 +272,7 @@ RemotePackageRepository HaikuPorts
|
||||
tar
|
||||
texi2html
|
||||
texinfo
|
||||
unrar
|
||||
unrar
|
||||
vim
|
||||
vision
|
||||
which
|
||||
|
||||
@@ -41,7 +41,7 @@ RemotePackageRepository HaikuPorts
|
||||
expat-2.0.1-7
|
||||
expat_devel-2.0.1-7
|
||||
f1spirit-0.rc9.1615-1
|
||||
findutils-4.4.2-1
|
||||
findutils-4.4.2-1
|
||||
ffmpeg-0.10.2-4
|
||||
ffmpeg_devel-0.10.2-4
|
||||
flac-1.3.0-1
|
||||
@@ -50,7 +50,7 @@ RemotePackageRepository HaikuPorts
|
||||
freetype-2.5.2-3
|
||||
freetype_devel-2.5.2-3
|
||||
fribidi-0.19.5-1
|
||||
fribidi_devel-0.19.5-1
|
||||
fribidi_devel-0.19.5-1
|
||||
friss-0.8beta-1
|
||||
gawk-4.1.0-2
|
||||
gcc-2.95.3_2013_08_15-4
|
||||
@@ -81,7 +81,7 @@ RemotePackageRepository HaikuPorts
|
||||
jpeg_tools-9-3
|
||||
keymapswitcher-1.2.7.11-1
|
||||
lcms-2.5-1
|
||||
lcms_devel-2.5-1
|
||||
lcms_devel-2.5-1
|
||||
less-451-4
|
||||
lha-1.14i-1
|
||||
libao-1.0.0-1
|
||||
@@ -521,7 +521,7 @@ RemotePackageRepository HaikuPorts
|
||||
texi2html
|
||||
texinfo
|
||||
ubertuber
|
||||
unrar
|
||||
unrar
|
||||
vcmi_x86
|
||||
vim
|
||||
vision
|
||||
|
||||
@@ -12,9 +12,9 @@ shift
|
||||
# The second argument is the shell script that initializes the variables:
|
||||
# tmpDir
|
||||
# addBuildCompatibilityLibDir
|
||||
#
|
||||
#
|
||||
# copyattr
|
||||
# rmAttrs
|
||||
# rmAttrs
|
||||
# zip
|
||||
# NOTE: rmAttrs and zip are only passed in when building zip
|
||||
#
|
||||
|
||||
@@ -95,7 +95,7 @@ if [ -z "$gccVersion" ]; then
|
||||
fi
|
||||
|
||||
# touch all info files in order to avoid the dependency on makeinfo
|
||||
# (which apparently doesn't work reliably on all the different host
|
||||
# (which apparently doesn't work reliably on all the different host
|
||||
# configurations and changes files which in turn appear as local changes
|
||||
# to the VCS).
|
||||
find "$binutilsSourceDir" "$gccSourceDir" -name \*.info -print0 | xargs -0 touch
|
||||
|
||||
@@ -7,7 +7,7 @@ destination=CountryFlags.rdef
|
||||
nr=0
|
||||
|
||||
for file in *
|
||||
do
|
||||
do
|
||||
id=`echo "$file" | cut -b -2`
|
||||
name=`echo "${file%%.*}" | cut -b 4-`
|
||||
|
||||
@@ -15,7 +15,7 @@ do
|
||||
echo "resource($nr,\"$id\") #'VICN' array {" >> $destination
|
||||
tail -n +3 "$file" >> $destination
|
||||
echo >> $destination
|
||||
|
||||
nr=`expr $nr + 1`
|
||||
|
||||
nr=`expr $nr + 1`
|
||||
echo \ $nr, $name, $id... OK
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user