Mercurial > hg > truffle
changeset 5094:d3f547b08304
added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 16 Mar 2012 20:23:29 +0100 |
| parents | ba5e8ba07b5c |
| children | 57ae0b1cc74a |
| files | hotspot/.cproject hotspot/.project mx/commands.py |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/.cproject Fri Mar 16 20:03:11 2012 +0100 +++ b/hotspot/.cproject Fri Mar 16 20:23:29 2012 +0100 @@ -20,7 +20,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="debug" 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" parallelizationNumber="1" superClass="cdt.managedbuild.target.gnu.builder.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" parallelizationNumber="1" superClass="cdt.managedbuild.target.gnu.builder.base"> <outputEntries> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/> </outputEntries> @@ -80,6 +80,7 @@ <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/> <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/> + <storageModule moduleId="scannerConfiguration"/> </cconfiguration> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
--- a/hotspot/.project Fri Mar 16 20:03:11 2012 +0100 +++ b/hotspot/.project Fri Mar 16 20:23:29 2012 +0100 @@ -23,7 +23,7 @@ </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.autoBuildTarget</key> - <value>debug</value> + <value>ide-build-target</value> </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.buildArguments</key>
--- a/mx/commands.py Fri Mar 16 20:03:11 2012 +0100 +++ b/mx/commands.py Fri Mar 16 20:23:29 2012 +0100 @@ -414,6 +414,12 @@ buildSuffix = 'graal' for build in builds: + if build == 'ide-build-target': + build = os.environ.get('IDE_BUILD_TARGET', 'product') + if len(build) == 0: + mx.log('[skipping build from IDE as IDE_BUILD_TARGET environment variable is ""]') + continue + jdk = _jdk(build, create=True) vmDir = join(_vmLibDirInJdk(jdk), vm)