From 7780d0d4d8431bcc2b95129d8ed4e2e05dd30155 Mon Sep 17 00:00:00 2001
From: Ed Merks
Date: Wed, 24 Jan 2018 12:39:59 +0100
Subject: [Releng] Improve EMF.setup and make Build launches more portable

---
 releng/org.eclipse.emf.parent/Build EMF.launch        |  2 +-
 releng/org.eclipse.emf.releng/Build EMF Releng.launch |  2 +-
 releng/org.eclipse.emf.releng/EMF.setup               | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/releng/org.eclipse.emf.parent/Build EMF.launch b/releng/org.eclipse.emf.parent/Build EMF.launch
index 459ea873f..7bcbffe55 100644
--- a/releng/org.eclipse.emf.parent/Build EMF.launch	
+++ b/releng/org.eclipse.emf.parent/Build EMF.launch	
@@ -10,6 +10,6 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <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_TOOL_ARGUMENTS" value="-Dbuild.id=${current_date:yyyyMMddHHmm}&#13;&#10;-Demf.commit.id=fe63d690ef8473ea88c97f5a5dbcde5f6ca9e0ce&#13;&#10;-Dxsd.commit.id=411d33726100f7b27ec81ebaeb0704418753c37a&#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>
diff --git a/releng/org.eclipse.emf.releng/Build EMF Releng.launch b/releng/org.eclipse.emf.releng/Build EMF Releng.launch
index a2f12f514..56a35c33d 100644
--- a/releng/org.eclipse.emf.releng/Build EMF Releng.launch	
+++ b/releng/org.eclipse.emf.releng/Build EMF Releng.launch	
@@ -10,6 +10,6 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <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;-Dpublish.repository=true&#13;&#10;-Dpublish.download.root.folder=&quot;D:/develop/&quot;&#13;&#10;-Dpublish.build.timestamp=${current_date:yyyyMMddHHmm}&#13;&#10;-Dtycho.debug.resolver=false&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dpublish.build.type to one of the following valid choices.&#13;&#10;&#9; &#9;nightly&#13;&#10;&#9;&#9;milestone&#13;&#10;&#9;&#9;release&#13;&#10;&#9;&#13;&#10;&#9;Change -Dpublish.clean=true to -Dpublish.clean=false to retain stale builds.&#13;&#10;&#9;&#9;Older nightly and milestone builds will be retained.&#13;&#10;&#13;&#10;&#9;Change  -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the test.&#13;&#10;&#9;&#9;The 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;:&#13;&#10;-Dpublish.build.type=milestone &#13;&#10;-Dpublish.clean=true &#13;&#10;-DDdebugPort=8000 &#13;&#10;--offline&#13;&#10;}&#13;&#10;-DX&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=${current_date:yyyyMMddHHmm}&#13;&#10;-Demf.commit.id=Unknown&#13;&#10;-Dxsd.commit.id=Unknown&#13;&#10;-Dpublish.repository=true&#13;&#10;-Dpublish.download.root.folder=${maven.build.releng.publish.target}&#13;&#10;-Dpublish.build.timestamp=${current_date:yyyyMMddHHmm}&#13;&#10;-Dtycho.debug.resolver=false&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dpublish.build.type to one of the following valid choices.&#13;&#10;&#9; &#9;nightly&#13;&#10;&#9;&#9;milestone&#13;&#10;&#9;&#9;release&#13;&#10;&#9;&#13;&#10;&#9;Change -Dpublish.clean=true to -Dpublish.clean=false to retain stale builds.&#13;&#10;&#9;&#9;Older nightly and milestone builds will be retained.&#13;&#10;&#13;&#10;&#9;Change  -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the test.&#13;&#10;&#9;&#9;The 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;:&#13;&#10;-Dpublish.build.type=milestone &#13;&#10;-Dpublish.clean=true &#13;&#10;-DDdebugPort=8000 &#13;&#10;--offline&#13;&#10;}&#13;&#10;-DX&#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}/releng/org.eclipse.emf.releng"/>
 </launchConfiguration>
diff --git a/releng/org.eclipse.emf.releng/EMF.setup b/releng/org.eclipse.emf.releng/EMF.setup
index 56487f8e1..0c442e61b 100644
--- a/releng/org.eclipse.emf.releng/EMF.setup
+++ b/releng/org.eclipse.emf.releng/EMF.setup
@@ -147,6 +147,19 @@
       value="${maven.build.command}">
     <description>The location of the mvn command that will execute mvn on your operating system; it is used in the External Tools Configurations for Build EMF and Build EMF Releng.</description>
   </setupTask>
+  <setupTask
+      xsi:type="setup:VariableTask"
+      name="maven.build.releng.publish.target"
+      defaultValue="/tmp/"
+      label="Releng Maven Publish Target">
+    <description>The location of the folder to which the External Tools Configurations for Build EMF Releng will publish p2 update sites. You may leave the default if you don't intend to do Releng Maven builds.</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:StringSubstitutionTask"
+      name="maven.build.releng.publish.target"
+      value="${maven.build.releng.publish.target}">
+    <description>The location of the folder to which the External Tools Configurations for Build EMF Releng will publish p2 update sites.</description>
+  </setupTask>
   <setupTask
       xsi:type="setup:EclipseIniTask"
       option="-Xmx"
-- 
cgit v1.2.3