diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties index d38eb48a26a..b25e597e144 100644 --- a/releng/org.eclipse.rse.build/build.properties +++ b/releng/org.eclipse.rse.build/build.properties @@ -22,6 +22,7 @@ mapVersionTag=HEAD #adds checksum suffix to directory names generateFeatureVersionSuffix=true +generateAPIDescription=true ##Packager collPlace=eclipse diff --git a/releng/org.eclipse.rse.build/customAssembly.xml b/releng/org.eclipse.rse.build/customAssembly.xml index 473f4c13dea..e050d6c15bd 100644 --- a/releng/org.eclipse.rse.build/customAssembly.xml +++ b/releng/org.eclipse.rse.build/customAssembly.xml @@ -32,11 +32,6 @@ - @@ -45,6 +40,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,6 +85,16 @@ + + + + + + + + + + diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml index e75c4246406..50ec5b30ba7 100644 --- a/releng/org.eclipse.rse.build/customTargets.xml +++ b/releng/org.eclipse.rse.build/customTargets.xml @@ -47,6 +47,10 @@ + + + + @@ -58,6 +62,7 @@ + @@ -106,6 +111,12 @@ + + + + + + @@ -325,7 +336,6 @@ - @@ -335,7 +345,6 @@ - @@ -534,29 +543,6 @@ in the client. ===================================================================== --> - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh index 41f7923353f..395678e1a43 100755 --- a/releng/org.eclipse.rse.build/setup.sh +++ b/releng/org.eclipse.rse.build/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh #******************************************************************************* -# Copyright (c) 2006, 2009 Wind River Systems, Inc. +# Copyright (c) 2006, 2010 Wind River Systems, Inc. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -48,11 +48,11 @@ esac # prepare the base Eclipse installation in folder "eclipse" ep_rel="S-" -ep_ver=3.6M3 -ep_date="-200910301201" +ep_ver=3.6M5 +ep_date="-201001291300" P2_disabled=false P2_no_dropins=false -if [ ! -f eclipse/plugins/org.eclipse.swt_3.6.0.v3617.jar ]; then +if [ ! -f eclipse/plugins/org.eclipse.swt_3.6.0.v3631.jar ]; then curdir2=`pwd` if [ ! -d eclipse -o -h eclipse ]; then if [ -d eclipse-${ep_ver}-${ep_arch} ]; then @@ -143,11 +143,46 @@ if [ ! -f ${DROPIN}/eclipse/plugins/gnu.io.rxtx_2.1.7.4_v20071016.jar ]; then cd ${DROPUP} fi +# CDT Runtime +#CDTREL=6.0.0 +#CDTVER=200902031437 +#CDTNAME=cdt-master-5.0.0.zip +#CDTLOC=releases/ganymede/dist/${CDTNAME} +CDTREL=7.0.0 +CDTFEAT=7.0.0 +CDTVER=201002190808 +CDTNAME=cdt-master-${CDTREL}-I${CDTVER}.zip +CDTLOC=builds/${CDTREL}/I.I${CDTVER}/${CDTNAME} +if [ ! -f eclipse/plugins/org.eclipse.cdt.core_${CDTFEAT}.${CDTVER}.jar ]; then + echo "Getting CDT Runtime..." + wget "http://download.eclipse.org/tools/cdt/${CDTLOC}" + CDTTMP=`pwd`/tmp.$$ + mkdir ${CDTTMP} + cd ${CDTTMP} + unzip ../${CDTNAME} + cd .. + #java -jar eclipse/startup.jar \ + java -jar eclipse/plugins/org.eclipse.equinox.launcher_1.0.*.jar \ + -application org.eclipse.update.core.standaloneUpdate \ + -command install \ + -from file://${CDTTMP} \ + -featureId org.eclipse.cdt.platform \ + -version ${CDTFEAT}.${CDTVER} + java -jar eclipse/plugins/org.eclipse.equinox.launcher_1.0.*.jar \ + -application org.eclipse.update.core.standaloneUpdate \ + -command install \ + -from file://${CDTTMP} \ + -featureId org.eclipse.cdt \ + -version ${CDTFEAT}.${CDTVER} + rm -rf ${CDTTMP} + rm ${CDTNAME} +fi + # checkout the basebuilder -baseBuilderTag=R36_M2 -if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.5.100.v20090911.jar \ - -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.5.100.v20090911/pdebuild.jar \ - -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.p2.metadata.generator_1.0.200.v20090831.jar ]; then +baseBuilderTag=R36_M4 +if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.5.100.v20091210.jar \ + -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.6.0.v20091204/pdebuild.jar \ + -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.p2.metadata.generator_1.0.200.v20091019.jar ]; then if [ -d org.eclipse.releng.basebuilder ]; then echo "Re-getting basebuilder from CVS..." rm -rf org.eclipse.releng.basebuilder diff --git a/releng/org.eclipse.rse.build/team/preferences.txt b/releng/org.eclipse.rse.build/team/preferences.txt new file mode 100644 index 00000000000..880d318bfac --- /dev/null +++ b/releng/org.eclipse.rse.build/team/preferences.txt @@ -0,0 +1,27 @@ +Linked add-ons: +--------------- +* 3rd Party Software - TM+RSE: + emf, releng.tools, j9.launching, RXTX +* 3rd Party Software - TCF: + Subclipse, CDT +* 3rd Party Software - Wind River: + Coretools, Findbugs, Retriever + + +Preferences: +------------ +* JRE: Add JDK 1.4, 1.5, CDC +* SSH2 Home +* User Dict +* API Tooling Baseline +* CVS Repo +* Text on perspective bars off + + +Working Sets: +------------- +rse-core +rse-other +tm-discovery +tm-releng +tm-terminal diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php index 098988890d2..3f4d1e13d5a 100755 --- a/releng/org.eclipse.rse.build/template/buildNotes.php +++ b/releng/org.eclipse.rse.build/template/buildNotes.php @@ -30,14 +30,16 @@ Discovery needs EMF.
  • Highlights of Bugs fixed since TM 3.1.1:
      +
    • A local terminal connector was added - Thanks to Mirko Raner for this contribution + [196337].
    • A regression in the Terminal widget was fixed, which made initial output after login invisible above the initial viewport [294327].
    • -
  • At least 6 bugs were resolved: Use - - +
  • At least 24 bugs were resolved: Use + + this query to show the list of bugs fixed since TM 3.1.1 diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php index 66eb2f8ada0..a7d5216e1af 100755 --- a/releng/org.eclipse.rse.build/template/index.php +++ b/releng/org.eclipse.rse.build/template/index.php @@ -136,6 +136,13 @@ installation notes), ssh and telnet. Includes Source. + +
    + All + TM-terminal-local-@buildId@.zip + + A local terminal (console) integrated into Eclipse. Requires CDT 7.0.0 M6 or higher. Includes Source. +
    All diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count index 48082f72f08..b1bd38b62a0 100755 --- a/releng/org.eclipse.rse.build/template/package.count +++ b/releng/org.eclipse.rse.build/template/package.count @@ -1 +1 @@ -12 +13