diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh index 5221a4e7894..59a51925f13 100755 --- a/releng/org.eclipse.rse.build/setup.sh +++ b/releng/org.eclipse.rse.build/setup.sh @@ -41,32 +41,32 @@ case ${uname_s}${uname_m} in esac # prepare the base Eclipse installation in folder "eclipse" -if [ ! -f eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070514.jar ]; then +if [ ! -f eclipse/plugins/org.eclipse.equinox.registry_3.3.0.v20070522.jar ]; then curdir2=`pwd` if [ ! -d eclipse -o -h eclipse ]; then - if [ -d eclipse-3.3RC1-${ep_arch} ]; then - rm -rf eclipse-3.3RC1-${ep_arch} + if [ -d eclipse-3.3RC2-${ep_arch} ]; then + rm -rf eclipse-3.3RC2-${ep_arch} fi - mkdir eclipse-3.3RC1-${ep_arch} - cd eclipse-3.3RC1-${ep_arch} + mkdir eclipse-3.3RC2-${ep_arch} + cd eclipse-3.3RC2-${ep_arch} else rm -rf eclipse fi - ## Eclipse Platform 3.3RC1 - #wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705171700/eclipse-platform-3.3RC1-${ep_arch}.tar.gz" - #tar xfvz eclipse-platform-3.3M7-${ep_arch}.tar.gz - #rm eclipse-platform-3.3M7-${ep_arch}.tar.gz + ## Eclipse Platform 3.3RC2 + #wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC2-200705251350/eclipse-platform-3.3RC2-${ep_arch}.tar.gz" + #tar xfvz eclipse-platform-3.3RC2-${ep_arch}.tar.gz + #rm eclipse-platform-3.3RC2-${ep_arch}.tar.gz # Eclipse SDK 3.3: Need the SDK because EMF needs JDT (somehow) echo "Getting Eclipse SDK..." - wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC1-200705171700/eclipse-SDK-3.3RC1-${ep_arch}.tar.gz" - tar xfvz eclipse-SDK-3.3RC1-${ep_arch}.tar.gz - rm eclipse-SDK-3.3RC1-${ep_arch}.tar.gz + wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC2-200705251350/eclipse-SDK-3.3RC2-${ep_arch}.tar.gz" + tar xfvz eclipse-SDK-3.3RC2-${ep_arch}.tar.gz + rm eclipse-SDK-3.3RC2-${ep_arch}.tar.gz cd "${curdir2}" if [ ! -d eclipse -o -h eclipse ]; then if [ -e eclipse ]; then rm eclipse fi - ln -s eclipse-3.3RC1-${ep_arch}/eclipse eclipse + ln -s eclipse-3.3RC2-${ep_arch}/eclipse eclipse fi fi if [ ! -f eclipse/startup.jar ]; then @@ -84,29 +84,30 @@ if [ ! -f eclipse/startup.jar ]; then fi cd ${curdir2} fi -if [ ! -f eclipse/plugins/org.eclipse.cdt.core_4.0.0.200705111955.jar ]; then +if [ ! -f eclipse/plugins/org.eclipse.cdt.core_4.0.0.200705251830.jar ]; then # CDT 4.0.0 Runtime echo "Getting CDT Runtime..." - wget "http://download.eclipse.org/tools/cdt/releases/europa/dist/4.0.0M7/cdt-4.0.0-M7-${cdt_arch}.tar.gz" - tar xfvz cdt-4.0.0-M7-${cdt_arch}.tar.gz - rm cdt-4.0.0-M7-${cdt_arch}.tar.gz + wget "http://download.eclipse.org/tools/cdt/releases/europa/dist/4.0.0RC2/cdt-4.0.0-RC2-${cdt_arch}.tar.gz" + tar xfvz cdt-4.0.0-RC2-${cdt_arch}.tar.gz + rm cdt-4.0.0-RC2-${cdt_arch}.tar.gz fi -if [ ! -f eclipse/plugins/org.eclipse.emf_2.3.0.v200705110650.jar ]; then +if [ ! -f eclipse/plugins/org.eclipse.emf_2.3.0.v200705230200.jar ]; then # EMF 2.3.0 Runtime echo "Getting EMF Runtime..." - wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/S200705110650/emf-sdo-runtime-2.3.0M7.zip" - unzip -o emf-sdo-runtime-2.3.0M7.zip - rm emf-sdo-runtime-2.3.0M7.zip + wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/S200705230200/emf-sdo-runtime-2.3.0RC1.zip" + unzip -o emf-sdo-runtime-2.3.0RC1.zip + rm emf-sdo-runtime-2.3.0RC1.zip fi -if [ ! -f eclipse/plugins/org.junit_3.8.2.v200701261102/junit.jar ]; then +if [ ! -f eclipse/plugins/org.junit_3.8.2.v200705231735/junit.jar ]; then # Eclipse Test Framework echo "Getting Eclipse Test Framework..." - wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC1-200705171700/eclipse-test-framework-3.3RC1.zip" - unzip -o eclipse-test-framework-3.3RC1.zip - rm eclipse-test-framework-3.3RC1.zip + wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC2-200705251350/eclipse-test-framework-3.3RC2.zip" + unzip -o eclipse-test-framework-3.3RC2.zip + rm eclipse-test-framework-3.3RC2.zip fi # checkout the basebuilder +#baseBuilderTag=RC1_33 baseBuilderTag=M7i_33 if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.3.0.v20070501-0010.jar \ -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/pdebuild.jar ]; then diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php index b4bfcb4a070..4d0d3007abd 100755 --- a/releng/org.eclipse.rse.build/template/buildNotes.php +++ b/releng/org.eclipse.rse.build/template/buildNotes.php @@ -23,7 +23,7 @@
    -
  • TM @buildId@ requires Eclipse 3.3M6 or later. Platform Runtime is the minimum +
  • TM @buildId@ requires Eclipse 3.3RC2 or later. Platform Runtime is the minimum requirement for core RSE and Terminal. Discovery needs EMF, and the Remotecdt integration needs CDT.
  • Added a Telnet Subsystem. It can be activated by selecting the new diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php index a62fad510ca..3bbb432e72d 100755 --- a/releng/org.eclipse.rse.build/template/index.php +++ b/releng/org.eclipse.rse.build/template/index.php @@ -48,21 +48,21 @@
    TM @buildId@ requires - - Eclipse 3.3M6 or later. + + Eclipse 3.3RC2 or later.
    For core RSE and TM-Terminal, the - + Eclipse Platform Runtime Binary is sufficient. Of course you can also use the popular - SDK. + SDK.
    Prerequisites for the remotecdt and discovery add-ons (CDT, EMF) can be retrieved from the Europa Discovery Site.
    - Earlier versions (e.g. Eclipse 3.2.x, Eclipse 3.3M5) will not work! + Earlier versions (e.g. Eclipse 3.2.x, Eclipse 3.3RC1) will not work!
    @@ -234,9 +234,9 @@
The RSE test suite requires the JUnit plug-in, which is included in the - + Eclipse SDK or available as
- + eclipse-test-framework download for users of the Eclipse Platform Runtime Binary.