Mercurial > hg > graal-jvmci-8
comparison mx/mx_graal.py @ 18414:df8d52aba789
fixed support for IDE_BUILD_TARGET
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Nov 2014 13:10:24 +0100 |
parents | 1e7b53d7489d |
children | 676f1800077c |
comparison
equal
deleted
inserted
replaced
18413:12cae938aade | 18414:df8d52aba789 |
---|---|
777 if not _vmSourcesAvailable or not opts2.native: | 777 if not _vmSourcesAvailable or not opts2.native: |
778 return | 778 return |
779 | 779 |
780 builds = [_vmbuild] | 780 builds = [_vmbuild] |
781 | 781 |
782 if os.environ.get('BUILDING_FROM_IDE', None) == 'true': | |
783 build = os.environ.get('IDE_BUILD_TARGET', None) | |
784 if build is None or len(build) == 0: | |
785 return | |
786 if build not in _vmbuildChoices: | |
787 mx.abort('VM build "' + build + '" specified by IDE_BUILD_TARGET environment variable is unknown (must be one of ' + | |
788 str(_vmbuildChoices) + ')') | |
789 builds = [build] | |
790 | |
782 if vm is None: | 791 if vm is None: |
783 vm = _get_vm() | 792 vm = _get_vm() |
784 | 793 |
785 if vm == 'original': | 794 if vm == 'original': |
786 pass | 795 pass |
796 if not mx.ask_yes_no("Warning: building while --installed-jdks is set (" + _installed_jdks + ") is not recommanded - are you sure you want to continue", 'n'): | 805 if not mx.ask_yes_no("Warning: building while --installed-jdks is set (" + _installed_jdks + ") is not recommanded - are you sure you want to continue", 'n'): |
797 mx.abort(1) | 806 mx.abort(1) |
798 | 807 |
799 isWindows = platform.system() == 'Windows' or "CYGWIN" in platform.system() | 808 isWindows = platform.system() == 'Windows' or "CYGWIN" in platform.system() |
800 for build in builds: | 809 for build in builds: |
801 if build == 'ide-build-target': | |
802 build = os.environ.get('IDE_BUILD_TARGET', None) | |
803 if build is None or len(build) == 0: | |
804 continue | |
805 | |
806 installJars = vm != 'original' and (isWindows or not opts2.java) | 810 installJars = vm != 'original' and (isWindows or not opts2.java) |
807 jdk = _jdk(build, create=True, installJars=installJars) | 811 jdk = _jdk(build, create=True, installJars=installJars) |
808 | 812 |
809 if vm == 'original': | 813 if vm == 'original': |
810 if build != 'product': | 814 if build != 'product': |