diff --git a/.gitignore b/.gitignore index 3081abfaa..f075c785b 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ shell/scripts/build dist/darwin dist/linux dist/windows +dist/web dist/*.dmg dist/*.tar.gz dist/*.exe diff --git a/Gruntfile.js b/Gruntfile.js index 21b799ac7..16d9661f5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -115,7 +115,6 @@ module.exports = function(grunt) { vendors: { src: [ 'lib/mousetrap/mousetrap.min.js', - 'js/shell.js', // shell must be loaded before moment due to the way moment loads in a commonjs env 'lib/moment/min/moment.min.js', 'lib/qrcode-generator/js/qrcode.js', 'lib/lodash/dist/lodash.js', @@ -201,6 +200,30 @@ module.exports = function(grunt) { } }, }, + copy: { + dist: { + files: [ + { + src: [ + 'index.html', + 'init.js', + 'config.js', + 'css/vendors.min.css', + 'css/copay.min.css', + 'js/copayBundle.js', + 'js/copayMain.js', + 'lib/vendors.js', + 'lib/angularjs-all.js', + 'font/**', + 'img/**', + 'sound/**', + 'views/**' + ], + dest: 'dist/web/' + } + ], + }, + }, jsdoc: { dist: { src: ['js/models/*.js', 'js/plugins/*.js'], @@ -216,6 +239,7 @@ module.exports = function(grunt) { grunt.registerTask('default', ['shell:dev', 'nggettext_compile', 'concat', 'cssmin']); + grunt.registerTask('dist', ['shell:prod', 'nggettext_compile', 'concat', 'cssmin', 'uglify', 'copy:dist']); grunt.registerTask('prod', ['shell:prod', 'nggettext_compile', 'concat', 'cssmin', 'uglify']); grunt.registerTask('translate', ['nggettext_extract']); grunt.registerTask('docs', ['jsdoc']); diff --git a/cordova/android/AndroidManifest.xml b/cordova/android/AndroidManifest.xml index 1d6f7e67b..022e657be 100644 --- a/cordova/android/AndroidManifest.xml +++ b/cordova/android/AndroidManifest.xml @@ -8,12 +8,6 @@ - - - - - - @@ -33,7 +27,6 @@ - diff --git a/cordova/android/config.xml b/cordova/android/config.xml deleted file mode 100644 index c9941d97a..000000000 --- a/cordova/android/config.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - Copay - - A secure bitcoin wallet for friends and companies. - - - Bitpay Inc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cordova/build.sh b/cordova/build.sh index d9cb38b15..53023e373 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -67,39 +67,26 @@ if [ ! -d $PROJECT ]; then fi echo "${OpenColor}${Green}* Installing plugins... ${CloseColor}" - cordova plugin add https://github.com/Initsogar/cordova-webintent.git - checkOK - + cordova plugin add https://github.com/wildabeast/BarcodeScanner.git checkOK - cordova plugin add https://github.com/VersoSolutions/CordovaClipboard - checkOK - - cordova plugin add de.appplant.cordova.plugin.email-composer && cordova prepare - checkOK - - cordova plugin add https://github.com/EddyVerbruggen/Toast-PhoneGap-Plugin.git && cordova prepare - checkOK - cordova plugin add org.apache.cordova.splashscreen checkOK cordova plugin add org.apache.cordova.statusbar checkOK - cordova plugin add https://github.com/EddyVerbruggen/LaunchMyApp-PhoneGap-Plugin.git --variable URL_SCHEME=bitcoin - checkOK fi echo "${OpenColor}${Green}* Generating copay bundle...${CloseColor}" cd $BUILDDIR/.. -grunt +grunt dist checkOK echo "${OpenColor}${Green}* Coping files...${CloseColor}" cd $BUILDDIR/.. -cp -af {css,font,img,js,lib,sound,views,config.js,version.js,init.js} $PROJECT/www +cp -af dist/web/** $PROJECT/www checkOK sed "s/<\!-- PLACEHOLDER: CORDOVA SRIPT -->/