From 74bfec3b96e3c08838100555da4a1f6405ae5d00 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Mon, 7 May 2018 12:54:32 +1200 Subject: [PATCH] build/jam: whitespace cleanup. Change-Id: I80c9a51417631b1f283923451f5bb530097b74f3 --- build/jam/ArchitectureRules | 4 +-- build/jam/BootRules | 6 ++-- build/jam/BuildFeatures | 10 +++--- build/jam/HelperRules | 3 +- build/jam/ImageRules | 14 ++++----- build/jam/KernelRules | 4 +-- build/jam/MainBuildRules | 6 ++-- build/jam/MiscRules | 4 +-- build/jam/OverriddenJamRules | 54 ++++++++++++++++---------------- build/jam/UserBuildConfig.ReadMe | 2 +- 10 files changed, 52 insertions(+), 55 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index d3286e5461..3637c84fc4 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -355,8 +355,8 @@ rule KernelArchitectureSetup architecture # Workaround for ld using 32k for alignment despite forcing it in the config... # should definitely not be needed! HAIKU_KERNEL_LINKFLAGS += - -Wl,-z -Wl,max-page-size=0x1000 - -Wl,-z -Wl,common-page-size=0x1000 ; + -Wl,-z -Wl,max-page-size=0x1000 + -Wl,-z -Wl,common-page-size=0x1000 ; case ppc : # Build a position independent PPC kernel. We need to be able to diff --git a/build/jam/BootRules b/build/jam/BootRules index f369eadc1e..9d9949a934 100644 --- a/build/jam/BootRules +++ b/build/jam/BootRules @@ -25,7 +25,7 @@ rule SetupBoot ObjectCcFlags $(object) : $(TARGET_BOOT_CCFLAGS) $(2) ; ObjectC++Flags $(object) : $(TARGET_BOOT_C++FLAGS) $(2) ; ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ; - ASFLAGS on $(object) = $(TARGET_BOOT_CCFLAGS) ; + ASFLAGS on $(object) = $(TARGET_BOOT_CCFLAGS) ; # override warning flags TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) @@ -57,7 +57,7 @@ rule BootLd libs += [ TargetBootLibsupc++ true ] ; Depends $(1) : [ TargetBootLibsupc++ ] ; } - LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ; + LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ; Depends $(1) : [ TargetBootLibgcc ] ; # TODO: Do we really want to invoke SetupBoot here? The objects should @@ -104,7 +104,7 @@ rule BootMergeObject rule BootStaticLibrary { - # Usage BootStaticLibrary : : ; + # Usage BootStaticLibrary : : ; # This is designed to take a set of sources and libraries and create # a file called lib.a diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index af20a1510c..6ad12d1b95 100644 --- a/build/jam/BuildFeatures +++ b/build/jam/BuildFeatures @@ -49,7 +49,7 @@ if $(TARGET_PACKAGING_ARCH) != x86_gcc2 { ; EnableBuildFeatures gcc_syslibs ; - } else { + } else { Echo "gcc_syslibs not available for $(TARGET_PACKAGING_ARCH)" ; } } @@ -85,7 +85,7 @@ if [ IsPackageAvailable gcc_syslibs_devel ] { } EnableBuildFeatures gcc_syslibs_devel ; -} else { +} else { Echo "gcc_syslibs_devel not available for $(TARGET_PACKAGING_ARCH)" ; } @@ -110,7 +110,7 @@ if [ IsPackageAvailable icu_devel ] { ; EnableBuildFeatures icu ; -} else { +} else { Echo "ICU not available for $(TARGET_PACKAGING_ARCH)" ; } @@ -128,7 +128,7 @@ if [ IsPackageAvailable curl_devel ] { ; EnableBuildFeatures curl ; -} else { +} else { Echo "Curl not available for $(TARGET_PACKAGING_ARCH)" ; } @@ -665,7 +665,7 @@ if [ IsPackageAvailable live555_devel ] { $(developHeadersDir)/UsageEnvironment ; EnableBuildFeatures live555 ; -} else { +} else { Echo "live555 not available for $(TARGET_PACKAGING_ARCH)" ; } diff --git a/build/jam/HelperRules b/build/jam/HelperRules index 31d05f2e43..d2baff1d11 100644 --- a/build/jam/HelperRules +++ b/build/jam/HelperRules @@ -364,6 +364,5 @@ rule InheritPlatform rule SubDirAsFlags { - SUBDIRASFLAGS += $(<) ; + SUBDIRASFLAGS += $(<) ; } - diff --git a/build/jam/ImageRules b/build/jam/ImageRules index 0112b8d7fe..3fb229d4e5 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -424,7 +424,7 @@ rule AddWifiFirmwareToContainer container : driver : package : archive : extract ExtractArchiveToContainer $(container) : $(dirTokens) : $(firmwareArchive) : : $(package) ; } else { - AddFilesToContainer $(container) : $(dirTokens) : $(firmwareArchive) ; + AddFilesToContainer $(container) : $(dirTokens) : $(firmwareArchive) ; } } @@ -886,7 +886,7 @@ rule AddPackagesAndRepositoryVariablesToContainerScript script : container AddVariableToScript $(script) : updateAllPackages : $(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) ] ; if $(updateOnly) && ! [ IncludeAllTargetsInContainer $(container) ] { allPackages = [ FilterContainerUpdateTargets $(allPackages) @@ -1182,7 +1182,7 @@ rule InstallSourceArchive file : url rule InstallOptionalHaikuImagePackage url : dirTokens : flags { # 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: # * For a hpkg is ignored. The package will be copied into the # system/packages directory. @@ -1415,7 +1415,7 @@ rule CreateNetBootArchiveCopyFilesScript script rule BuildNetBootArchive archive : scripts { - # BuildNetBootArchive : ; + # BuildNetBootArchive : ; local mainScript = build_archive ; SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ; @@ -1506,7 +1506,7 @@ rule CreateFloppyBootArchiveCopyFilesScript script rule BuildFloppyBootArchive archive : scripts { - # BuildHFloppyBootArchive : ; + # BuildHFloppyBootArchive : ; local mainScript = build_archive ; SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ; @@ -1595,7 +1595,7 @@ actions BuildCDBootImage1 { $(RM) $(<) 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 $(RM) -r $(HAIKU_OUTPUT_DIR)/cd } - - diff --git a/build/jam/KernelRules b/build/jam/KernelRules index 11fda4f6e0..ce110183f4 100644 --- a/build/jam/KernelRules +++ b/build/jam/KernelRules @@ -51,7 +51,7 @@ rule KernelLd libs += [ TargetKernelLibsupc++ true ] ; Depends $(1) : [ TargetKernelLibsupc++ ] ; } - LINKLIBS on $(1) = $(libs) [ TargetKernelLibgcc true ] ; + LINKLIBS on $(1) = $(libs) [ TargetKernelLibgcc true ] ; Depends $(1) : [ TargetKernelLibgcc ] ; HAIKU_TARGET_IS_EXECUTABLE on $(1) = 1 ; @@ -164,7 +164,7 @@ rule KernelMergeObject rule KernelStaticLibrary { - # Usage KernelStaticLibrary : : ; + # Usage KernelStaticLibrary : : ; # This is designed to take a set of sources and libraries and create # a static library. diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules index 9114c8fdbd..0f7305d99a 100644 --- a/build/jam/MainBuildRules +++ b/build/jam/MainBuildRules @@ -28,7 +28,7 @@ rule AddSharedObjectGlueCode LINK_BEGIN_GLUE on $(1) = $(beginGlue) ; 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) ; LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib -Xlinker --no-undefined ; @@ -53,7 +53,7 @@ rule Executable Main $(1) : $(2) ; LinkAgainst $(1) : $(3) ; 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 # for Haiku @@ -692,7 +692,7 @@ rule BuildPlatformSharedLibrary -shared -Xlinker -soname=\"$(target:G=)\" ; } - local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; + local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ; C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ; } diff --git a/build/jam/MiscRules b/build/jam/MiscRules index ec154755ee..39936bb538 100644 --- a/build/jam/MiscRules +++ b/build/jam/MiscRules @@ -135,7 +135,7 @@ HAIKU_DEFERRED_SUB_INCLUDES = ; rule DeferredSubInclude params : jamfile : scope { - # DeferredSubInclude [ : [ : ] ] ; + # DeferredSubInclude [ : [ : ] ] ; # # Takes the same directory tokens parameter as SubInclude plus an optional # alternative Jamfile name. The the subdirectory referred to by @@ -237,7 +237,7 @@ rule RunCommandLine commandLine local targetVarName = target ; local i ; - for i in $(commandLine) { + for i in $(commandLine) { # targets are marked by the ":" prefix local target = [ Match ^:(.*) : $(i) ] ; if $(target) { diff --git a/build/jam/OverriddenJamRules b/build/jam/OverriddenJamRules index 4e8ab90231..0aaf6f8fa6 100644 --- a/build/jam/OverriddenJamRules +++ b/build/jam/OverriddenJamRules @@ -128,14 +128,14 @@ rule Object # handle #includes for source: Jam scans for headers with # the regexp pattern $(HDRSCAN) and then invokes $(HDRRULE) # with the scanned file as the target and the found headers - # as the sources. HDRSEARCH is the value of SEARCH used for - # the found header files. Finally, if jam must deal with + # as the sources. HDRSEARCH is the value of SEARCH used for + # the found header files. Finally, if jam must deal with # header files of the same name in different directories, # they can be distinguished with HDRGRIST. # $(SEARCH_SOURCE:E) is where cc first looks for #include - # "foo.h" files. If the source file is in a distant directory, - # look there. Else, look in "" (the current directory). + # "foo.h" files. If the source file is in a distant directory, + # look there. Else, look in "" (the current directory). HDRRULE on $(>) = HdrRule ; HDRSCAN on $(>) = $(HDRPATTERN) ; @@ -150,35 +150,35 @@ rule Object switch $(>:S) { - case .asm : As $(<) : $(>) ; - case .nasm : AssembleNasm $(<) : $(>) ; - case .c : Cc $(<) : $(>) ; - case .C : C++ $(<) : $(>) ; - case .cc : C++ $(<) : $(>) ; - case .cpp : C++ $(<) : $(>) ; - case .f : Fortran $(<) : $(>) ; - case .l : if [ on $(2) return $(GENERATE_C++) ] { - InheritPlatform $(<:S=.cpp) : $(1) ; + case .asm : As $(<) : $(>) ; + case .nasm : AssembleNasm $(<) : $(>) ; + case .c : Cc $(<) : $(>) ; + case .C : C++ $(<) : $(>) ; + case .cc : C++ $(<) : $(>) ; + case .cpp : C++ $(<) : $(>) ; + case .f : Fortran $(<) : $(>) ; + case .l : if [ on $(2) return $(GENERATE_C++) ] { + InheritPlatform $(<:S=.cpp) : $(1) ; C++ $(<) : $(<:S=.cpp) ; Lex $(<:S=.cpp) : $(>) ; } else { - InheritPlatform $(<:S=.c) : $(1) ; + InheritPlatform $(<:S=.c) : $(1) ; Cc $(<) : $(<:S=.c) ; Lex $(<:S=.c) : $(>) ; } case *.o : return ; - case .s : As $(<) : $(>) ; - case .S : As $(<) : $(>) ; - case .y : if [ on $(2) return $(GENERATE_C++) ] { - InheritPlatform $(1:S=.cpp) $(1:S=.hpp) : $(1) ; + case .s : As $(<) : $(>) ; + case .S : As $(<) : $(>) ; + case .y : if [ on $(2) return $(GENERATE_C++) ] { + InheritPlatform $(1:S=.cpp) $(1:S=.hpp) : $(1) ; C++ $(1) : $(1:S=.cpp) ; Yacc $(1:S=.cpp) $(1:S=.hpp) : $(2) ; } else { - InheritPlatform $(1:S=.c) $(1:S=.h) : $(1) ; + InheritPlatform $(1:S=.c) $(1:S=.h) : $(1) ; Cc $(1) : $(1:S=.c) ; Yacc $(1:S=.c) $(1:S=.h) : $(2) ; } - case * : UserObject $(<) : $(>) ; + case * : UserObject $(<) : $(>) ; } } @@ -469,7 +469,7 @@ rule LibraryFromObjects 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. # For compatibility, we only do this if the library doesn't # already have a path. @@ -551,8 +551,8 @@ rule MainFromObjects if $(_t) != $(<) { - Depends $(<) : $(_t) ; - NotFile $(<) ; + Depends $(<) : $(_t) ; + NotFile $(<) ; } # make compiled sources a dependency of target @@ -582,10 +582,10 @@ rule MakeLocate local target ; for target in $(1) { # don't relocate once located - LOCATE on $(target) += $(dir:G=) ; + LOCATE on $(target) += $(dir:G=) ; if [ on $(target) return $(LOCATE) ] = $(dir:G=) { - Depends $(target) : $(dir) ; - MkDir $(dir) ; + Depends $(target) : $(dir) ; + MkDir $(dir) ; } } } @@ -717,7 +717,7 @@ rule SubInclude if ! $($(<[1])) { - Exit SubInclude $(<[1]) without prior SubDir $(<[1]) ; + Exit SubInclude $(<[1]) without prior SubDir $(<[1]) ; } # Set up the config variables for the subdirectory. diff --git a/build/jam/UserBuildConfig.ReadMe b/build/jam/UserBuildConfig.ReadMe index 63691a59f4..de9a80932c 100644 --- a/build/jam/UserBuildConfig.ReadMe +++ b/build/jam/UserBuildConfig.ReadMe @@ -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 ; # 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" ; # Set host name to "mybox". By default the installation doesn't have a host