i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace cleanup in root and 'build' folder.

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