Merge "Switch Eclipse Plugin build to Eclipse 3.5.2 RCP"

3 files changed, 13 insertions, 10 deletions

diff --git a/eclipse/scripts/build_plugins.sh b/eclipse/scripts/build_plugins.sh
index ab2cbe2..71d5533 100755
--- a/eclipse/scripts/build_plugins.sh
+++ b/eclipse/scripts/build_plugins.sh
@@ -2,14 +2,14 @@
 
 # build script for eclipse adt build on linux platform
 #
-# Usage: sdk/eclipse/scripts/build_plugins <build_version> 
+# Usage: sdk/eclipse/scripts/build_plugins <build_version>
 #
 # It expects environment variable ECLIPSE_HOME to be defined to point to _your_
 # version of Eclipse RCP (must have the WTP & GEF plugins available too.)
 #
 # If ECLIPSE_HOME is not provided, this script will _download_ a reference version
 # of Eclipse RCP and install it in a specific location.
-# 
+#
 # Other properties, ant scripts that drive the build are defined in ./buildConfig
 # Currently, this script will create an update site at ${user.home}/www/no_crawl/android-build
 # or at the directory specified using "-d"
@@ -19,13 +19,15 @@
 #   a clean state.)
 # - Script will fail if current absolute path has spaces in it.
 # - Only linux is supported for now
+# - Do NOT manually invoke this script. Instead use the build_server.sh wrapper
+#   which does some extra preliminary steps (it builds a few libs needed here.)
 
 
 set -e # abort this script early if any command fails
 
 #
 # -- Utility methods --
-# 
+#
 
 function printUsage() {
   echo "Usage: $0 <build_qualifier> [-i] [-d <destination-directory>] [-a <archivePrefix>] "
@@ -79,7 +81,7 @@ if [ -z "$ECLIPSE_HOME" ]; then
   fi
 
   # download the version if not available
-  VERSION="3.4.0"
+  VERSION="3.5.2"
   BASE_DIR="$BASE_DIR/$VERSION"
   scripts/setup_eclipse.sh -p "$BASE_DIR"
 
diff --git a/eclipse/scripts/build_server.sh b/eclipse/scripts/build_server.sh
index 4e88697..3deaca8 100755
--- a/eclipse/scripts/build_server.sh
+++ b/eclipse/scripts/build_server.sh
@@ -76,11 +76,11 @@ function build_plugin {
 
   # Compute the final directory name and remove any leftovers from previous
   # runs if any.
-  BUILD_PREFIX="android-eclipse"  
+  BUILD_PREFIX="android-eclipse"
   if [ "$INTERNAL_BUILD" ]; then
     # append 'eng' signifier to end of archive name to denote internal build
     BUILD_PREFIX="${BUILD_PREFIX}-eng"
-  fi  
+  fi
 
   # exclude date from build-zip name so it can be auto-calculated by continuous
   # test process unless there's no build number, in which case the date is
diff --git a/eclipse/scripts/setup_eclipse.sh b/eclipse/scripts/setup_eclipse.sh
index 8dbf04e..1bca8ac 100755
--- a/eclipse/scripts/setup_eclipse.sh
+++ b/eclipse/scripts/setup_eclipse.sh
@@ -3,7 +3,8 @@
 # Quick script used to setup Eclipse for the ADT plugin build.
 #
 # usage:
-#   setup_eclipse.sh <dest_dir>
+#   setup_eclipse.sh [-p] <dest_dir>
+#   -p: run Eclipse in the background and print its PID in dest_dir/eclipse.pid
 #
 # Workflow:
 # - downloads & unpack Eclipse if necessary
@@ -43,11 +44,11 @@ BASE_DIR="$1"
 
 [[ -n "$1" ]] || die "Usage: $0 <dest-dir>"
 
-# URL for 3.4.0 RCP Linux 32 Bits. Includes GEF, WTP as needed.
-DOWNLOAD_URL="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/ganymede/SR2/eclipse-rcp-ganymede-SR2-linux-gtk.tar.gz"
+# URL for 3.5.2 RCP Linux 32 Bits. Includes GEF, WTP as needed.
+DOWNLOAD_URL="http://download.eclipse.org/technology/epp/downloads/release/galileo/SR2/eclipse-rcp-galileo-SR2-linux-gtk.tar.gz"
 
 BIN="$BASE_DIR/eclipse/eclipse"           # path to installed binary
-TARGZ="$BASE_DIR/eclipse-rcp-ganymede-linux-gtk.tar.gz"
+TARGZ="$BASE_DIR/${DOWNLOAD_URL##*/}"     # base dir + filename of the download URL
 
 if [[ ! -f "$BIN" ]]; then
   echo "Downloading and installing Eclipse in $BASE_DIR."