From 30c67ac9bf6afc7c0d7bf58a0cb7a376132125c4 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Sat, 11 Jul 2020 10:10:59 +0300
Subject: [PATCH] Bug 564369 - CDT : use 4.16 GA version for .setup and .target

Move target platform resolution ahead of clone to simplify testing

Change-Id: Ic6a0b2770762a3bd42633bd7011073731c9d4f4e
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
---
 releng/CDT.setup | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index 66b84e160c0..94d9cce432d 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -153,28 +153,6 @@
         version="0.0.0">
       <description>An API baseline based on the target platform named 'Modular API Baseline Target'</description>
     </setupTask>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.cdt"
-        remoteURI="cdt/org.eclipse.cdt"
-        checkoutBranch="master">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>${scope.project.label} Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>CDT</description>
-    </setupTask>
     <setupTask
         xsi:type="setup.targlets:TargletTask"
         programArguments="-consolelog"
@@ -343,6 +321,28 @@
         </repositoryList>
       </targlet>
     </setupTask>
+    <setupTask
+        xsi:type="git:GitCloneTask"
+        id="git.clone.cdt"
+        remoteURI="cdt/org.eclipse.cdt"
+        checkoutBranch="master">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/InducedChoices">
+        <detail
+            key="inherit">
+          <value>eclipse.git.gerrit.remoteURIs</value>
+        </detail>
+        <detail
+            key="label">
+          <value>${scope.project.label} Git or Gerrit Repository</value>
+        </detail>
+        <detail
+            key="target">
+          <value>remoteURI</value>
+        </detail>
+      </annotation>
+      <description>CDT</description>
+    </setupTask>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator