Force travis to use LLVM binary release tar

This commit is contained in:
Pratyush Das 2019-12-02 15:48:31 +05:30 committed by SFT
parent a876834199
commit f2ea3180f3
2 changed files with 13 additions and 7 deletions

View File

@ -168,6 +168,7 @@ script:
--check-requirements \
--current-dev=tar \
--with-binary-llvm \
--with-llvm-tar \
--with-cling-url=https://github.com/$TRAVIS_REPO_SLUG \
--with-clang-url=http://root.cern.ch/git/clang.git \
--with-cmake-flags="$CLING_BUILD_FLAGS" \
@ -176,6 +177,7 @@ script:
tools/packaging/cpt.py -y \
--check-requirements \
--with-binary-llvm \
--with-llvm-tar \
--tarball-tag=$([[ $TRAVIS_TAG = cling-nightlies ]] && echo "master" || echo "$TRAVIS_TAG") \
--with-cling-url=https://github.com/$TRAVIS_REPO_SLUG \
--with-clang-url=http://root.cern.ch/git/clang.git \

View File

@ -1906,6 +1906,7 @@ parser.add_argument('--with-cling-url', action='store', help='Specify an alterna
default='https://github.com/root-project/cling.git')
parser.add_argument('--with-binary-llvm', help='Download LLVM binary and use it to build Cling in dev mode', action='store_true')
parser.add_argument('--with-llvm-tar', help='Download and use LLVM binary release tar to build Cling for debugging', action='store_true')
parser.add_argument('--no-test', help='Do not run test suite of Cling', action='store_true')
parser.add_argument('--skip-cleanup', help='Do not clean up after a build', action='store_true')
parser.add_argument('--use-wget', help='Do not use Git to fetch sources', action='store_true')
@ -2121,14 +2122,17 @@ if args['check_requirements']:
choice = custom_input("Please respond with 'yes' or 'no': ", args['y'])
continue
if no_install is False and llvm_binary_name != "":
try:
subprocess.Popen(['sudo apt-get install llvm-{0}-dev'.format(llvm_vers)],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
except:
if args["with_llvm_tar"]:
tar_required = True
else:
try:
subprocess.Popen(['sudo apt-get install llvm-{0}-dev'.format(llvm_vers)],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
except:
tar_required = True
elif OS == 'Windows':
check_win('git')