diff options
author | Tor Norbye <tnorbye@google.com> | 2010-10-25 14:00:04 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2010-10-26 10:17:23 -0700 |
commit | 912d8df0ed1a06c559efeefb1a0958ba989178e3 (patch) | |
tree | d541cf8bfed6d10dc7472375e49565186282ab25 /eclipse/scripts | |
parent | 3a480e2d770105c302b0d14be411dbfde42349a5 (diff) | |
download | sdk-912d8df0ed1a06c559efeefb1a0958ba989178e3.zip sdk-912d8df0ed1a06c559efeefb1a0958ba989178e3.tar.gz sdk-912d8df0ed1a06c559efeefb1a0958ba989178e3.tar.bz2 |
Support 3rd party layout rule loading, and rip out Groovy support
Add support for loading 3rd party .jars providing additional layout
rules. This can be configured by adding a property referencing the
jars to be loaded as part of your build.properties, like this:
default.properties:
...
layoutrules.jars=chart-rules.jar:graph-rules.jar
...
This will create a class loader referencing chart-rules.jar and
graph-rules.jar (as well as the visual editor's plugin class loader as
a fallback), and this class loader is used to load IViewRule
implementations.
In addition, this plugin rips out the various remaining Groovy hooks
and references that were earlier used to load Groovy scripts as layout
rules, and removes groovy from the load path and build symlinking
scripts.
Change-Id: Ia17a60259559ec86270726add258382a879117dc
Diffstat (limited to 'eclipse/scripts')
-rwxr-xr-x | eclipse/scripts/build_server.sh | 4 | ||||
-rwxr-xr-x | eclipse/scripts/create_adt_symlinks.sh | 6 | ||||
-rwxr-xr-x | eclipse/scripts/create_test_symlinks.sh | 6 |
3 files changed, 2 insertions, 14 deletions
diff --git a/eclipse/scripts/build_server.sh b/eclipse/scripts/build_server.sh index aa63b18..12e4472 100755 --- a/eclipse/scripts/build_server.sh +++ b/eclipse/scripts/build_server.sh @@ -61,8 +61,8 @@ function check_params() { function build_libs() { MAKE_OPT="-j8" - echo "*** Building: make $MAKE_OPT dx ping ddms androidprefs groovy-all-1.7.0 layoutlib layoutlib_api layoutlib_utils ninepatch sdklib sdkuilib" - make $MAKE_OPT dx ping ddms androidprefs groovy-all-1.7.0 layoutlib layoutlib_api layoutlib_utils ninepatch sdklib sdkuilib + echo "*** Building: make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api layoutlib_utils ninepatch sdklib sdkuilib" + make $MAKE_OPT dx ping ddms androidprefs layoutlib layoutlib_api layoutlib_utils ninepatch sdklib sdkuilib } function build_plugin { diff --git a/eclipse/scripts/create_adt_symlinks.sh b/eclipse/scripts/create_adt_symlinks.sh index 4fd99fb..fef0761 100755 --- a/eclipse/scripts/create_adt_symlinks.sh +++ b/eclipse/scripts/create_adt_symlinks.sh @@ -31,7 +31,6 @@ if [ "$HOST" == "Linux" ]; then done 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.7.0.jar "$DEST/" elif [ "$HOST" == "Darwin" ]; then for LIB in $LIBS; do @@ -39,7 +38,6 @@ elif [ "$HOST" == "Darwin" ]; then done 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.7.0.jar "$DEST/" elif [ "${HOST:0:6}" == "CYGWIN" ]; then for LIB in $LIBS; do @@ -54,10 +52,6 @@ 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.7.0.jar" ]; then - cp -v "prebuilt/common/groovy/groovy-all-1.7.0.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 9a9849a..dca9bf3 100755 --- a/eclipse/scripts/create_test_symlinks.sh +++ b/eclipse/scripts/create_test_symlinks.sh @@ -49,7 +49,6 @@ if [ "$HOST" == "Linux" ]; then done 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.7.0.jar "$DEST/" elif [ "$HOST" == "Darwin" ]; then for LIB in $LIBS; do @@ -57,7 +56,6 @@ elif [ "$HOST" == "Darwin" ]; then done 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.7.0.jar "$DEST/" elif [ "${HOST:0:6}" == "CYGWIN" ]; then for LIB in $LIBS; do @@ -67,10 +65,6 @@ elif [ "${HOST:0:6}" == "CYGWIN" ]; then cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/" fi - if [ ! -f "$DEST/groovy-all-1.7.0.jar" ]; then - cp -v "prebuilt/common/groovy/groovy-all-1.7.0.jar" "$DEST/" - fi - LIBS="layoutlib.jar" NEED_MAKE="yes" for LIB in $LIBS ; do |