Reflow long lines of LLVMBuild.txt files

[dougk]

Summary

The standard Python configparser library supports this, per the documentation:
"In config parsers, values can span multiple lines as long as they are indented more than the key that holds them."
ref. https://docs.python.org/3/library/configparser.html

[jroelofs]

lib/Target/LLVMBuild.txt

19 ↗

(On Diff #25698)

Can this particular one be done as one backend per line? That would help OOT backends with merge conflicts going forward.

[dougk]

Each subdir of Target one a line by itself.

[dougk]

Old Python libraries (going back to 2.4.4, possibly older) can parse this line-breaks correctly.

lib/Target/LLVMBuild.txt

19 ↗

(On Diff #25698)

good idea!

[jroelofs]

I just noticed they're all alphabetized... maybe it makes sense to do all three in the one-per-line style? We're not hurting for line-count in these files.

Either way, LGTM.

[dougk]

tools/LLVMBuild was not quite alphabetized. I'll check this in as-is, and if the builders are happy, go and re-touch all the things.

llvm/trunk/lib/LLVMBuild.txt

 ;
 ; For more information on the LLVMBuild system, please see:
 ;
 ;   http://llvm.org/docs/LLVMBuild.html
 ;
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = Analysis AsmParser Bitcode CodeGen DebugInfo ExecutionEngine LineEditor Linker IR IRReader LTO MC Object Option Passes ProfileData Support TableGen Target Transforms
+subdirectories = Analysis AsmParser Bitcode CodeGen DebugInfo ExecutionEngine
+ LineEditor Linker IR IRReader LTO MC Object Option Passes ProfileData Support
+ TableGen Target Transforms
 
 [component_0]
 type = Group
 name = Libraries
 parent = $ROOT

llvm/trunk/lib/Target/LLVMBuild.txt

 ; This is an LLVMBuild description file for the components in this subdirectory.
 ;
 ; For more information on the LLVMBuild system, please see:
 ;
 ;   http://llvm.org/docs/LLVMBuild.html
 ;
 ;===------------------------------------------------------------------------===;
 
+; Please keep these as one per line so that out-of-tree merges
+; will typically require only insertion of a line.
 [common]
-subdirectories = ARM AArch64 BPF CppBackend Hexagon MSP430 NVPTX Mips PowerPC R600 Sparc SystemZ X86 XCore
+subdirectories =
+ ARM
+ AArch64
+ BPF
+ CppBackend
+ Hexagon
+ MSP430
+ NVPTX
+ Mips
+ PowerPC
+ R600
+ Sparc
+ SystemZ
+ X86
+ XCore
 
 ; This is a special group whose required libraries are extended (by llvm-build)
 ; with the best execution engine (the native JIT, if available, or the
 ; interpreter).
 [component_0]
 type = LibraryGroup
 name = Engine
 parent = Libraries

llvm/trunk/tools/LLVMBuild.txt

 ;
 ; For more information on the LLVMBuild system, please see:
 ;
 ;   http://llvm.org/docs/LLVMBuild.html
 ;
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = bugpoint llc lli llvm-ar llvm-as llvm-bcanalyzer llvm-cov llvm-diff llvm-dis llvm-dwarfdump llvm-extract llvm-jitlistener llvm-link llvm-lto llvm-mc llvm-nm llvm-objdump llvm-pdbdump llvm-profdata llvm-rtdyld llvm-size macho-dump opt llvm-mcmarkup verify-uselistorder dsymutil
+subdirectories = bugpoint llc lli llvm-ar llvm-as llvm-bcanalyzer llvm-cov
+ llvm-diff llvm-dis llvm-dwarfdump llvm-extract llvm-jitlistener llvm-link
+ llvm-lto llvm-mc llvm-nm llvm-objdump llvm-pdbdump llvm-profdata llvm-rtdyld
+ llvm-size macho-dump opt llvm-mcmarkup verify-uselistorder dsymutil
 
 [component_0]
 type = Group
 name = Tools
 parent = $ROOT