diff --git a/Makefile b/Makefile index a40c13121..ebc33e2b5 100644 --- a/Makefile +++ b/Makefile @@ -9,23 +9,39 @@ chrome: grunt prod browser-extensions/chrome/build.sh - cordova-base: grunt dist-mobile -ios: cordova-base - make -C cordova ios - open cordova/project/platforms/ios/Copay - -android: cordova-base - make -C cordova run-android - -release-android: cordova-base - make -C cordova release-android - +# ios: cordova-base +# make -C cordova ios +# open cordova/project/platforms/ios/Copay +# +# android: cordova-base +# make -C cordova run-android +# +# release-android: cordova-base +# make -C cordova release-android +# wp8: cordova/build.sh WP8 cordova/wp/fix-svg.sh echo -e "\a" +ios: + cordova/build.sh IOS --clear + cd cordova/project && cordova build ios + open cordova/project/platforms/ios/Copay.xcodeproj + +ios-debug: + cordova/build.sh IOS --dbgjs + cd cordova/project && cordova build ios + open cordova/project/platforms/ios/Copay.xcodeproj + +android: + cordova/build.sh ANDROID --dbgjs --clear + cd cordova/project && cordova run android + +android-prod: + cordova/build.sh ANDROID --clear + cd cordova/project && cordova build android --release diff --git a/cordova/build.sh b/cordova/build.sh index 8b5202ab2..6d28f60a3 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -21,18 +21,18 @@ CURRENT_OS=$1 if [ -z "CURRENT_OS" ] then - echo "Build.sh WP8|ANDROID|IPHONE" + echo "Build.sh WP8|ANDROID|IOS" fi CLEAR=false DBGJS=false -if [[ $2 = "--clear" || $3 = "--clear" ]] +if [[ $2 == "--clear" || $3 == "--clear" ]] then CLEAR=true fi -if [[ $2 = "--dbgjs" || $3 = "--dbgjs" ]] +if [[ $2 == "--dbgjs" || $3 == "--dbgjs" ]] then DBGJS=true fi @@ -68,7 +68,7 @@ if [ ! -d $PROJECT ]; then checkOK fi - if [ $CURRENT_OS == "IPHONE" ]; then + if [ $CURRENT_OS == "IOS" ]; then echo "${OpenColor}${Green}* Adding IOS platform... ${CloseColor}" cordova platforms add ios checkOK @@ -115,7 +115,7 @@ else checkOK fi -echo "${OpenColor}${Green}* Coping files...${CloseColor}" +echo "${OpenColor}${Green}* Copying files...${CloseColor}" cd $BUILDDIR/.. cp -af dist/web/** $PROJECT/www checkOK @@ -125,15 +125,12 @@ checkOK cd $BUILDDIR +cp config.xml $PROJECT/config.xml +checkOK - - cp config.xml $PROJECT/config.xml - checkOK - - if [ $CURRENT_OS == "ANDROID" ]; then +if [ $CURRENT_OS == "ANDROID" ]; then echo "Android project!!!" - mkdir -p $PROJECT/platforms/android/res/xml/ checkOK @@ -147,9 +144,13 @@ cd $BUILDDIR checkOK fi -if [ $CURRENT_OS == "IPHONE" ]; then +if [ $CURRENT_OS == "IOS" ]; then + + echo "IOS project!!!" + + mkdir -p $PROJECT/platforms/ios + checkOK - echo "Iphone project!!!" cp ios/Copay-Info.plist $PROJECT/platforms/ios/Copay-Info.plist checkOK diff --git a/cordova/config.xml b/cordova/config.xml index 90c983bbb..eeb0c4015 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="0.9.3" + android-versionCode="22" + ios-CFBundleVersion="0.9.3"> Copay A secure bitcoin wallet for friends and companies.