diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml index 58fcf1d40b9..35f9dd43923 100644 --- a/releng/org.eclipse.rse.build/customTargets.xml +++ b/releng/org.eclipse.rse.build/customTargets.xml @@ -43,10 +43,6 @@ - - - - @@ -109,12 +105,6 @@ - - - - - - diff --git a/releng/org.eclipse.rse.build/maps/discovery.map b/releng/org.eclipse.rse.build/maps/discovery.map deleted file mode 100644 index df6aed8323a..00000000000 --- a/releng/org.eclipse.rse.build/maps/discovery.map +++ /dev/null @@ -1,10 +0,0 @@ -feature@org.eclipse.tm.discovery=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature -plugin@org.eclipse.rse.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery -plugin@org.eclipse.tm.discovery.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv -plugin@org.eclipse.tm.discovery.engine=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine -plugin@org.eclipse.tm.discovery.model=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model -plugin@org.eclipse.tm.discovery.model.edit=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit -plugin@org.eclipse.tm.discovery.protocol.dnssd=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd -plugin@org.eclipse.tm.discovery.transport.udp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp -plugin@org.eclipse.tm.discovery.view=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view -plugin@org.eclipse.tm.discovery.wizard=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard \ No newline at end of file diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh index f81e7df0c6f..0bac50c8df0 100755 --- a/releng/org.eclipse.rse.build/setup.sh +++ b/releng/org.eclipse.rse.build/setup.sh @@ -102,20 +102,6 @@ else DROPUP=../.. fi -# EMF 2.5.0 -EMFBRANCH=2.5.0 -EMFREL=R -EMFDATE=200906151043 -EMFVER=2.5.0 -if [ ! -f ${DROPIN}/eclipse/plugins/org.eclipse.emf.doc_${EMFBRANCH}.v${EMFDATE}.jar ]; then - # Need EMF 2.4 SDK for Service Discovery ISV Docs Backlinks - echo "Getting EMF SDK..." - cd ${DROPIN} - wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/${EMFBRANCH}/${EMFREL}${EMFDATE}/emf-xsd-SDK-${EMFVER}.zip" - unzip -o emf-xsd-SDK-${EMFVER}.zip - rm emf-xsd-SDK-${EMFVER}.zip - cd ${DROPUP} -fi if [ ! -f eclipse/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar ]; then # Eclipse Test Framework echo "Getting Eclipse Test Framework..." diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php index 955a45d740e..c1014a6b622 100755 --- a/releng/org.eclipse.rse.build/template/buildNotes.php +++ b/releng/org.eclipse.rse.build/template/buildNotes.php @@ -27,7 +27,7 @@ Import/Export, Telnet and FTP require Java 1.5, the rest of RSE runs on Java 1.4. Platform Runtime is the minimum requirement for core RSE and Terminal. - Discovery needs EMF. + Local Terminal needs CDT Core.
  • Highlights of Fixes and Features since TM 3.3M3:
      diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php index 70a3d71885d..e22f0a28334 100755 --- a/releng/org.eclipse.rse.build/template/index.php +++ b/releng/org.eclipse.rse.build/template/index.php @@ -148,17 +148,6 @@ Includes Source. -
      - All - TM-discovery-@buildId@.zip -  
      - An API and DNS-SD / Zeroconf based - implementation for remote network service discovery. - Runs stand-alone or integrated with RSE. - Requires EMF 2.2.0 or later. Includes Source.
      - Note: This component is no longer actively developed and may be discontinued. - - Note: As of TM 3.1 (Eclipse Galileo / June 2009), the RSE-remotecdt integration for remote launch and debug through gdbserver has moved into CDT 6.0. diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count index 8351c19397f..b1bd38b62a0 100755 --- a/releng/org.eclipse.rse.build/template/package.count +++ b/releng/org.eclipse.rse.build/template/package.count @@ -1 +1 @@ -14 +13 diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh index d3f41300802..d246e5a0a88 100755 --- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh +++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh @@ -492,7 +492,7 @@ if [ x${DO_STATS} = x1 ]; then # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=310132 # -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \ #CMD="java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \ - # -p2.statsTrackedBundles org.eclipse.rse.sdk,org.eclipse.dstore.core,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples.tutorial,org.eclipse.rse.tests,org.eclipse.tm.rapi,org.eclipse.tm.discovery,org.eclipse.tm.terminal,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \ + # -p2.statsTrackedBundles org.eclipse.rse.sdk,org.eclipse.dstore.core,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples.tutorial,org.eclipse.rse.tests,org.eclipse.tm.rapi,org.eclipse.tm.terminal,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \ CMD="java -jar ${tgtlauncher} \ -application org.sonatype.tycho.p2.updatesite.UpdateSitePublisherWithJRE \ -source ${SITE} \ @@ -500,7 +500,7 @@ if [ x${DO_STATS} = x1 ]; then -artifactRepository file:${SITE} \ -compress \ -p2.statsURI http://download.eclipse.org/stats/dsdp/tm \ - -p2.statsTrackedFeatures org.eclipse.rse.sdk,org.eclipse.rse.dstore,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples,org.eclipse.rse.tests,org.eclipse.rse.wince,org.eclipse.tm.discovery,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \ + -p2.statsTrackedFeatures org.eclipse.rse.sdk,org.eclipse.rse.dstore,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples,org.eclipse.rse.tests,org.eclipse.rse.wince,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \ -p2.statsTrackedBundles org.eclipse.rse.core,org.eclipse.rse.core.source,org.eclipse.tm.terminal \ -p2.statsSuffix _tm330 -vmargs -Xmx256M" diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml index bf426a993d9..874e58ff455 100644 --- a/releng/org.eclipse.rse.updatesite/category.xml +++ b/releng/org.eclipse.rse.updatesite/category.xml @@ -9,9 +9,6 @@ - - - diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml index 93d73b296db..cfc2e732784 100644 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ b/releng/org.eclipse.rse.updatesite/site.xml @@ -730,9 +730,6 @@ - - - diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.xml b/releng/org.eclipse.tm.releng.master-feature/feature.xml index b4b3cb82d43..d5f7307d9a9 100644 --- a/releng/org.eclipse.tm.releng.master-feature/feature.xml +++ b/releng/org.eclipse.tm.releng.master-feature/feature.xml @@ -45,10 +45,6 @@ id="org.eclipse.tm.terminal.local.sdk" version="0.0.0"/> - - diff --git a/releng/org.eclipse.tm.releng/build.properties b/releng/org.eclipse.tm.releng/build.properties index 33971924156..b1d38e0bf50 100644 --- a/releng/org.eclipse.tm.releng/build.properties +++ b/releng/org.eclipse.tm.releng/build.properties @@ -56,7 +56,6 @@ PACK200_JAVA_HOME=${JAVA_HOME} dependencyURLs=\ http://download.eclipse.org/eclipse/downloads/drops/S-3.7M3-201010281441/eclipse-SDK-3.7M3-linux-gtk-x86_64.tar.gz,\ -http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-runtime-2.5.0.zip,\ http://download.eclipse.org/tools/cdt/builds/7.0.0/I.I201006141710/cdt-master-7.0.0-I201006141710.zip,\ http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip diff --git a/releng/org.eclipse.tm.releng/buildExtra.xml b/releng/org.eclipse.tm.releng/buildExtra.xml index d535cefba23..2b1b65b05f8 100644 --- a/releng/org.eclipse.tm.releng/buildExtra.xml +++ b/releng/org.eclipse.tm.releng/buildExtra.xml @@ -20,12 +20,7 @@ - - - - - + diff --git a/releng/org.eclipse.tm.releng/maps/discovery.map b/releng/org.eclipse.tm.releng/maps/discovery.map deleted file mode 100644 index df6aed8323a..00000000000 --- a/releng/org.eclipse.tm.releng/maps/discovery.map +++ /dev/null @@ -1,10 +0,0 @@ -feature@org.eclipse.tm.discovery=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature -plugin@org.eclipse.rse.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery -plugin@org.eclipse.tm.discovery.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv -plugin@org.eclipse.tm.discovery.engine=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine -plugin@org.eclipse.tm.discovery.model=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model -plugin@org.eclipse.tm.discovery.model.edit=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit -plugin@org.eclipse.tm.discovery.protocol.dnssd=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd -plugin@org.eclipse.tm.discovery.transport.udp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp -plugin@org.eclipse.tm.discovery.view=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view -plugin@org.eclipse.tm.discovery.wizard=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard \ No newline at end of file