From ee20c8e4c1c3124bc569cea86526795d87616a08 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 26 Nov 2010 14:01:55 +0000
Subject: [PATCH] [releng] Add scp to Legacy Builder

---
 releng/org.eclipse.rse.build/customTargets.xml    | 10 ++++++++++
 releng/org.eclipse.rse.build/maps/scp.map         |  2 ++
 .../org.eclipse.rse.build/template/buildNotes.php | 15 ++++++++++-----
 releng/org.eclipse.rse.build/template/index.php   | 10 ++++++++++
 .../org.eclipse.rse.build/template/package.count  |  2 +-
 releng/org.eclipse.rse.updatesite/category.xml    |  3 +++
 releng/org.eclipse.rse.updatesite/site.xml        |  3 +++
 7 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 releng/org.eclipse.rse.build/maps/scp.map

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 1d9a7b82722..58fcf1d40b9 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -31,6 +31,10 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.wince" />
 		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.scp" />
+		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.examples" />
@@ -93,6 +97,12 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
+	<target name="assemble.org.eclipse.rse.scp">
+		<property name="archiveName" value="RSE-scp-incubation-${buildId}.zip"/>
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+		<antcall target="unpackUpdateJarsForPackaging" />
+	</target>
+
 	<target name="assemble.org.eclipse.rse.tests">
 		<property name="archiveName" value="RSE-tests-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
diff --git a/releng/org.eclipse.rse.build/maps/scp.map b/releng/org.eclipse.rse.build/maps/scp.map
new file mode 100644
index 00000000000..4f5c440da91
--- /dev/null
+++ b/releng/org.eclipse.rse.build/maps/scp.map
@@ -0,0 +1,2 @@
+feature@org.eclipse.rse.scp=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.scp-feature
+plugin@org.eclipse.rse.subsystems.files.scp=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.scp
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index a059b71174d..955a45d740e 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -28,14 +28,19 @@
   RSE runs on Java 1.4.
   Platform Runtime is the minimum requirement for core RSE and Terminal.
   Discovery needs EMF.</li>
-<!--
-<li>Highlights of Fixes and Features since <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.2-201006071030/index.php">TM 3.2</a>:
+
+<li>Highlights of Fixes and Features since <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.3M3-201011090901/index.php">TM 3.3M3</a>:
 <ul>
-  <li>TBD
-      [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=311447">311447</a>].</li>
+  <li>An SCP File Subsystem has been made available, in order to support remote systems
+    that provide SSH access, but not the sftp service (such as Dropbear on embedded
+    targets). The new subsystem is currently available as a separate 
+    download in incubation state, and installable from the 
+    <a href="http://download.eclipse.org/dsdp/tm/updates/3.3milestones/">TM 3.3 Milestone Update Site</a>. 
+    Please use and test the new plugin, and provide feedback on the
+    <a href="https://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">dsdp-tm-dev</a> mailing list
+      [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=213438">213438</a>].</li>
 </ul>
 </li>
--->
 <li>At least 5 bugs were resolved: Use 
   <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?negate0=1;field0-0-0=target_milestone;type0-0-1=regexp;field0-0-1=target_milestone;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;value0-0-2=backport;chfieldto=2010-12-20;chfield=resolution;query_format=advanced;type0-0-3=regexp;field0-0-3=target_milestone;value0-0-3=3\.3%20M[3];chfieldfrom=2010-11-01;field0-0-2=short_desc;value0-0-1=3\.2\.[12];type0-0-0=regexp;value0-0-0=[23]\.[01]\..*;component=Core;component=RSE;component=Terminal;product=Target%20Management;type0-0-2=substring"> -->
   <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=Core;component=RSE;component=Terminal;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;target_milestone=3.3%20M4;product=Target%20Management">
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
index 572d5f308ac..70a3d71885d 100755
--- a/releng/org.eclipse.rse.build/template/index.php
+++ b/releng/org.eclipse.rse.build/template/index.php
@@ -197,6 +197,16 @@
         <td>
 			A local terminal (console) integrated into Eclipse. Works on Linux, Solaris and Mac OS X, but currently <i>not on Windows</i>. Requires CDT 7.0 (Eclipse Helios / June 2010) or higher. Includes Source.
         </td>
+    </tr>
+	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
+        <td>All <img src="egg.gif" width=20 height=20></td>
+        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-scp-incubation-@buildId@.zip">RSE-scp-incubation-@buildId@.zip</a></td>
+        <td><small>&nbsp;</small><br/>
+			A File Subsystem for SSH connections that do not provide the Sftp service,
+			such as embedded targets running Dropbear. Allows choosing between scp or sftp
+			connection when using the "SSH Only" System Type.
+			Includes Source.
+        </td>
     </tr>
 	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
         <td>All <img src="egg.gif" width=20 height=20></td>
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
index b1bd38b62a0..8351c19397f 100755
--- a/releng/org.eclipse.rse.build/template/package.count
+++ b/releng/org.eclipse.rse.build/template/package.count
@@ -1 +1 @@
-13
+14
diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
index 90c1d898f84..bf426a993d9 100644
--- a/releng/org.eclipse.rse.updatesite/category.xml
+++ b/releng/org.eclipse.rse.updatesite/category.xml
@@ -12,6 +12,9 @@
    <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
       <category name="TM and RSE Optional Add-Ons"/>
    </feature>
+   <feature url="features/org.eclipse.rse.scp_0.1.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.1.0.qualifier">
+      <category name="TM and RSE Optional Add-Ons"/>
+   </feature>
    <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier">
       <category name="TM and RSE Optional Add-Ons"/>
    </feature>
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 1d5fed732c1..93d73b296db 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -724,6 +724,9 @@
    <feature url="features/org.eclipse.rse.useractions_1.1.200.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.200.qualifier">
       <category name="TM and RSE Uncategorized 3.3"/>
    </feature>
+   <feature url="features/org.eclipse.rse.scp_0.1.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.1.0.qualifier">
+      <category name="TM and RSE Uncategorized 3.3"/>
+   </feature>
    <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier" os="win32" arch="x86">
       <category name="TM and RSE Uncategorized 3.3"/>
    </feature>