From 767fa927f29170b5864ea4448b6c062ee83093f0 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 14 Dec 2006 20:05:23 +0000
Subject: [PATCH] Add Terminal to Build
---
releng/org.eclipse.rse.build/bin/doit_ibuild.sh | 3 ++-
releng/org.eclipse.rse.build/bin/doit_nightly.sh | 3 ++-
releng/org.eclipse.rse.build/bin/doit_sbuild.sh | 3 ++-
.../build.properties | 8 ++++----
.../feature.xml | 16 ++++------------
5 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/releng/org.eclipse.rse.build/bin/doit_ibuild.sh b/releng/org.eclipse.rse.build/bin/doit_ibuild.sh
index 1551725ff0a..6ad5d2e28a0 100755
--- a/releng/org.eclipse.rse.build/bin/doit_ibuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_ibuild.sh
@@ -18,7 +18,8 @@ umask 22
#Use Java5 on build.eclipse.org
#export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
-export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
+#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
+export PATH=${HOME}/ws/IBMJava2-ppc-142/bin:$PATH
curdir=`pwd`
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
index d3c5ae7fcc2..085d809c4b0 100755
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
@@ -17,7 +17,8 @@ umask 22
#Use Java5 on build.eclipse.org
#export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
-export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
+#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
+export PATH=${HOME}/ws/IBMJava2-ppc-142/bin:$PATH
curdir=`pwd`
diff --git a/releng/org.eclipse.rse.build/bin/doit_sbuild.sh b/releng/org.eclipse.rse.build/bin/doit_sbuild.sh
index 798d416bf9b..0ad3d4dbe8b 100755
--- a/releng/org.eclipse.rse.build/bin/doit_sbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_sbuild.sh
@@ -18,7 +18,8 @@ umask 22
#Use Java5 on build.eclipse.org
#export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
-export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
+#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH
+export PATH=${HOME}/ws/IBMJava2-ppc-142/bin:$PATH
curdir=`pwd`
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/build.properties b/terminal/org.eclipse.tm.terminal.sdk-feature/build.properties
index b6e2256d5ec..5b6373ca4d6 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/build.properties
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/build.properties
@@ -12,7 +12,7 @@ bin.includes = feature.xml,\
epl-v10.html,\
feature.properties,\
license.html
-generate.plugin@org.eclipse.tm.terminal.source=org.eclipse.tm.terminal
-generate.plugin@org.eclipse.tm.terminal.serial.source=org.eclipse.tm.terminal.serial
-generate.plugin@org.eclipse.tm.terminal.ssh.source=org.eclipse.tm.terminal.ssh
-generate.plugin@org.eclipse.tm.terminal.view.source=org.eclipse.tm.terminal.view
+generate.feature@org.eclipse.tm.terminal.source=org.eclipse.tm.terminal
+generate.feature@org.eclipse.tm.terminal.serial.source=org.eclipse.tm.terminal.serial
+generate.feature@org.eclipse.tm.terminal.ssh.source=org.eclipse.tm.terminal.ssh
+generate.feature@org.eclipse.tm.terminal.view.source=org.eclipse.tm.terminal.view
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
index 758d778a214..b6f15161a31 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -44,28 +44,20 @@
name="%featureNameView"
optional="true"/>
-
-
-
-