[Releng] Improve EMF.setup and make Build launches portable

1 files changed, 2 insertions, 2 deletions

diff --git a/releng/org.eclipse.emf.parent/Build EMF.launch b/releng/org.eclipse.emf.parent/Build EMF.launch
index f628be99b..459ea873f 100644
--- a/releng/org.eclipse.emf.parent/Build EMF.launch
+++ b/releng/org.eclipse.emf.parent/Build EMF.launch
@@ -2,14 +2,14 @@
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="JAVA_HOME" value="C:\Program Files\Java\jdk1.8.0_121"/>
+<mapEntry key="JAVA_HOME" value="${maven.build.java.home}"/>
 </mapAttribute>
 <stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/org.eclipse.emf.site}/build.log"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="D:\eclipse\apache-maven-3.3.9\bin\mvn.cmd"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=Local&#13;&#10;-Demf.commit.id=Unknown&#13;&#10;-Dxsd.commit.id=Unknown&#13;&#10;-Dtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dtarget-platform to one of the following valid choices.&#13;&#10;&#9; &#9;helios&#13;&#10;&#9;&#9;indigo&#13;&#10;&#9;&#9;juno&#13;&#10;&#9;&#9;kepler&#13;&#10;&#9;&#9;luna&#13;&#10;&#9;&#9;mars&#13;&#10;&#9;&#9;neon&#13;&#10;&#9;&#9;oxygen&#13;&#10;&#9;&#9;photon&#13;&#10;&#13;&#10;&#9;Change -DskipTests=false to -DskipTests=true to skip the tests.&#13;&#10;&#9;&#9;The tests take long to run!&#13;&#10;&#13;&#10;&#9;Change  -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the tests.&#13;&#10;&#9;&#9;Each test will block waiting for a remote debugger to attach.&#13;&#10;&#13;&#10;&#9;Remove --offline to build online.&#13;&#10;&#9;&#9;Online takes longer but it is needed the first time you build!&#13;&#10;&#13;&#10;:-Dtarget-platform=oxygen -DskipTests=false -DDdebugPort=8000 --offline}&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${emf.git.clone.location}"/>
 </launchConfiguration>