SDK: Switch to Eclipse 3.6.2 RCP+CDT for build_server

Change-Id: I3fab918d5d9ed96d753410cfe3cf58a06788a058

5 files changed, 25 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index c96c84f..5da08c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ eclipse/final*Versions*.properties
 eclipse/plugins/com.android.ide.eclipse.*/@dot*
 eclipse/plugins/com.android.*/javaCompiler...args
 eclipse/plugins/com.android.ide.eclipse.adt/build.xml
+eclipse/plugins/com.android.ide.eclipse.adt.ndk/build.xml
 eclipse/plugins/com.android.ide.eclipse.adt.overlay/build.xml
 eclipse/plugins/com.android.ide.eclipse.ddms/build.xml
 eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.xml
diff --git a/eclipse/buildConfig/allElements.xml b/eclipse/buildConfig/allElements.xml
index 6bdfa9b..0febb6d 100644
--- a/eclipse/buildConfig/allElements.xml
+++ b/eclipse/buildConfig/allElements.xml
@@ -3,7 +3,7 @@
 <!-- Template obtained from org.eclipse.pde.build/templates/headless-build     -->
 <!-- ========================================================================= -->
 <project name="allElements Delegator">
-    
+
      <!-- ===================================================================== -->
      <!-- Run a given ${target} on all elements being built                     -->
      <!-- Replace element.id with the id of the top level element being built.    -->
@@ -13,7 +13,7 @@
      <!-- Add on <ant> task for each top level element being built.             -->
      <!-- ===================================================================== -->
      <target name="allElementsDelegator">
-         
+
          <ant antfile="${genericTargets}" target="${target}">
              <property name="type" value="feature" />
              <property name="id" value="com.android.ide.eclipse.ddms" />
@@ -23,7 +23,7 @@
              <property name="type" value="feature" />
              <property name="id" value="com.android.ide.eclipse.hierarchyviewer" />
          </ant>
-         
+
          <ant antfile="${genericTargets}" target="${target}">
              <property name="type" value="feature" />
              <property name="id" value="com.android.ide.eclipse.adt" />
@@ -31,13 +31,18 @@
 
          <ant antfile="${genericTargets}" target="${target}">
              <property name="type" value="feature" />
+             <property name="id" value="com.android.ide.eclipse.adt.ndk" />
+         </ant>
+
+         <ant antfile="${genericTargets}" target="${target}">
+             <property name="type" value="feature" />
              <property name="id" value="com.android.ide.eclipse.traceview" />
          </ant>
 
         <antcall target="buildInternalFeatures"/>
-         
+
      </target>
-    
+
      <!-- ===================================================================== -->
      <!-- Conditional target for building the internal features                 -->
      <!-- Builds if property internalSite is set                                -->
@@ -57,8 +62,8 @@
             <property name="type" value="feature" />
             <property name="id" value="com.android.ide.eclipse.gldebugger" />
         </ant>
-     </target>    
-         
+     </target>
+
      <!-- ===================================================================== -->
      <!-- Targets to assemble the built elements for particular configurations  -->
      <!-- These generally call the generated assemble scripts (named in         -->
@@ -74,14 +79,18 @@
          <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
      </target>
 
+     <target name="assemble.com.android.ide.eclipse.adt.ndk">
+         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+     </target>
+
      <target name="assemble.com.android.ide.eclipse.ddms">
          <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
      </target>
-    
+
     <target name="assemble.com.android.ide.eclipse.tests">
         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
     </target>
-    
+
     <target name="assemble.com.android.ide.eclipse.hierarchyviewer">
         <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
     </target>
diff --git a/eclipse/scripts/build_plugins.sh b/eclipse/scripts/build_plugins.sh
index f46eb47..1c1b41c 100755
--- a/eclipse/scripts/build_plugins.sh
+++ b/eclipse/scripts/build_plugins.sh
@@ -92,7 +92,7 @@ if [ -z "$ECLIPSE_HOME" ]; then
   fi
 
   # download the version if not available
-  VERSION="3.5.2"
+  VERSION="3.6.2"
   BASE_DIR="$BASE_DIR/$VERSION"
   scripts/setup_eclipse.sh -p "$BASE_DIR"
 
@@ -193,6 +193,8 @@ echo "  Launcher:     $LAUNCHER"
 echo "  Build File:   $BUILDFILE"
 echo "  Build Config: $BUILDCONFIG"
 echo "  Config Dir:   $CONFIG_DIR"
+echo "  Java:         " $(which java)
+java -version
 
 # clean input directories to make sure there's nothing left from previous run
 
@@ -202,7 +204,7 @@ find . -name "@*" | xargs rm -rfv
 # Now execute the ant runner
 
 set +e  # don't stop on errors anymore, we want to catch them here
-
+set -x
 
 java \
   -jar $LAUNCHER \
@@ -219,6 +221,7 @@ java \
   -Dbasearch=$BASEARCH \
   $SITE_PARAM
 RESULT=$?
+set +x
 
 if [ "0" != "$RESULT" ]; then
     echo "JAVA died with error code $RESULT"
diff --git a/eclipse/scripts/build_server.sh b/eclipse/scripts/build_server.sh
index 275c32c..4c27673 100755
--- a/eclipse/scripts/build_server.sh
+++ b/eclipse/scripts/build_server.sh
@@ -59,16 +59,6 @@ function check_params() {
   [ -d "$DEST_DIR" ] || die "Destination directory $DEST_DIR must exist."
 }
 
-function build_libs() {
-  J="8"
-  [[ $(uname) == "Darwin" ]] && J=$(sysctl hw.ncpu | cut -d : -f 2 | tr -d ' ')
-  [[ $(uname) == "Linux"  ]] && J=$(( $(cat /proc/cpuinfo | grep processor | wc -l) + 2 ))
-  MAKE_OPT="-j$J"
-  LIBS="dx ping ddms androidprefs layoutlib layoutlib_api ide_common ninepatch sdklib sdkuilib traceview assetstudio"
-  echo "*** Building: make $MAKE_OPT $LIBS"
-  make $MAKE_OPT $LIBS
-}
-
 function build_plugin {
   sdk/eclipse/scripts/create_all_symlinks.sh
 
@@ -118,5 +108,4 @@ function build_plugin {
 
 get_params "$@"
 check_params
-build_libs
 build_plugin
diff --git a/eclipse/scripts/setup_eclipse.sh b/eclipse/scripts/setup_eclipse.sh
index 1bca8ac..d3d597f 100755
--- a/eclipse/scripts/setup_eclipse.sh
+++ b/eclipse/scripts/setup_eclipse.sh
@@ -45,7 +45,7 @@ BASE_DIR="$1"
 [[ -n "$1" ]] || die "Usage: $0 <dest-dir>"
 
 # 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"
+DOWNLOAD_URL="http://download.eclipse.org/technology/epp/downloads/release/helios/SR2/eclipse-rcp-helios-SR2-linux-gtk-x86_64.tar.gz"
 
 BIN="$BASE_DIR/eclipse/eclipse"           # path to installed binary
 TARGZ="$BASE_DIR/${DOWNLOAD_URL##*/}"     # base dir + filename of the download URL