From e8117251ab6f6e2697f441a15616e3adf16e836d Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 2 Jul 2007 13:36:57 +0000 Subject: [PATCH] Build against release versions of all prerequisites --- releng/org.eclipse.rse.build/setup.sh | 69 ++++++++++++++++----------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh index fa0d313a5ac..291c35b6116 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.v20070530.jar ]; then +if [ ! -f eclipse/plugins/org.eclipse.swt_3.3.0.v3346.jar ]; then curdir2=`pwd` if [ ! -d eclipse -o -h eclipse ]; then - if [ -d eclipse-3.3RC3-${ep_arch} ]; then - rm -rf eclipse-3.3RC3-${ep_arch} + if [ -d eclipse-3.3-${ep_arch} ]; then + rm -rf eclipse-3.3-${ep_arch} fi - mkdir eclipse-3.3RC3-${ep_arch} - cd eclipse-3.3RC3-${ep_arch} + mkdir eclipse-3.3-${ep_arch} + cd eclipse-3.3-${ep_arch} else rm -rf eclipse fi - ## Eclipse Platform 3.3RC2 - #wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC3-200706011539/eclipse-platform-3.3RC3-${ep_arch}.tar.gz" - #tar xfvz eclipse-platform-3.3RC3-${ep_arch}.tar.gz - #rm eclipse-platform-3.3RC3-${ep_arch}.tar.gz - # Eclipse SDK 3.3: Need the SDK because EMF needs JDT (somehow) + ## Eclipse Platform 3.3 + #wget "http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-platform-3.3-${ep_arch}.tar.gz" + #tar xfvz eclipse-platform-3.3-${ep_arch}.tar.gz + #rm eclipse-platform-3.3-${ep_arch}.tar.gz + # Eclipse SDK 3.3: Need the SDK so we can link into docs echo "Getting Eclipse SDK..." - wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC3-200706011539/eclipse-SDK-3.3RC3-${ep_arch}.tar.gz" - tar xfvz eclipse-SDK-3.3RC3-${ep_arch}.tar.gz - rm eclipse-SDK-3.3RC3-${ep_arch}.tar.gz + wget "http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-SDK-3.3-${ep_arch}.tar.gz" + tar xfvz eclipse-SDK-3.3-${ep_arch}.tar.gz + rm eclipse-SDK-3.3-${ep_arch}.tar.gz cd "${curdir2}" if [ ! -d eclipse -o -h eclipse ]; then if [ -e eclipse ]; then rm eclipse fi - ln -s eclipse-3.3RC3-${ep_arch}/eclipse eclipse + ln -s eclipse-3.3-${ep_arch}/eclipse eclipse fi fi if [ ! -f eclipse/startup.jar ]; then @@ -84,31 +84,44 @@ if [ ! -f eclipse/startup.jar ]; then fi cd ${curdir2} fi -if [ ! -f eclipse/plugins/org.eclipse.cdt.core_4.0.0.200705251830.jar ]; then +if [ ! -f eclipse/plugins/org.eclipse.cdt.core_4.0.0.200706261300.jar ]; then # CDT 4.0.0 Runtime echo "Getting CDT Runtime..." - 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 + wget "http://download.eclipse.org/tools/cdt/releases/europa/dist/cdt-master-4.0.0.zip" + #java \ + # -classpath eclipse/plugins/org.eclipse.help.base_3.3.0.v20070606.jar \ + CDTTMP=`pwd`/tmp.$$ + mkdir ${CDTTMP} + cd ${CDTTMP} + unzip ../cdt-master-4.0.0.zip + cd .. + java -jar eclipse/plugins/org.eclipse.equinox.launcher_1.0.0.v20070606.jar \ + -application org.eclipse.update.core.standaloneUpdate \ + -command install \ + -from file://${CDTTMP} \ + -featureId org.eclipse.cdt \ + -version 4.0.0.200706261300 + rm -rf ${CDTTMP} + rm cdt-master-4.0.0.zip fi -if [ ! -f eclipse/plugins/org.eclipse.emf.doc_2.3.0.v200705300200/doc.zip ]; then +if [ ! -f eclipse/plugins/org.eclipse.emf.doc_2.3.0.v200706262000/doc.zip ]; then # Need EMF 2.3.0 SDK for Service Discovery ISV Docs Backlinks echo "Getting EMF SDK..." - wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/S200705300200/emf-sdo-xsd-SDK-2.3.0RC2.zip" - unzip -o emf-sdo-xsd-SDK-2.3.0RC2.zip - rm emf-sdo-xsd-SDK-2.3.0RC2.zip + wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/emf-sdo-xsd-SDK-2.3.0.zip" + unzip -o emf-sdo-xsd-SDK-2.3.0.zip + rm emf-sdo-xsd-SDK-2.3.0.zip fi -if [ ! -f eclipse/plugins/org.junit_3.8.2.v200705250844/junit.jar ]; then +if [ ! -f eclipse/plugins/org.junit_3.8.2.v200706111738/junit.jar ]; then # Eclipse Test Framework echo "Getting Eclipse Test Framework..." - wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC3-200706011539/eclipse-test-framework-3.3RC3.zip" - unzip -o eclipse-test-framework-3.3RC3.zip - rm eclipse-test-framework-3.3RC3.zip + wget "http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-test-framework-3.3.zip" + unzip -o eclipse-test-framework-3.3.zip + rm eclipse-test-framework-3.3.zip fi # checkout the basebuilder -baseBuilderTag=RC3_33 -if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.3.0.v20070531-0010.jar \ +baseBuilderTag=RC4_33 +if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.3.0.v20070608-1300.jar \ -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/pdebuild.jar ]; then if [ -d org.eclipse.releng.basebuilder ]; then echo "Re-getting basebuilder from CVS..."