Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cling-cpt] Added indentation for visual indent to get rid of E128 error code. [skip-ci] #10979

Merged
merged 1 commit into from
Jul 17, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions interpreter/cling/tools/packaging/cpt.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ def update_old_llvm():
def llvm_flag_setter(llvm_dir, llvm_config_path):
flags = "-DLLVM_BINARY_DIR={0} -DLLVM_CONFIG={1} -DLLVM_LIBRARY_DIR={2} -DLLVM_MAIN_INCLUDE_DIR={3} -DLLVM_TABLEGEN_EXE={4} \
-DLLVM_TOOLS_BINARY_DIR={5} -DLLVM_TOOL_CLING_BUILD=ON".format(llvm_dir, llvm_config_path,
os.path.join(llvm_dir, 'lib'), os.path.join(llvm_dir, 'include'), os.path.join(llvm_dir, 'bin', 'llvm-tblgen'),
os.path.join(llvm_dir, 'bin'))
os.path.join(llvm_dir, 'lib'), os.path.join(llvm_dir, 'include'), os.path.join(llvm_dir, 'bin', 'llvm-tblgen'),
os.path.join(llvm_dir, 'bin'))
if args['verbose']:
flags += " -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
return flags
Expand Down Expand Up @@ -1813,8 +1813,8 @@ def make_dmg():
parser.add_argument('--with-verbose-output', help='Tell CMake to build with verbosity', action='store_true')
parser.add_argument('--with-cmake-flags', help='Additional CMake configuration flags', default='')
parser.add_argument('--with-stdlib', help=('C++ Library to use, stdlibc++ or libc++.'
' To build a spcific llvm <tag> of libc++ with cling '
'specify libc++,<tag>'),
' To build a spcific llvm <tag> of libc++ with cling '
'specify libc++,<tag>'),
default='')
parser.add_argument('-y', help='Non-interactive mode (yes to all)', action='store_true')

Expand Down Expand Up @@ -2007,15 +2007,15 @@ def custom_input(prompt, always_yes=False):
if choice in yes:
# Need to communicate values to the shell. Do not use exec_subprocess_call()
subprocess.Popen(['sudo apt-get update'],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
subprocess.Popen(['sudo apt-get install ' + install_line],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
break
elif choice in no:
print('''
Expand Down Expand Up @@ -2063,10 +2063,10 @@ def custom_input(prompt, always_yes=False):
if choice in yes:
# Need to communicate values to the shell. Do not use exec_subprocess_call()
subprocess.Popen(['sudo yum install ' + install_line],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
break
elif choice in no:
print('''
Expand Down Expand Up @@ -2100,15 +2100,15 @@ def custom_input(prompt, always_yes=False):
if choice in yes:
# Need to communicate values to the shell. Do not use exec_subprocess_call()
subprocess.Popen(['sudo port -v selfupdate'],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
subprocess.Popen(['sudo port install ' + install_line],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
break
elif choice in no:
print('''
Expand Down