Mercurial > hg > graal-jvmci-8

comparison mx/mx_graal.py @ 17318:c75bb9cd1994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: force installation of distrubtion on windows on other platforms, the HotSpot Makefile calls back to mx in order to install the JARs
author Bernhard Urban <bernhard.urban@jku.at>
date Thu, 02 Oct 2014 06:33:16 -0700
parents f434913f9cba
children 3c39e028b931
comparison
equal deleted inserted replaced
17317:f434913f9cba 17318:c75bb9cd1994
794 794
795 if _installed_jdks and _installed_jdks != _graal_home: 795 if _installed_jdks and _installed_jdks != _graal_home:
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'): 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'):
797 mx.abort(1) 797 mx.abort(1)
798 798
799 isWindows = platform.system() == 'Windows' or "CYGWIN" in platform.system()
799 for build in builds: 800 for build in builds:
800 if build == 'ide-build-target': 801 if build == 'ide-build-target':
801 build = os.environ.get('IDE_BUILD_TARGET', None) 802 build = os.environ.get('IDE_BUILD_TARGET', None)
802 if build is None or len(build) == 0: 803 if build is None or len(build) == 0:
803 continue 804 continue
804 805
805 jdk = _jdk(build, create=True, installJars=vm != 'original' and not opts2.java) 806 installJars = vm != 'original' and (isWindows or not opts2.java)
807 jdk = _jdk(build, create=True, installJars=installJars)
806 808
807 if vm == 'original': 809 if vm == 'original':
808 if build != 'product': 810 if build != 'product':
809 mx.log('only product build of original VM exists') 811 mx.log('only product build of original VM exists')
810 continue 812 continue
844 846
845 if not mustBuild: 847 if not mustBuild:
846 mx.logv('[all files in src and make directories are older than ' + timestampFile[len(_graal_home) + 1:] + ' - skipping native build]') 848 mx.logv('[all files in src and make directories are older than ' + timestampFile[len(_graal_home) + 1:] + ' - skipping native build]')
847 continue 849 continue
848 850
849 if platform.system() == 'Windows' or "CYGWIN" in platform.system(): 851 if isWindows:
850 t_compilelogfile = mx._cygpathU2W(os.path.join(_graal_home, "graalCompile.log")) 852 t_compilelogfile = mx._cygpathU2W(os.path.join(_graal_home, "graalCompile.log"))
851 mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin') 853 mksHome = mx.get_env('MKS_HOME', 'C:\\cygwin\\bin')
852 854
853 variant = {'client': 'compiler1', 'server': 'compiler2'}.get(vm, vm) 855 variant = {'client': 'compiler1', 'server': 'compiler2'}.get(vm, vm)
854 project_config = variant + '_' + build 856 project_config = variant + '_' + build