aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/scripts
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2011-11-02 15:49:49 -0700
committerRaphael <raphael@google.com>2011-11-08 14:24:00 -0800
commit9c014a83a44a2a09e138d4fa9d70893fdc8ce400 (patch)
tree16442e6f423acffef1a1302b3c36cfe6a144e8c4 /eclipse/scripts
parent97968c4516fbe48b0c43f463745c2278be5a4e09 (diff)
downloadsdk-9c014a83a44a2a09e138d4fa9d70893fdc8ce400.zip
sdk-9c014a83a44a2a09e138d4fa9d70893fdc8ce400.tar.gz
sdk-9c014a83a44a2a09e138d4fa9d70893fdc8ce400.tar.bz2
SDK: Switch to Eclipse 3.6.2 RCP+CDT for build_server
Change-Id: I3fab918d5d9ed96d753410cfe3cf58a06788a058
Diffstat (limited to 'eclipse/scripts')
-rwxr-xr-xeclipse/scripts/build_plugins.sh7
-rwxr-xr-xeclipse/scripts/build_server.sh11
-rwxr-xr-xeclipse/scripts/setup_eclipse.sh2
3 files changed, 6 insertions, 14 deletions
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