comparison mx/mx_graal.py @ 14720:af7b9b9a9a28

mx build: ignore release tag suffix if build directory is not a mercurial repository
author Bernhard Urban <bernhard.urban@jku.at>
date Mon, 24 Mar 2014 09:40:29 +0100
parents f50dece27798
children bf51a92a1bdd
comparison
equal deleted inserted replaced
14719:0bdd0d157040 14720:af7b9b9a9a28
645 env.setdefault('LANG', 'C') 645 env.setdefault('LANG', 'C')
646 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus)) 646 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus))
647 env.setdefault('ALT_BOOTDIR', mx.java().jdk) 647 env.setdefault('ALT_BOOTDIR', mx.java().jdk)
648 648
649 # extract latest release tag for graal 649 # extract latest release tag for graal
650 tags = [x.split(' ')[0] for x in subprocess.check_output(['hg', 'tags']).split('\n') if x.startswith("graal-")] 650 try:
651 tags = [x.split(' ')[0] for x in subprocess.check_output(['hg', 'tags']).split('\n') if x.startswith("graal-")]
652 except:
653 # not a mercurial repository or hg commands are not available.
654 tags = None
655
651 if tags: 656 if tags:
652 # extract the most recent tag 657 # extract the most recent tag
653 tag = sorted(tags, key=lambda e: [int(x) for x in e[len("graal-"):].split('.')], reverse=True)[0] 658 tag = sorted(tags, key=lambda e: [int(x) for x in e[len("graal-"):].split('.')], reverse=True)[0]
654 env.setdefault('USER_RELEASE_SUFFIX', tag) 659 env.setdefault('USER_RELEASE_SUFFIX', tag)
660
655 if not mx._opts.verbose: 661 if not mx._opts.verbose:
656 runCmd.append('MAKE_VERBOSE=') 662 runCmd.append('MAKE_VERBOSE=')
657 env['JAVA_HOME'] = jdk 663 env['JAVA_HOME'] = jdk
658 if vm.endswith('nograal'): 664 if vm.endswith('nograal'):
659 env['INCLUDE_GRAAL'] = 'false' 665 env['INCLUDE_GRAAL'] = 'false'