Mercurial > hg > truffle
changeset 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 | 12cae938aade |
| children | 6dc4f0be9a70 |
| files | hotspot/.cproject hotspot/.settings/org.eclipse.cdt.core.prefs mx/mx_graal.py |
| diffstat | 3 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/.cproject Wed Nov 19 09:53:16 2014 +0100 +++ b/hotspot/.cproject Wed Nov 19 13:10:24 2014 +0100 @@ -18,7 +18,7 @@ <folderInfo id="cdt.managedbuild.toolchain.gnu.solaris.base.945602881.305678577" name="/" resourcePath=""> <toolChain id="cdt.managedbuild.toolchain.gnu.base.1866612258" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base"> <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.2075405295" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/> - <builder arguments="${workspace_loc:/hotspot}/../mxtool/mx build" autoBuildTarget="ide-build-target" buildPath="${workspace_loc:/hotspot}/.." cleanBuildTarget="clean" command="bash" enableAutoBuild="true" enableCleanBuild="false" enabledIncrementalBuild="false" id="cdt.managedbuild.target.gnu.builder.base.81453037" incrementalBuildTarget="jvmg1" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"> + <builder arguments="${workspace_loc:/hotspot}/../mxtool/mx build --no-java" autoBuildTarget="" buildPath="${workspace_loc:/hotspot}/.." cleanBuildTarget="clean" command="bash" enableAutoBuild="true" enableCleanBuild="false" enabledIncrementalBuild="false" id="cdt.managedbuild.target.gnu.builder.base.81453037" incrementalBuildTarget="jvmg1" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"> <outputEntries> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/> </outputEntries>
--- a/hotspot/.settings/org.eclipse.cdt.core.prefs Wed Nov 19 09:53:16 2014 +0100 +++ b/hotspot/.settings/org.eclipse.cdt.core.prefs Wed Nov 19 13:10:24 2014 +0100 @@ -1,5 +1,9 @@ -#Tue Feb 28 11:31:25 CET 2012 eclipse.preferences.version=1 +environment/project/cdt.managedbuild.toolchain.gnu.solaris.base.945602881/BUILDING_FROM_IDE/delimiter=\: +environment/project/cdt.managedbuild.toolchain.gnu.solaris.base.945602881/BUILDING_FROM_IDE/operation=append +environment/project/cdt.managedbuild.toolchain.gnu.solaris.base.945602881/BUILDING_FROM_IDE/value=true +environment/project/cdt.managedbuild.toolchain.gnu.solaris.base.945602881/append=true +environment/project/cdt.managedbuild.toolchain.gnu.solaris.base.945602881/appendContributed=true org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.cdt.core.formatter.alignment_for_assignment=16 org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80
--- a/mx/mx_graal.py Wed Nov 19 09:53:16 2014 +0100 +++ b/mx/mx_graal.py Wed Nov 19 13:10:24 2014 +0100 @@ -779,6 +779,15 @@ builds = [_vmbuild] + if os.environ.get('BUILDING_FROM_IDE', None) == 'true': + build = os.environ.get('IDE_BUILD_TARGET', None) + if build is None or len(build) == 0: + return + if build not in _vmbuildChoices: + mx.abort('VM build "' + build + '" specified by IDE_BUILD_TARGET environment variable is unknown (must be one of ' + + str(_vmbuildChoices) + ')') + builds = [build] + if vm is None: vm = _get_vm() @@ -798,11 +807,6 @@ isWindows = platform.system() == 'Windows' or "CYGWIN" in platform.system() for build in builds: - if build == 'ide-build-target': - build = os.environ.get('IDE_BUILD_TARGET', None) - if build is None or len(build) == 0: - continue - installJars = vm != 'original' and (isWindows or not opts2.java) jdk = _jdk(build, create=True, installJars=installJars)