Merge change 5640 into donut

* changes:
  Bump release version number and speed up make-release.sh script
This commit is contained in:
Android (Google) Code Review
2009-06-30 01:17:20 -07:00

View File

@@ -9,7 +9,7 @@ NDK_ROOT_DIR=`dirname $0`/../..
NDK_ROOT_DIR=`cd $NDK_ROOT_DIR && pwd` NDK_ROOT_DIR=`cd $NDK_ROOT_DIR && pwd`
# the release name # the release name
RELEASE=1.5_r1 RELEASE=1.5_r2
# the package prefix # the package prefix
PREFIX=android-ndk PREFIX=android-ndk
@@ -23,7 +23,6 @@ PREBUILT_PREFIX=android-ndk-prebuilt-20090323
# the list of supported host development systems # the list of supported host development systems
PREBUILT_SYSTEMS="linux-x86 darwin-x86 windows" PREBUILT_SYSTEMS="linux-x86 darwin-x86 windows"
OPTION_HELP=no OPTION_HELP=no
for opt do for opt do
@@ -105,7 +104,7 @@ for SYS in $PREBUILT_SYSTEMS; do
fi fi
done done
# the list of git files to copy into the archives # The list of git files to copy into the archives
GIT_FILES=`cd $NDK_ROOT_DIR && git ls-files` GIT_FILES=`cd $NDK_ROOT_DIR && git ls-files`
# temporary directory used for packaging # temporary directory used for packaging
@@ -119,9 +118,7 @@ rm -rf $TMPDIR && mkdir -p $TMPDIR
echo "Creating reference from git files" echo "Creating reference from git files"
REFERENCE=$TMPDIR/reference && REFERENCE=$TMPDIR/reference &&
mkdir -p $REFERENCE && mkdir -p $REFERENCE &&
(for ff in $GIT_FILES; do (cd $NDK_ROOT_DIR && tar cf - $GIT_FILES) | (cd $REFERENCE && tar xf -) &&
mkdir -p $REFERENCE/`dirname $ff` && cp -pf $NDK_ROOT_DIR/$ff $REFERENCE/$ff;
done) &&
rm -f $REFERENCE/Android.mk rm -f $REFERENCE/Android.mk
if [ $? != 0 ] ; then if [ $? != 0 ] ; then
echo "Could not create git reference. Aborting." echo "Could not create git reference. Aborting."
@@ -165,4 +162,3 @@ rm -rf $TMPDIR/reference
echo "Done, please see packages in $TMPDIR:" echo "Done, please see packages in $TMPDIR:"
ls -l $TMPDIR ls -l $TMPDIR