Mercurial > hg > graal-jvmci-8

comparison mxtool/mx.py @ 21975:290a87b718e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: Use purpose while selecting jdk for IGV and projects. Make jdk selection messages nicer
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Thu, 11 Jun 2015 16:17:16 +0200
parents 7a0c8adc0a30
children 36e37644f91e
comparison
equal deleted inserted replaced
21974:7a0c8adc0a30 21975:290a87b718e1
1274 logv('[omitting optional library {0} as {1} does not exist]'.format(d, d.path)) 1274 logv('[omitting optional library {0} as {1} does not exist]'.format(d, d.path))
1275 ommittedDeps.add(d.name) 1275 ommittedDeps.add(d.name)
1276 del _libs[d.name] 1276 del _libs[d.name]
1277 self.libs.remove(d) 1277 self.libs.remove(d)
1278 elif d.isProject(): 1278 elif d.isProject():
1279 if java(d.javaCompliance, cancel='some projects will be omitted which may result in errors') is None: 1279 if java(d.javaCompliance, cancel='some projects will be omitted which may result in errors', purpose="building projects with compliance " + str(d.javaCompliance)) is None:
1280 logv('[omitting project {0} as Java compliance {1} cannot be satisfied by configured JDKs]'.format(d, d.javaCompliance)) 1280 logv('[omitting project {0} as Java compliance {1} cannot be satisfied by configured JDKs]'.format(d, d.javaCompliance))
1281 ommittedDeps.add(d.name) 1281 ommittedDeps.add(d.name)
1282 del _projects[d.name] 1282 del _projects[d.name]
1283 self.projects.remove(d) 1283 self.projects.remove(d)
1284 else: 1284 else:
1903 1903
1904 if len(configs) > 1: 1904 if len(configs) > 1:
1905 if not is_interactive(): 1905 if not is_interactive():
1906 msg = "Multiple possible choices for a JDK" 1906 msg = "Multiple possible choices for a JDK"
1907 if purpose: 1907 if purpose:
1908 msg += ' for' + purpose 1908 msg += ' for ' + purpose
1909 msg += ': ' 1909 msg += ': '
1910 if versionDescription: 1910 if versionDescription:
1911 msg += '(' + versionDescription + ')' 1911 msg += '(version ' + versionDescription + ')'
1912 selected = configs[0] 1912 selected = configs[0]
1913 msg += ". Selecting " + str(selected) 1913 msg += ". Selecting " + str(selected)
1914 log(msg) 1914 log(msg)
1915 else: 1915 else:
1916 msg = 'Please select a ' 1916 msg = 'Please select a '
1917 if isDefaultJdk: 1917 if isDefaultJdk:
1918 msg += 'default ' 1918 msg += 'default '
1919 msg += 'JDK' 1919 msg += 'JDK'
1920 if purpose: 1920 if purpose:
1921 msg += ' for' + purpose 1921 msg += ' for ' + purpose
1922 msg += ': ' 1922 msg += ': '
1923 if versionDescription: 1923 if versionDescription:
1924 msg += '(' + versionDescription + ')' 1924 msg += '(version ' + versionDescription + ')'
1925 log(msg) 1925 log(msg)
1926 choices = configs + ['<other>'] 1926 choices = configs + ['<other>']
1927 if cancel: 1927 if cancel:
1928 choices.append('Cancel (' + cancel + ')') 1928 choices.append('Cancel (' + cancel + ')')
1929 selected = select_items(choices, allowMultiple=False) 1929 selected = select_items(choices, allowMultiple=False)
1938 msg += 'default ' 1938 msg += 'default '
1939 msg += 'JDK' 1939 msg += 'JDK'
1940 if versionDescription: 1940 if versionDescription:
1941 msg = msg + ' ' + versionDescription 1941 msg = msg + ' ' + versionDescription
1942 if purpose: 1942 if purpose:
1943 msg += ' for' + purpose 1943 msg += ' for ' + purpose
1944 log(msg) 1944 log(msg)
1945 else: 1945 else:
1946 msg = 'Could not find any JDK' 1946 msg = 'Could not find any JDK'
1947 if purpose: 1947 if purpose:
1948 msg += ' for' + purpose 1948 msg += ' for ' + purpose
1949 msg += ' ' 1949 msg += ' '
1950 if versionDescription: 1950 if versionDescription:
1951 msg = msg + '(' + versionDescription + ')' 1951 msg = msg + '(version ' + versionDescription + ')'
1952 log(msg) 1952 log(msg)
1953 selected = None 1953 selected = None
1954 1954
1955 while not selected: 1955 while not selected:
1956 jdkLocation = raw_input('Enter path of JDK: ') 1956 jdkLocation = raw_input('Enter path of JDK: ')