diff options
-rw-r--r-- | assetstudio.jar | bin | 0 -> 643465 bytes | |||
-rw-r--r-- | common.jar | bin | 0 -> 54416 bytes | |||
-rw-r--r-- | ddmlib.jar (renamed from ddmlib/ddmlib.jar) | bin | 240955 -> 240955 bytes | |||
-rw-r--r-- | dvlib.jar | bin | 0 -> 11083 bytes | |||
-rwxr-xr-x | etc/jobb (renamed from jobb/etc/jobb) | 0 | ||||
-rwxr-xr-x | etc/jobb.bat (renamed from jobb/etc/jobb.bat) | 0 | ||||
-rwxr-xr-x | etc/lint | 72 | ||||
-rwxr-xr-x | etc/lint.bat | 58 | ||||
-rw-r--r-- | jobb.jar (renamed from jobb/jobb.jar) | bin | 36279 -> 36279 bytes | |||
-rw-r--r-- | layoutlib_api.jar | bin | 0 -> 64586 bytes | |||
-rw-r--r-- | lint.jar | bin | 0 -> 61654 bytes | |||
-rw-r--r-- | lint_api.jar | bin | 0 -> 135459 bytes | |||
-rw-r--r-- | lint_checks.jar | bin | 0 -> 417729 bytes | |||
-rw-r--r-- | manifmerger.jar | bin | 0 -> 33393 bytes | |||
-rwxr-xr-x | repository/sdk-addon-1.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-addon-1.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-addon-2.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-addon-2.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-addon-3.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-addon-3.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-addon-4.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-addon-4.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-addon-5.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-addon-5.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-addons-list-1.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-addons-list-1.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-addons-list-2.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-addons-list-2.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-repository-1.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-repository-1.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-repository-2.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-repository-2.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-repository-3.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-repository-3.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-repository-4.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-repository-4.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-repository-5.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-repository-5.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-repository-6.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-repository-6.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-repository-7.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-repository-7.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-stats-1.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-stats-1.xsd) | 0 | ||||
-rwxr-xr-x | repository/sdk-sys-img-1.xsd (renamed from sdklib/repository/com/android/sdklib/repository/sdk-sys-img-1.xsd) | 0 | ||||
-rw-r--r-- | sdk_common.jar | bin | 0 -> 146388 bytes | |||
-rw-r--r-- | sdklib.jar (renamed from sdklib/sdklib.jar) | bin | 546579 -> 546579 bytes | |||
-rwxr-xr-x | sdklib/post_update.sh | 7 | ||||
-rw-r--r-- | sdkuilib.jar (renamed from sdkuilib/sdkuilib.jar) | bin | 509523 -> 509523 bytes | |||
-rw-r--r-- | swtmenubar.jar (renamed from swtmenubar/swtmenubar.jar) | bin | 18348 -> 18348 bytes | |||
-rwxr-xr-x | update_jars.sh | 71 |
36 files changed, 169 insertions, 39 deletions
diff --git a/assetstudio.jar b/assetstudio.jar Binary files differnew file mode 100644 index 0000000..3da01a0 --- /dev/null +++ b/assetstudio.jar diff --git a/common.jar b/common.jar Binary files differnew file mode 100644 index 0000000..6a438a7 --- /dev/null +++ b/common.jar diff --git a/ddmlib/ddmlib.jar b/ddmlib.jar Binary files differindex 65a524d..65a524d 100644 --- a/ddmlib/ddmlib.jar +++ b/ddmlib.jar diff --git a/dvlib.jar b/dvlib.jar Binary files differnew file mode 100644 index 0000000..fb30fb4 --- /dev/null +++ b/dvlib.jar diff --git a/jobb/etc/jobb.bat b/etc/jobb.bat index a5043c1..a5043c1 100755 --- a/jobb/etc/jobb.bat +++ b/etc/jobb.bat diff --git a/etc/lint b/etc/lint new file mode 100755 index 0000000..6a75288 --- /dev/null +++ b/etc/lint @@ -0,0 +1,72 @@ +#!/bin/bash +# Copyright 2011, The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Set up prog to be the path of this script, including following symlinks, +# and set up progdir to be the fully-qualified pathname of its directory. +prog="$0" +while [ -h "${prog}" ]; do + newProg=`/bin/ls -ld "${prog}"` + newProg=`expr "${newProg}" : ".* -> \(.*\)$"` + if expr "x${newProg}" : 'x/' >/dev/null; then + prog="${newProg}" + else + progdir=`dirname "${prog}"` + prog="${progdir}/${newProg}" + fi +done +oldwd=`pwd` +progdir=`dirname "${prog}"` +cd "${progdir}" +progdir=`pwd` +prog="${progdir}"/`basename "${prog}"` +cd "${oldwd}" + +jarfile=lint.jar +frameworkdir="$progdir" +libdir="$progdir" +if [ ! -r "$frameworkdir/$jarfile" ] +then + frameworkdir=`dirname "$progdir"`/tools/lib + libdir=`dirname "$progdir"`/tools/lib +fi +if [ ! -r "$frameworkdir/$jarfile" ] +then + frameworkdir=`dirname "$progdir"`/framework + libdir=`dirname "$progdir"`/lib +fi +if [ ! -r "$frameworkdir/$jarfile" ] +then + echo `basename "$prog"`": can't find $jarfile" + exit 1 +fi + +# Check args. +if [ debug = "$1" ]; then + # add this in for debugging + java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y + shift 1 +else + java_debug= +fi + +javaCmd="java" + +jarpath="$frameworkdir/$jarfile" + +exec "$javaCmd" \ + -Xmx512m $os_opts $java_debug \ + -Dcom.android.tools.lint.bindir="$progdir" \ + -classpath "$jarpath" \ + com.android.tools.lint.Main "$@" diff --git a/etc/lint.bat b/etc/lint.bat new file mode 100755 index 0000000..08ae1c3 --- /dev/null +++ b/etc/lint.bat @@ -0,0 +1,58 @@ +@echo off +rem Copyright (C) 2011 The Android Open Source Project +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +rem don't modify the caller's environment +setlocal + +rem Set up prog to be the path of this script, including following symlinks, +rem and set up progdir to be the fully-qualified pathname of its directory. +set prog=%~f0 + +rem Grab current directory before we change it +set work_dir="%cd%" + +rem Change current directory and drive to where the script is, to avoid +rem issues with directories containing whitespaces. +cd /d %~dp0 + +rem Get the CWD as a full path with short names only (without spaces) +for %%i in ("%cd%") do set prog_dir=%%~fsi + +rem Check we have a valid Java.exe in the path. +set java_exe= +call lib\find_java.bat +if not defined java_exe goto :EOF + +set jarfile=lint.jar +set frameworkdir= + +if exist %frameworkdir%%jarfile% goto JarFileOk + set frameworkdir=lib\ + +if exist %frameworkdir%%jarfile% goto JarFileOk + set frameworkdir=..\framework\ + +:JarFileOk + +if debug NEQ "%1" goto NoDebug + set java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y + shift 1 +:NoDebug + +set jarpath=%frameworkdir%%jarfile% +set javaextdirs=%frameworkdir% + +call %java_exe% %java_debug% -Xmx512m -Dcom.android.tools.lint.bindir=%prog_dir% -Dcom.android.tools.lint.workdir=%work_dir% -classpath "%jarpath%" com.android.tools.lint.Main %* + Binary files differdiff --git a/layoutlib_api.jar b/layoutlib_api.jar Binary files differnew file mode 100644 index 0000000..f8c52bf --- /dev/null +++ b/layoutlib_api.jar diff --git a/lint.jar b/lint.jar Binary files differnew file mode 100644 index 0000000..1adbf9b --- /dev/null +++ b/lint.jar diff --git a/lint_api.jar b/lint_api.jar Binary files differnew file mode 100644 index 0000000..6017d41 --- /dev/null +++ b/lint_api.jar diff --git a/lint_checks.jar b/lint_checks.jar Binary files differnew file mode 100644 index 0000000..df4d97b --- /dev/null +++ b/lint_checks.jar diff --git a/manifmerger.jar b/manifmerger.jar Binary files differnew file mode 100644 index 0000000..80e62ed --- /dev/null +++ b/manifmerger.jar diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-addon-1.xsd b/repository/sdk-addon-1.xsd index 1d53313..1d53313 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-addon-1.xsd +++ b/repository/sdk-addon-1.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-addon-2.xsd b/repository/sdk-addon-2.xsd index 27fae8b..27fae8b 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-addon-2.xsd +++ b/repository/sdk-addon-2.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-addon-3.xsd b/repository/sdk-addon-3.xsd index ccd00c2..ccd00c2 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-addon-3.xsd +++ b/repository/sdk-addon-3.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-addon-4.xsd b/repository/sdk-addon-4.xsd index c31efbf..c31efbf 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-addon-4.xsd +++ b/repository/sdk-addon-4.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-addon-5.xsd b/repository/sdk-addon-5.xsd index 546b00d..546b00d 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-addon-5.xsd +++ b/repository/sdk-addon-5.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-addons-list-1.xsd b/repository/sdk-addons-list-1.xsd index 176fb60..176fb60 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-addons-list-1.xsd +++ b/repository/sdk-addons-list-1.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-addons-list-2.xsd b/repository/sdk-addons-list-2.xsd index dde7214..dde7214 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-addons-list-2.xsd +++ b/repository/sdk-addons-list-2.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-repository-1.xsd b/repository/sdk-repository-1.xsd index 38ec309..38ec309 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-repository-1.xsd +++ b/repository/sdk-repository-1.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-repository-2.xsd b/repository/sdk-repository-2.xsd index ecadc3f..ecadc3f 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-repository-2.xsd +++ b/repository/sdk-repository-2.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-repository-3.xsd b/repository/sdk-repository-3.xsd index 75d8541..75d8541 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-repository-3.xsd +++ b/repository/sdk-repository-3.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-repository-4.xsd b/repository/sdk-repository-4.xsd index 9b14772..9b14772 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-repository-4.xsd +++ b/repository/sdk-repository-4.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-repository-5.xsd b/repository/sdk-repository-5.xsd index ae8275f..ae8275f 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-repository-5.xsd +++ b/repository/sdk-repository-5.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-repository-6.xsd b/repository/sdk-repository-6.xsd index bccce69..bccce69 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-repository-6.xsd +++ b/repository/sdk-repository-6.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-repository-7.xsd b/repository/sdk-repository-7.xsd index ea18070..ea18070 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-repository-7.xsd +++ b/repository/sdk-repository-7.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-stats-1.xsd b/repository/sdk-stats-1.xsd index 2944b12..2944b12 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-stats-1.xsd +++ b/repository/sdk-stats-1.xsd diff --git a/sdklib/repository/com/android/sdklib/repository/sdk-sys-img-1.xsd b/repository/sdk-sys-img-1.xsd index a19aa49..a19aa49 100755 --- a/sdklib/repository/com/android/sdklib/repository/sdk-sys-img-1.xsd +++ b/repository/sdk-sys-img-1.xsd diff --git a/sdk_common.jar b/sdk_common.jar Binary files differnew file mode 100644 index 0000000..b54a96d --- /dev/null +++ b/sdk_common.jar diff --git a/sdklib/sdklib.jar b/sdklib.jar Binary files differindex e748191..e748191 100644 --- a/sdklib/sdklib.jar +++ b/sdklib.jar diff --git a/sdklib/post_update.sh b/sdklib/post_update.sh deleted file mode 100755 index 5839967..0000000 --- a/sdklib/post_update.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Script that is run after this jar is updated. -# It is run from this directory. -set -e -mkdir -p repository -cd repository -unzip ../sdklib.jar `unzip -l ../sdklib.jar | sed -n '/xsd$/s/.* \(.*\)$/\1/p'` diff --git a/sdkuilib/sdkuilib.jar b/sdkuilib.jar Binary files differindex 49b6deb..49b6deb 100644 --- a/sdkuilib/sdkuilib.jar +++ b/sdkuilib.jar diff --git a/swtmenubar/swtmenubar.jar b/swtmenubar.jar Binary files differindex bedfab7..bedfab7 100644 --- a/swtmenubar/swtmenubar.jar +++ b/swtmenubar.jar diff --git a/update_jars.sh b/update_jars.sh index c9d1dde..b162308 100755 --- a/update_jars.sh +++ b/update_jars.sh @@ -7,8 +7,8 @@ FILTER="" # name of a specific jar to update (default: update them all) while [[ -n "$1" ]]; do if [[ "$1" == "-f" ]]; then DRY="" - elif [[ -z "$FILTER" ]]; then - FILTER="$1" + elif [[ $1 =~ ^[a-z]+ ]]; then + FILTER="$FILTER $1 " else echo "Unknown argument: $1" echo "Usage: $0 [project_to_update] [-f]" @@ -21,12 +21,21 @@ done # Define projects to build and files to copy. function list_projects() { - add_project sdklib @./post_update.sh - add_project sdkuilib in:tools/swt - add_project swtmenubar in:tools/swt + add_project assetstudio + add_project common add_project ddmlib + add_project dvlib + add_project jobb etc/jobb etc/jobb.bat + add_project layoutlib_api + add_project lint_api + add_project lint "cli/etc/lint|etc/lint" "cli/etc/lint.bat|etc/lint.bat" + add_project lint_checks add_project manifmerger - add_project jobb etc/jobb etc/jobb.bat + #add_project rule_api -- TODO do this one next + add_project sdk_common + add_project sdklib + add_project sdkuilib in:tools/swt + add_project swtmenubar in:tools/swt } # ---- @@ -60,10 +69,10 @@ function add_project() { # $1=project name # $2=optional in:tools/swt repo (default: tools/base) # $2...=optional files to copy (relative to project dir) - local proj=$1 + local proj=$1 src dst f shift - if [[ -n "$FILTER" && "$proj" != "$FILTER" ]]; then + if [[ -n "$FILTER" && "${FILTER/ $proj /}" == "$FILTER" ]]; then echo "## Skipping project $proj" return fi @@ -74,52 +83,48 @@ function add_project() { shift fi - echo "## Getting gradle properties for project tools/$repo/$proj" + echo "## Updating project tools/$repo/$proj" # Request to build the jar for that project - append_map BUILD_LIST $repo ":$proj:jar" - - # Copy the resulting JAR - local dst=$proj/$proj.jar - local src=`(cd ../../tools/$repo ; ./gradlew :$proj:properties | \ - awk 'BEGIN { B=""; N=""; V="" } \ - /^archivesBaseName:/ { N=$2 } \ - /^buildDir:/ { B=$2 } \ - /^version:/ { V=$2 } \ - END { print B "/libs/" N "-" V ".jar" }'i )` - append_map COPY_LIST $repo "$src|$dst" + append_map BUILD_LIST $repo ":$proj:prebuiltJar" # Copy all the optional files while [[ -n "$1" ]]; do - append_map COPY_LIST $repo "$proj/$1" + f=$1 + src="${f%%|*}" # strip part after | if any + dst="${f##*|}" # strip part before | if any + if [[ ${src:0:1} != "/" ]]; then src=$proj/$src; fi + append_map COPY_LIST $repo "$src|$dst" shift done return 0 } function build() { - local repo=$1 echo - local buildlist=`get_map BUILD_LIST $repo` + local repo=$1 + local buildlist=$(get_map BUILD_LIST $repo) + + # To build tools/swt, we'll need to first locally publish some + # libs from tools/base. + if [[ "$repo" == "base" && -n $(get_map BUILD_LIST swt) ]]; then + echo "## PublishLocal in tools/base (needed for tools/swt)" + buildlist="$buildlist publishLocal" + fi + if [[ -z "$buildlist" ]]; then echo "## WARNING: nothing to build in tools/$repo." return 1 else - # To build tools/swt, we'll need to first locally publish some - # libs from tools/base. - if [[ "$repo" == "swt" ]]; then - echo "## PublishLocal in tools/base (needed for tools/swt)" - ( cd ../../tools/base ; ./gradlew publishLocal ) - fi echo "## Building tools/$repo: $buildlist" - ( cd ../../tools/$repo ; ./gradlew $buildlist ) + ( D="$PWD" ; cd ../../tools/$repo ; $DRY ./gradlew -PprebuiltPath="$D" $buildlist ) return 0 fi } function copy_files() { - local repo=$1 + local repo=$1 src dst dstdir echo - local copylist=`get_map COPY_LIST $repo` + local copylist=$(get_map COPY_LIST $repo) if [[ -z "$copylist" ]]; then echo "## WARNING: nothing to copy in tools/$repo." else @@ -128,6 +133,8 @@ function copy_files() { src="${f%%|*}" # strip part after | if any dst="${f##*|}" # strip part before | if any if [[ ${src:0:1} != "/" ]]; then src=../../tools/$repo/$src; fi + dstdir=$(dirname $dst) + if [[ ! -d $dstdir ]]; then $DRY mkdir -p $dstdir; fi $DRY cp -v $src $dst else # syntax is proj/@script_name |