[llvm] r330455 - Remove llvm-build's --configure-target-def-file.
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 20 10:21:11 PDT 2018
Author: nico
Date: Fri Apr 20 10:21:10 2018
New Revision: 330455
URL: http://llvm.org/viewvc/llvm-project?rev=330455&view=rev
Log:
Remove llvm-build's --configure-target-def-file.
It was added 6.5 years ago in r144345, but was never hooked up and has been
unused since. If _you_ do use this, feel free to revert, but add a comment
on where it's used.
https://reviews.llvm.org/D45262
Removed:
llvm/trunk/utils/llvm-build/llvmbuild/configutil.py
Modified:
llvm/trunk/utils/llvm-build/llvmbuild/main.py
Removed: llvm/trunk/utils/llvm-build/llvmbuild/configutil.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-build/llvmbuild/configutil.py?rev=330454&view=auto
==============================================================================
--- llvm/trunk/utils/llvm-build/llvmbuild/configutil.py (original)
+++ llvm/trunk/utils/llvm-build/llvmbuild/configutil.py (removed)
@@ -1,66 +0,0 @@
-"""
-Defines utilities useful for performing standard "configuration" style tasks.
-"""
-
-import re
-import os
-
-def configure_file(input_path, output_path, substitutions):
- """configure_file(input_path, output_path, substitutions) -> bool
-
- Given an input and output path, "configure" the file at the given input path
- by replacing variables in the file with those given in the substitutions
- list. Returns true if the output file was written.
-
- The substitutions list should be given as a list of tuples (regex string,
- replacement), where the regex and replacement will be used as in 're.sub' to
- execute the variable replacement.
-
- The output path's parent directory need not exist (it will be created).
-
- If the output path does exist and the configured data is not different than
- it's current contents, the output file will not be modified. This is
- designed to limit the impact of configured files on build dependencies.
- """
-
- # Read in the input data.
- f = open(input_path, "rb")
- try:
- data = f.read()
- finally:
- f.close()
-
- # Perform the substitutions.
- for regex_string,replacement in substitutions:
- regex = re.compile(regex_string)
- data = regex.sub(replacement, data)
-
- # Ensure the output parent directory exists.
- output_parent_path = os.path.dirname(os.path.abspath(output_path))
- if not os.path.exists(output_parent_path):
- os.makedirs(output_parent_path)
-
- # If the output path exists, load it and compare to the configured contents.
- if os.path.exists(output_path):
- current_data = None
- try:
- f = open(output_path, "rb")
- try:
- current_data = f.read()
- except:
- current_data = None
- f.close()
- except:
- current_data = None
-
- if current_data is not None and current_data == data:
- return False
-
- # Write the output contents.
- f = open(output_path, "wb")
- try:
- f.write(data)
- finally:
- f.close()
-
- return True
Modified: llvm/trunk/utils/llvm-build/llvmbuild/main.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-build/llvmbuild/main.py?rev=330455&r1=330454&r2=330455&view=diff
==============================================================================
--- llvm/trunk/utils/llvm-build/llvmbuild/main.py (original)
+++ llvm/trunk/utils/llvm-build/llvmbuild/main.py Fri Apr 20 10:21:10 2018
@@ -4,7 +4,6 @@ import os
import sys
import llvmbuild.componentinfo as componentinfo
-import llvmbuild.configutil as configutil
from llvmbuild.util import fatal, note
@@ -376,7 +375,7 @@ subdirectories = %s
f.write("""\
//===- llvm-build generated file --------------------------------*- C++ -*-===//
//
-// Component Library Depenedency Table
+// Component Library Dependency Table
//
// Automatically generated file, do not edit!
//
@@ -761,9 +760,6 @@ def main():
help=(
"If given, an alternate path to search for LLVMBuild.txt files"),
action="store", default=None, metavar="PATH")
- group.add_option("", "--build-root", dest="build_root", metavar="PATH",
- help="Path to the build directory (if needed) [%default]",
- action="store", default=None)
parser.add_option_group(group)
group = OptionGroup(parser, "Output Options")
@@ -785,14 +781,6 @@ def main():
dest="write_cmake_exports_fragment", metavar="PATH",
help="Write the CMake exports information to PATH",
action="store", default=None)
- group.add_option("", "--configure-target-def-file",
- dest="configure_target_def_files",
- help="""Configure the given file at SUBPATH (relative to
-the inferred or given source root, and with a '.in' suffix) by replacing certain
-substitution variables with lists of targets that support certain features (for
-example, targets with AsmPrinters) and write the result to the build root (as
-given by --build-root) at the same SUBPATH""",
- metavar="SUBPATH", action="append", default=None)
parser.add_option_group(group)
group = OptionGroup(parser, "Configuration Options")
@@ -863,40 +851,5 @@ given by --build-root) at the same SUBPA
project_info.write_cmake_exports_fragment(opts.write_cmake_exports_fragment,
opts.optional_components)
- # Configure target definition files, if requested.
- if opts.configure_target_def_files:
- # Verify we were given a build root.
- if not opts.build_root:
- parser.error("must specify --build-root when using "
- "--configure-target-def-file")
-
- # Create the substitution list.
- available_targets = [ci for ci in project_info.component_infos
- if ci.type_name == 'TargetGroup']
- substitutions = [
- ("@LLVM_ENUM_TARGETS@",
- ' '.join('LLVM_TARGET(%s)' % ci.name
- for ci in available_targets)),
- ("@LLVM_ENUM_ASM_PRINTERS@",
- ' '.join('LLVM_ASM_PRINTER(%s)' % ci.name
- for ci in available_targets
- if ci.has_asmprinter)),
- ("@LLVM_ENUM_ASM_PARSERS@",
- ' '.join('LLVM_ASM_PARSER(%s)' % ci.name
- for ci in available_targets
- if ci.has_asmparser)),
- ("@LLVM_ENUM_DISASSEMBLERS@",
- ' '.join('LLVM_DISASSEMBLER(%s)' % ci.name
- for ci in available_targets
- if ci.has_disassembler))]
-
- # Configure the given files.
- for subpath in opts.configure_target_def_files:
- inpath = os.path.join(source_root, subpath + '.in')
- outpath = os.path.join(opts.build_root, subpath)
- result = configutil.configure_file(inpath, outpath, substitutions)
- if not result:
- note("configured file %r hasn't changed" % outpath)
-
if __name__=='__main__':
main()
More information about the llvm-commits
mailing list