You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/06/25 23:46:31 UTC
android commit: removing echoes
Updated Branches:
refs/heads/master 5d211f2fa -> 570fc3cfb
removing echoes
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/570fc3cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/570fc3cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/570fc3cf
Branch: refs/heads/master
Commit: 570fc3cfb209582234fa95ea39b0a8303685075a
Parents: 5d211f2
Author: Anis Kadri <an...@gmail.com>
Authored: Mon Jun 25 14:46:10 2012 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Mon Jun 25 14:46:10 2012 -0700
----------------------------------------------------------------------
bin/create | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/570fc3cf/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index d688549..a4adc90 100755
--- a/bin/create
+++ b/bin/create
@@ -46,7 +46,6 @@ fi
# cleanup after exit and/or on error
function on_exit {
- echo "Cleaning up ..."
# [ -f $BUILD_PATH/framework/libs/commons-codec-1.6.jar ] && rm $BUILD_PATH/framework/libs/commons-codec-1.6.jar
# [ -d $BUILD_PATH/framework/libs ] && rmdir $BUILD_PATH/framework/libs
[ -f $BUILD_PATH/framework/assets/www/cordova-$VERSION.js ] && rm $BUILD_PATH/framework/assets/www/cordova-$VERSION.js
@@ -74,7 +73,6 @@ $ANDROID_BIN update project --target $TARGET --path $BUILD_PATH/framework &> /de
if [ ! -e $BUILD_PATH/framework/libs/commons-codec-1.6.jar ]; then
# Use curl to get the jar (TODO: Support Apache Mirrors)
- echo "Downloading common-codecs-1.6 ..."
curl -OL http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip &> /dev/null
unzip commons-codec-1.6-bin.zip &> /dev/null
mkdir -p $BUILD_PATH/framework/libs
@@ -84,28 +82,22 @@ if [ ! -e $BUILD_PATH/framework/libs/commons-codec-1.6.jar ]; then
fi
# compile cordova.js and cordova.jar
-echo "Building cordova-$VERSION.jar and cordova-$VERSION.js ..."
(cd $BUILD_PATH/framework && ant jar &> /dev/null )
# create new android project
-echo "Creating a new cordova android project ..."
$ANDROID_BIN create project --target $TARGET --path $PROJECT_PATH --package $PACKAGE --activity $ACTIVITY &> /dev/null
# copy project template
-echo "Copying assets and resources ..."
cp -r $BUILD_PATH/bin/templates/project/assets $PROJECT_PATH
cp -r $BUILD_PATH/bin/templates/project/res $PROJECT_PATH
# copy cordova.js, cordova.jar and res/xml
-echo "Setting up config and plugins list ..."
cp -r $BUILD_PATH/framework/res/xml $PROJECT_PATH/res
-echo "Adding cordova-$VERSION.js and cordova-$VERSION.jar ..."
cp $BUILD_PATH/framework/assets/www/cordova-$VERSION.js $PROJECT_PATH/assets/www/cordova-$VERSION.js
cp $BUILD_PATH/framework/cordova-$VERSION.jar $PROJECT_PATH/libs/cordova-$VERSION.jar
# interpolate the activity name and package
-echo "Updating Activity and AndroidManifest ..."
cp $BUILD_PATH/bin/templates/project/Activity.java $ACTIVITY_PATH
sed -i '' -e "s/__ACTIVITY__/${ACTIVITY}/g" $ACTIVITY_PATH
sed -i '' -e "s/__ID__/${PACKAGE}/g" $ACTIVITY_PATH