GLE2: Add groovy.jar to ADT and ADT-tests

Change-Id: I4d0437161b582ae23c23606a8bfa16b04ae508c0

diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index 6ad1fef..f0565a7 100644 (file)
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -16,6 +16,7 @@
 
    <license url="http://www.eclipse.org/org/documents/epl-v10.php">
       Note:  kxml2-2.3.0.jar is under the BSD license rather than the EPL.  You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
+      Note:  groovy-all-1.6.5.jar is under a BSD/Apache license rather than the EPL.  For details, please see http://groovy.codehaus.org/faq.html#licence .
 
       Eclipse Public License - v 1.0
 

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index 5684195..23d84a7 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -13,5 +13,6 @@
        <classpathentry kind="lib" path="sdklib.jar" sourcepath="/SdkLib"/>
        <classpathentry kind="lib" path="sdkuilib.jar" sourcepath="/SdkUiLib"/>
        <classpathentry kind="lib" path="commons-compress-1.0.jar"/>
+       <classpathentry kind="lib" path="groovy-all-1.6.5.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 0354866..31ad501 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Bundle-ClassPath: .,
  layoutlib_utils.jar,
  sdklib.jar,
  sdkuilib.jar,
- commons-compress-1.0.jar
+ commons-compress-1.0.jar,
+ groovy-all-1.6.5.jar
 Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: com.android.ide.eclipse.ddms,

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
index af6383b..01dc8c6 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties
@@ -13,6 +13,7 @@ bin.includes = plugin.xml,\
                ninepatch.jar,\
                sdklib.jar,\
                sdkuilib.jar,\
-               commons-compress-1.0.jar
+               commons-compress-1.0.jar,\
+               groovy-all-1.6.5.jar
 source.. = src/
 output.. = bin/

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index 1209191..73e886d 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -10,5 +10,6 @@
        <classpathentry kind="lib" path="/adt/ninepatch.jar"/>
        <classpathentry kind="lib" path="layoutlib.jar"/>
        <classpathentry kind="lib" path="kxml2-2.3.0.jar"/>
+       <classpathentry kind="lib" path="groovy-all-1.6.5.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
index ecbf115..bba5b10 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
@@ -19,4 +19,5 @@ Bundle-ClassPath: kxml2-2.3.0.jar,
  .,
  layoutlib_api.jar,
  sdklib.jar,
- layoutlib.jar
+ layoutlib.jar,
+ groovy-all-1.6.5.jar

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
index a97e147..0609485 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
@@ -12,5 +12,6 @@ bin.includes = META-INF/,\
                layoutlib.jar,\
                unittests/com/android/sdklib/testdata/,\
                unittests/com/android/layoutlib/testdata/,\
-               unittests/com/android/ide/eclipse/testdata/
+               unittests/com/android/ide/eclipse/testdata/,\
+               groovy-all-1.6.5.jar
 

diff --git a/eclipse/scripts/create_adt_symlinks.sh b/eclipse/scripts/create_adt_symlinks.sh
index 9ea5e27..1afbb47 100755 (executable)
--- a/eclipse/scripts/create_adt_symlinks.sh
+++ b/eclipse/scripts/create_adt_symlinks.sh
@@ -26,15 +26,17 @@ if [ "$HOST" == "Linux" ]; then
     for LIB in $LIBS; do
         ln -svf $BACK/out/host/linux-x86/framework/$LIB.jar "$DEST/"
     done
-    ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/"
+    ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar          "$DEST/"
     ln -svf $BACK/out/host/linux-x86/framework/commons-compress-1.0.jar "$DEST/"
+    ln -svf $BACK/out/host/linux-x86/framework/groovy-all-1.6.5.jar     "$DEST/"
   
 elif [ "$HOST" == "Darwin" ]; then
     for LIB in $LIBS; do
         ln -svf $BACK/out/host/darwin-x86/framework/$LIB.jar "$DEST/"
     done
-    ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/"
+    ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar          "$DEST/"
     ln -svf $BACK/out/host/darwin-x86/framework/commons-compress-1.0.jar "$DEST/"
+    ln -svf $BACK/out/host/darwin-x86/framework/groovy-all-1.6.5.jar     "$DEST/"
 
 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
     for LIB in $LIBS; do
@@ -49,6 +51,10 @@ elif [ "${HOST:0:6}" == "CYGWIN" ]; then
         cp -v "prebuilt/common/commons-compress/commons-compress-1.0.jar" "$DEST/"
     fi
 
+    if [ ! -f "$DEST/groovy-all-1.6.5.jar" ]; then
+        cp -v "prebuilt/common/groovy/groovy-all-1.6.5.jar" "$DEST/"
+    fi
+
     chmod -v a+rx "$DEST"/*.jar
 else
     echo "Unsupported platform ($HOST). Nothing done."

diff --git a/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh
index b5505d0..03b87a6 100755 (executable)
--- a/eclipse/scripts/create_test_symlinks.sh
+++ b/eclipse/scripts/create_test_symlinks.sh
@@ -32,18 +32,24 @@ BACK=`back $DEST`
 
 HOST=`uname`
 if [ "$HOST" == "Linux" ]; then
-    ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/"
-    ln -svf $BACK/out/host/linux-x86/framework/layoutlib.jar   "$DEST/"
+    ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar        "$DEST/"
+    ln -svf $BACK/out/host/linux-x86/framework/layoutlib.jar          "$DEST/"
+    ln -svf $BACK/out/host/linux-x86/framework/groovy-all-1.6.5.jar   "$DEST/"
 
 elif [ "$HOST" == "Darwin" ]; then
-    ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/"
-    ln -svf $BACK/out/host/darwin-x86/framework/layoutlib.jar   "$DEST/"
+    ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar       "$DEST/"
+    ln -svf $BACK/out/host/darwin-x86/framework/layoutlib.jar         "$DEST/"
+    ln -svf $BACK/out/host/darwin-x86/framework/groovy-all-1.6.5.jar  "$DEST/"
 
 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
     if [ ! -f "$DEST/kxml2-2.3.0.jar" ]; then
         cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/"
     fi
 
+    if [ ! -f "$DEST/groovy-all-1.6.5.jar" ]; then
+        cp -v "prebuilt/common/groovy/groovy-all-1.6.5.jar" "$DEST/"
+    fi
+
     LIBS="layoutlib.jar"
     NEED_MAKE="yes"
     for LIB in $LIBS ; do