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

build/jam: whitespace cleanup.

Browse Source 
Change-Id: I80c9a51417631b1f283923451f5bb530097b74f3
This commit is contained in:
Jessica Hamilton
2018-05-07 13:12:16 +12:00
parent 2ecf221b74
commit 74bfec3b96
10 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+2 -2
View File
@@ -355,8 +355,8 @@ rule KernelArchitectureSetup architecture
# Workaround for ld using 32k for alignment despite forcing it in the config... # Workaround for ld using 32k for alignment despite forcing it in the config...
# should definitely not be needed! # should definitely not be needed!
HAIKU_KERNEL_LINKFLAGS += HAIKU_KERNEL_LINKFLAGS +=
-Wl,-z -Wl,max-page-size=0x1000 -Wl,-z -Wl,max-page-size=0x1000
-Wl,-z -Wl,common-page-size=0x1000 ; -Wl,-z -Wl,common-page-size=0x1000 ;
case ppc : case ppc :
# Build a position independent PPC kernel. We need to be able to # Build a position independent PPC kernel. We need to be able to
build/jam/BootRules
+3 -3
View File
@@ -25,7 +25,7 @@ rule SetupBoot
ObjectCcFlags $(object) : $(TARGET_BOOT_CCFLAGS) $(2) ; ObjectCcFlags $(object) : $(TARGET_BOOT_CCFLAGS) $(2) ;
ObjectC++Flags $(object) : $(TARGET_BOOT_C++FLAGS) $(2) ; ObjectC++Flags $(object) : $(TARGET_BOOT_C++FLAGS) $(2) ;
ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ; ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ;
ASFLAGS on $(object) = $(TARGET_BOOT_CCFLAGS) ; ASFLAGS on $(object) = $(TARGET_BOOT_CCFLAGS) ;
# override warning flags # override warning flags
TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object)
@@ -57,7 +57,7 @@ rule BootLd
libs += [ TargetBootLibsupc++ true ] ; libs += [ TargetBootLibsupc++ true ] ;
Depends $(1) : [ TargetBootLibsupc++ ] ; Depends $(1) : [ TargetBootLibsupc++ ] ;
} }
LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ; LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ;
Depends $(1) : [ TargetBootLibgcc ] ; Depends $(1) : [ TargetBootLibgcc ] ;
# TODO: Do we really want to invoke SetupBoot here? The objects should # TODO: Do we really want to invoke SetupBoot here? The objects should
@@ -104,7 +104,7 @@ rule BootMergeObject
rule BootStaticLibrary rule BootStaticLibrary
{ {
# Usage BootStaticLibrary <name> : <sources> : <extra cc flags> ; # Usage BootStaticLibrary <name> : <sources> : <extra cc flags> ;
# This is designed to take a set of sources and libraries and create # This is designed to take a set of sources and libraries and create
# a file called lib<name>.a # a file called lib<name>.a
build/jam/BuildFeatures
+5 -5
View File
@@ -49,7 +49,7 @@ if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {
; ;
EnableBuildFeatures gcc_syslibs ; EnableBuildFeatures gcc_syslibs ;
} else { } else {
Echo "gcc_syslibs not available for $(TARGET_PACKAGING_ARCH)" ; Echo "gcc_syslibs not available for $(TARGET_PACKAGING_ARCH)" ;
} }
} }
@@ -85,7 +85,7 @@ if [ IsPackageAvailable gcc_syslibs_devel ] {
} }
EnableBuildFeatures gcc_syslibs_devel ; EnableBuildFeatures gcc_syslibs_devel ;
} else { } else {
Echo "gcc_syslibs_devel not available for $(TARGET_PACKAGING_ARCH)" ; Echo "gcc_syslibs_devel not available for $(TARGET_PACKAGING_ARCH)" ;
} }
@@ -110,7 +110,7 @@ if [ IsPackageAvailable icu_devel ] {
; ;
EnableBuildFeatures icu ; EnableBuildFeatures icu ;
} else { } else {
Echo "ICU not available for $(TARGET_PACKAGING_ARCH)" ; Echo "ICU not available for $(TARGET_PACKAGING_ARCH)" ;
} }
@@ -128,7 +128,7 @@ if [ IsPackageAvailable curl_devel ] {
; ;
EnableBuildFeatures curl ; EnableBuildFeatures curl ;
} else { } else {
Echo "Curl not available for $(TARGET_PACKAGING_ARCH)" ; Echo "Curl not available for $(TARGET_PACKAGING_ARCH)" ;
} }
@@ -665,7 +665,7 @@ if [ IsPackageAvailable live555_devel ] {
$(developHeadersDir)/UsageEnvironment $(developHeadersDir)/UsageEnvironment
; ;
EnableBuildFeatures live555 ; EnableBuildFeatures live555 ;
} else { } else {
Echo "live555 not available for $(TARGET_PACKAGING_ARCH)" ; Echo "live555 not available for $(TARGET_PACKAGING_ARCH)" ;
} }
build/jam/HelperRules
+1 -2
View File
@@ -364,6 +364,5 @@ rule InheritPlatform
rule SubDirAsFlags rule SubDirAsFlags
{ {
SUBDIRASFLAGS += $(<) ; SUBDIRASFLAGS += $(<) ;
} }
build/jam/ImageRules
+6 -8
View File
@@ -424,7 +424,7 @@ rule AddWifiFirmwareToContainer container : driver : package : archive : extract
ExtractArchiveToContainer $(container) : $(dirTokens) ExtractArchiveToContainer $(container) : $(dirTokens)
: $(firmwareArchive) : : $(package) ; : $(firmwareArchive) : : $(package) ;
} else { } else {
AddFilesToContainer $(container) : $(dirTokens) : $(firmwareArchive) ; AddFilesToContainer $(container) : $(dirTokens) : $(firmwareArchive) ;
} }
} }
@@ -886,7 +886,7 @@ rule AddPackagesAndRepositoryVariablesToContainerScript script : container
AddVariableToScript $(script) : updateAllPackages AddVariableToScript $(script) : updateAllPackages
: $(HAIKU_UPDATE_ALL_PACKAGES) ; : $(HAIKU_UPDATE_ALL_PACKAGES) ;
# Add variable "systemPackages" with the packages copied/updated. # Add variable "systemPackages" with the packages copied/updated.
local allPackages = [ on $(container) return $(HAIKU_PACKAGES_IN_IMAGE) ] ; local allPackages = [ on $(container) return $(HAIKU_PACKAGES_IN_IMAGE) ] ;
if $(updateOnly) && ! [ IncludeAllTargetsInContainer $(container) ] { if $(updateOnly) && ! [ IncludeAllTargetsInContainer $(container) ] {
allPackages = [ FilterContainerUpdateTargets $(allPackages) allPackages = [ FilterContainerUpdateTargets $(allPackages)
@@ -1182,7 +1182,7 @@ rule InstallSourceArchive file : url
rule InstallOptionalHaikuImagePackage url : dirTokens : flags rule InstallOptionalHaikuImagePackage url : dirTokens : flags
{ {
# TODO: Remove the non-hpkg cases! # TODO: Remove the non-hpkg cases!
# Currently the semantics differs depending on whether the cdPackage flag # Currently the semantics differs depending on whether the cdPackage flag
# has been specified and the type of the package file: # has been specified and the type of the package file:
# * For a hpkg <dirTokens> is ignored. The package will be copied into the # * For a hpkg <dirTokens> is ignored. The package will be copied into the
# system/packages directory. # system/packages directory.
@@ -1415,7 +1415,7 @@ rule CreateNetBootArchiveCopyFilesScript script
rule BuildNetBootArchive archive : scripts rule BuildNetBootArchive archive : scripts
{ {
# BuildNetBootArchive <archive> : <scripts> ; # BuildNetBootArchive <archive> : <scripts> ;
local mainScript = build_archive ; local mainScript = build_archive ;
SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ; SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ;
@@ -1506,7 +1506,7 @@ rule CreateFloppyBootArchiveCopyFilesScript script
rule BuildFloppyBootArchive archive : scripts rule BuildFloppyBootArchive archive : scripts
{ {
# BuildHFloppyBootArchive <archive> : <scripts> ; # BuildHFloppyBootArchive <archive> : <scripts> ;
local mainScript = build_archive ; local mainScript = build_archive ;
SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ; SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ;
@@ -1595,7 +1595,7 @@ actions BuildCDBootImage1
{ {
$(RM) $(<) $(RM) $(<)
mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-]) \ mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-]) \
|| genisoimage -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-]) || genisoimage -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-])
} }
@@ -1638,5 +1638,3 @@ actions BuildCDBootPPCImage1 bind MAPS
boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
$(RM) -r $(HAIKU_OUTPUT_DIR)/cd $(RM) -r $(HAIKU_OUTPUT_DIR)/cd
} }
build/jam/KernelRules
+2 -2
View File
@@ -51,7 +51,7 @@ rule KernelLd
libs += [ TargetKernelLibsupc++ true ] ; libs += [ TargetKernelLibsupc++ true ] ;
Depends $(1) : [ TargetKernelLibsupc++ ] ; Depends $(1) : [ TargetKernelLibsupc++ ] ;
} }
LINKLIBS on $(1) = $(libs) [ TargetKernelLibgcc true ] ; LINKLIBS on $(1) = $(libs) [ TargetKernelLibgcc true ] ;
Depends $(1) : [ TargetKernelLibgcc ] ; Depends $(1) : [ TargetKernelLibgcc ] ;
HAIKU_TARGET_IS_EXECUTABLE on $(1) = 1 ; HAIKU_TARGET_IS_EXECUTABLE on $(1) = 1 ;
@@ -164,7 +164,7 @@ rule KernelMergeObject
rule KernelStaticLibrary rule KernelStaticLibrary
{ {
# Usage KernelStaticLibrary <name> : <sources> : <extra cc flags> ; # Usage KernelStaticLibrary <name> : <sources> : <extra cc flags> ;
# This is designed to take a set of sources and libraries and create # This is designed to take a set of sources and libraries and create
# a static library. # a static library.
build/jam/MainBuildRules
+3 -3
View File
@@ -28,7 +28,7 @@ rule AddSharedObjectGlueCode
LINK_BEGIN_GLUE on $(1) = $(beginGlue) ; LINK_BEGIN_GLUE on $(1) = $(beginGlue) ;
LINK_END_GLUE on $(1) = $(endGlue) ; LINK_END_GLUE on $(1) = $(endGlue) ;
NEEDLIBS on $(1) = [ on $(1) return $(NEEDLIBS) ] $(stdLibs) ; NEEDLIBS on $(1) = [ on $(1) return $(NEEDLIBS) ] $(stdLibs) ;
Depends $(1) : $(stdLibs) $(beginGlue) $(endGlue) ; Depends $(1) : $(stdLibs) $(beginGlue) $(endGlue) ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib
-Xlinker --no-undefined ; -Xlinker --no-undefined ;
@@ -53,7 +53,7 @@ rule Executable
Main $(1) : $(2) ; Main $(1) : $(2) ;
LinkAgainst $(1) : $(3) ; LinkAgainst $(1) : $(3) ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ]
-Xlinker -soname=_APP_ ; -Xlinker -soname=_APP_ ;
# we link with -nostdlib and add the required libs manually, when building # we link with -nostdlib and add the required libs manually, when building
# for Haiku # for Haiku
@@ -692,7 +692,7 @@ rule BuildPlatformSharedLibrary
-shared -Xlinker -soname=\"$(target:G=)\" ; -shared -Xlinker -soname=\"$(target:G=)\" ;
} }
local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ; CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ;
C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ; C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ;
} }
build/jam/MiscRules
+2 -2
View File
@@ -135,7 +135,7 @@ HAIKU_DEFERRED_SUB_INCLUDES = ;
rule DeferredSubInclude params : jamfile : scope rule DeferredSubInclude params : jamfile : scope
{ {
# DeferredSubInclude <subdir tokens> [ : <jamfile name> [ : <scope> ] ] ; # DeferredSubInclude <subdir tokens> [ : <jamfile name> [ : <scope> ] ] ;
# #
# Takes the same directory tokens parameter as SubInclude plus an optional # Takes the same directory tokens parameter as SubInclude plus an optional
# alternative Jamfile name. The the subdirectory referred to by # alternative Jamfile name. The the subdirectory referred to by
@@ -237,7 +237,7 @@ rule RunCommandLine commandLine
local targetVarName = target ; local targetVarName = target ;
local i ; local i ;
for i in $(commandLine) { for i in $(commandLine) {
# targets are marked by the ":" prefix # targets are marked by the ":" prefix
local target = [ Match ^:(.*) : $(i) ] ; local target = [ Match ^:(.*) : $(i) ] ;
if $(target) { if $(target) {
build/jam/OverriddenJamRules
+27 -27
View File
@@ -128,14 +128,14 @@ rule Object
# handle #includes for source: Jam scans for headers with # handle #includes for source: Jam scans for headers with
# the regexp pattern $(HDRSCAN) and then invokes $(HDRRULE) # the regexp pattern $(HDRSCAN) and then invokes $(HDRRULE)
# with the scanned file as the target and the found headers # with the scanned file as the target and the found headers
# as the sources. HDRSEARCH is the value of SEARCH used for # as the sources. HDRSEARCH is the value of SEARCH used for
# the found header files. Finally, if jam must deal with # the found header files. Finally, if jam must deal with
# header files of the same name in different directories, # header files of the same name in different directories,
# they can be distinguished with HDRGRIST. # they can be distinguished with HDRGRIST.
# $(SEARCH_SOURCE:E) is where cc first looks for #include # $(SEARCH_SOURCE:E) is where cc first looks for #include
# "foo.h" files. If the source file is in a distant directory, # "foo.h" files. If the source file is in a distant directory,
# look there. Else, look in "" (the current directory). # look there. Else, look in "" (the current directory).
HDRRULE on $(>) = HdrRule ; HDRRULE on $(>) = HdrRule ;
HDRSCAN on $(>) = $(HDRPATTERN) ; HDRSCAN on $(>) = $(HDRPATTERN) ;
@@ -150,35 +150,35 @@ rule Object
switch $(>:S) switch $(>:S)
{ {
case .asm : As $(<) : $(>) ; case .asm : As $(<) : $(>) ;
case .nasm : AssembleNasm $(<) : $(>) ; case .nasm : AssembleNasm $(<) : $(>) ;
case .c : Cc $(<) : $(>) ; case .c : Cc $(<) : $(>) ;
case .C : C++ $(<) : $(>) ; case .C : C++ $(<) : $(>) ;
case .cc : C++ $(<) : $(>) ; case .cc : C++ $(<) : $(>) ;
case .cpp : C++ $(<) : $(>) ; case .cpp : C++ $(<) : $(>) ;
case .f : Fortran $(<) : $(>) ; case .f : Fortran $(<) : $(>) ;
case .l : if [ on $(2) return $(GENERATE_C++) ] { case .l : if [ on $(2) return $(GENERATE_C++) ] {
InheritPlatform $(<:S=.cpp) : $(1) ; InheritPlatform $(<:S=.cpp) : $(1) ;
C++ $(<) : $(<:S=.cpp) ; C++ $(<) : $(<:S=.cpp) ;
Lex $(<:S=.cpp) : $(>) ; Lex $(<:S=.cpp) : $(>) ;
} else { } else {
InheritPlatform $(<:S=.c) : $(1) ; InheritPlatform $(<:S=.c) : $(1) ;
Cc $(<) : $(<:S=.c) ; Cc $(<) : $(<:S=.c) ;
Lex $(<:S=.c) : $(>) ; Lex $(<:S=.c) : $(>) ;
} }
case *.o : return ; case *.o : return ;
case .s : As $(<) : $(>) ; case .s : As $(<) : $(>) ;
case .S : As $(<) : $(>) ; case .S : As $(<) : $(>) ;
case .y : if [ on $(2) return $(GENERATE_C++) ] { case .y : if [ on $(2) return $(GENERATE_C++) ] {
InheritPlatform $(1:S=.cpp) $(1:S=.hpp) : $(1) ; InheritPlatform $(1:S=.cpp) $(1:S=.hpp) : $(1) ;
C++ $(1) : $(1:S=.cpp) ; C++ $(1) : $(1:S=.cpp) ;
Yacc $(1:S=.cpp) $(1:S=.hpp) : $(2) ; Yacc $(1:S=.cpp) $(1:S=.hpp) : $(2) ;
} else { } else {
InheritPlatform $(1:S=.c) $(1:S=.h) : $(1) ; InheritPlatform $(1:S=.c) $(1:S=.h) : $(1) ;
Cc $(1) : $(1:S=.c) ; Cc $(1) : $(1:S=.c) ;
Yacc $(1:S=.c) $(1:S=.h) : $(2) ; Yacc $(1:S=.c) $(1:S=.h) : $(2) ;
} }
case * : UserObject $(<) : $(>) ; case * : UserObject $(<) : $(>) ;
} }
} }
@@ -469,7 +469,7 @@ rule LibraryFromObjects
LocalDepends lib : $(_l) ; LocalDepends lib : $(_l) ;
# Set LOCATE for the library and its contents. The bound # Set LOCATE for the library and its contents. The bound
# value shows up as $(NEEDLIBS) on the Link actions. # value shows up as $(NEEDLIBS) on the Link actions.
# For compatibility, we only do this if the library doesn't # For compatibility, we only do this if the library doesn't
# already have a path. # already have a path.
@@ -551,8 +551,8 @@ rule MainFromObjects
if $(_t) != $(<) if $(_t) != $(<)
{ {
Depends $(<) : $(_t) ; Depends $(<) : $(_t) ;
NotFile $(<) ; NotFile $(<) ;
} }
# make compiled sources a dependency of target # make compiled sources a dependency of target
@@ -582,10 +582,10 @@ rule MakeLocate
local target ; local target ;
for target in $(1) { for target in $(1) {
# don't relocate once located # don't relocate once located
LOCATE on $(target) += $(dir:G=) ; LOCATE on $(target) += $(dir:G=) ;
if [ on $(target) return $(LOCATE) ] = $(dir:G=) { if [ on $(target) return $(LOCATE) ] = $(dir:G=) {
Depends $(target) : $(dir) ; Depends $(target) : $(dir) ;
MkDir $(dir) ; MkDir $(dir) ;
} }
} }
} }
@@ -717,7 +717,7 @@ rule SubInclude
if ! $($(<[1])) if ! $($(<[1]))
{ {
Exit SubInclude $(<[1]) without prior SubDir $(<[1]) ; Exit SubInclude $(<[1]) without prior SubDir $(<[1]) ;
} }
# Set up the config variables for the subdirectory. # Set up the config variables for the subdirectory.
build/jam/UserBuildConfig.ReadMe
+1 -1
View File
@@ -158,7 +158,7 @@ HAIKU_IMAGE_EARLY_USER_SCRIPTS = $(HAIKU_TOP)/../early-image-script.sh ;
HAIKU_IMAGE_LATE_USER_SCRIPTS = $(HAIKU_TOP)/../late-image-script.sh ; HAIKU_IMAGE_LATE_USER_SCRIPTS = $(HAIKU_TOP)/../late-image-script.sh ;
# Set name and real name of the root user. Defaults to "baron" and "Root User". # Set name and real name of the root user. Defaults to "baron" and "Root User".
HAIKU_ROOT_USER_NAME = bond ; HAIKU_ROOT_USER_NAME = bond ;
HAIKU_ROOT_USER_REAL_NAME = "James Bond" ; HAIKU_ROOT_USER_REAL_NAME = "James Bond" ;
# Set host name to "mybox". By default the installation doesn't have a host # Set host name to "mybox". By default the installation doesn't have a host