Merge branch 'wallet/sprint/18' into wallet/task/399
This commit is contained in:
Jean-Baptiste Dominguez
GitHub
commit
1d9efcca06
36 changed files with 808 additions and 157 deletions
|
|
@ -11,7 +11,10 @@ var templates = {
|
|||
'ionic.config.json': '/',
|
||||
'.desktop': 'webkitbuilds/',
|
||||
'setup-win.iss': 'webkitbuilds/',
|
||||
'build-macos.sh': 'webkitbuilds/',
|
||||
'create-dmg-dist.sh': 'webkitbuilds/',
|
||||
'create-others-dist.sh': 'webkitbuilds/',
|
||||
'create-pkg-dist.sh': 'webkitbuilds/',
|
||||
'sign-desktop-dist.sh': 'webkitbuilds/',
|
||||
'manifest.json': 'chrome-app/',
|
||||
// 'bower.json': '/',
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"packageName": "bitcoin.com",
|
||||
"packageDescription": "Bitcoin.com Wallet",
|
||||
"packageNameId": "com.bitcoin.mwallet",
|
||||
"userVisibleName": "Bitcoin.com",
|
||||
"userVisibleName": "Bitcoin.com Wallet",
|
||||
"purposeLine": "Bitcoin.com Wallet",
|
||||
"bundleName": "bitcoincom",
|
||||
"appUri": "bitcoincom",
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
"appDescription": "Bitcoin.com Wallet",
|
||||
"winAppName": "BitcoinWallet",
|
||||
"WindowsStoreIdentityName": "18C7659D.Bitcoin.com-SecureBitcoinWallet",
|
||||
"WindowsStoreDisplayName": "Bitcoin.com - Secure Bitcoin Wallet",
|
||||
"WindowsStoreDisplayName": "Bitcoin.com Wallet",
|
||||
"wpPublisherId": "{31cdd08b-457c-413d-b440-f6665eec847d}",
|
||||
"wpProductId": "{5381aa50-9069-11e4-84cc-293caf9cbdc8}",
|
||||
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
|
||||
|
|
|
|||
|
|
@ -75,8 +75,6 @@
|
|||
<plugin name="cordova-plugin-media" spec="~5.0.2">
|
||||
<variable name="KEEP_AVAUDIOSESSION_ALWAYS_ACTIVE" value="NO" />
|
||||
</plugin>
|
||||
<!-- Changes in error descriptions may break the use of cordova-plugin-secure-storage -->
|
||||
<plugin name="cordova-plugin-secure-storage" spec="2.6.8" />
|
||||
<!-- Supported Platforms -->
|
||||
<engine name="ios" spec="~4.5.3" />
|
||||
<engine name="android" spec="~6.3.0" />
|
||||
|
|
|
|||
49
app-template/build-macos.sh → app-template/create-dmg-dist.sh
Executable file → Normal file
49
app-template/build-macos.sh → app-template/create-dmg-dist.sh
Executable file → Normal file
|
|
@ -1,11 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
SHOULD_SIGN=$1
|
||||
if [ "$SHOULD_SIGN" ]
|
||||
then
|
||||
echo "Will sign the APP"
|
||||
fi
|
||||
|
||||
# by Andy Maloney
|
||||
# http://asmaloney.com/2013/07/howto/packaging-a-mac-os-x-application-using-a-dmg/
|
||||
|
||||
|
|
@ -16,21 +10,25 @@ if [ -d "$dir" ]; then
|
|||
fi
|
||||
|
||||
# set up your app name, architecture, and background image file name
|
||||
APP_NAME="*USERVISIBLENAME*"
|
||||
APP_PACKAGE=$1
|
||||
APP_VERSION=$2
|
||||
APP_NAME=$3
|
||||
APP_FULLNAME=$4
|
||||
|
||||
rm dmg-background.tiff
|
||||
ln -s ../resources/*PACKAGENAME*/mac/dmg-background.tiff dmg-background.tiff
|
||||
ln -s ../resources/bitcoin.com/mac/dmg-background.tiff dmg-background.tiff
|
||||
rm volume-icon.icns
|
||||
ln -s ../resources/*PACKAGENAME*/mac/volume-icon.icns volume-icon.icns
|
||||
ln -s ../resources/bitcoin.com/mac/volume-icon.icns volume-icon.icns
|
||||
DMG_VOLUME_ICON="volume-icon.icns"
|
||||
DMG_BACKGROUND_IMG="dmg-background.tiff"
|
||||
|
||||
PATH_NAME="${APP_NAME}/osx64/"
|
||||
PATH_NAME="dmg/${APP_NAME}/osx64/"
|
||||
# you should not need to change these
|
||||
APP_EXE="${PATH_NAME}${APP_NAME}.app/Contents/MacOS/nwjs"
|
||||
|
||||
VOL_NAME="${APP_NAME}"
|
||||
DMG_TMP="${VOL_NAME}-temp.dmg"
|
||||
DMG_FINAL="${VOL_NAME}.dmg"
|
||||
DMG_TMP="dmg/${VOL_NAME}-temp.dmg"
|
||||
DMG_FINAL="dmg/${VOL_NAME}.dmg"
|
||||
STAGING_DIR="tmp"
|
||||
|
||||
# Check the background image DPI and convert it if it isn't 72x72
|
||||
|
|
@ -66,25 +64,6 @@ SIZE=250
|
|||
if [ $? -ne 0 ]; then
|
||||
echo "Error: Cannot compute size of staging dir"
|
||||
exit
|
||||
fi
|
||||
|
||||
# Sign Code (MATIAS)
|
||||
if [ $SHOULD_SIGN ]
|
||||
then
|
||||
echo "Signing ${APP_NAME} DMG"
|
||||
|
||||
export IDENTITY="3rd Party Mac Developer Application: BitPay, Inc. (884JRH5R93)"
|
||||
|
||||
# not need for 'out of app store' distribution (?)
|
||||
# export PARENT_PLIST=parent.plist
|
||||
# export CHILD_PLIST=child.plist
|
||||
export APP_PATH=${STAGING_DIR}/${APP_NAME}.app
|
||||
|
||||
codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Versions/52.0.2743.82/nwjs Helper.app" && echo "Sign 1"
|
||||
codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Versions/52.0.2743.82/nwjs Framework.framework/Resources/app_mode_loader.app" && echo "Sign 2"
|
||||
codesign --deep -s "${IDENTITY}" $APP_PATH && echo "Sign 3"
|
||||
echo "Signing Done"
|
||||
|
||||
fi
|
||||
|
||||
# create the temp DMG file
|
||||
|
|
@ -175,6 +154,14 @@ hdiutil detach "${DEVICE}"
|
|||
echo "Creating compressed image"
|
||||
hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL}"
|
||||
|
||||
export DIST_PATH="dist"
|
||||
|
||||
if [ ! -d $DIST_PATH ]; then
|
||||
mkdir $DIST_PATH
|
||||
fi
|
||||
|
||||
cp -vR "${DMG_FINAL}" "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.dmg"
|
||||
|
||||
# clean up
|
||||
rm -rf "${DMG_TMP}"
|
||||
rm -rf "${STAGING_DIR}"
|
||||
54
app-template/create-others-dist.sh
Normal file
54
app-template/create-others-dist.sh
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
#!/bin/bash
|
||||
|
||||
# make sure we are in the correct dir when we double-click a .command file
|
||||
dir=${0%/*}
|
||||
if [ -d "$dir" ]; then
|
||||
cd "$dir"
|
||||
fi
|
||||
|
||||
# set up your app name, architecture, and background image file name
|
||||
APP_PACKAGE=$1
|
||||
APP_VERSION=$2
|
||||
APP_NAME=$3
|
||||
APP_FULLNAME=$4
|
||||
|
||||
export APP_LINUX_PATH="others/${APP_NAME}/linux64"
|
||||
export APP_WIN_PATH="others/${APP_NAME}/win64"
|
||||
export DIST_PATH="dist"
|
||||
|
||||
if [ ! -d $DIST_PATH ]; then
|
||||
mkdir $DIST_PATH
|
||||
fi
|
||||
|
||||
##
|
||||
# LINUX
|
||||
|
||||
echo "Building Linux..."
|
||||
|
||||
# Building package
|
||||
cp -R $APP_LINUX_PATH bitcoin-com-wallet
|
||||
tar -cvzf "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-linux-x64.tar.gz" bitcoin-com-wallet
|
||||
|
||||
# Clean
|
||||
rm -R bitcoin-com-wallet
|
||||
|
||||
echo "Linux Done."
|
||||
|
||||
|
||||
##
|
||||
# WINDOWS
|
||||
|
||||
echo "Building Windows..."
|
||||
|
||||
# Building package
|
||||
cp -R $APP_WIN_PATH bitcoin-com-wallet
|
||||
zip -r "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-win-x64.zip" bitcoin-com-wallet
|
||||
|
||||
# Clean
|
||||
rm -R bitcoin-com-wallet
|
||||
|
||||
echo "Windows Done."
|
||||
|
||||
echo "Done."
|
||||
|
||||
exit
|
||||
45
app-template/create-pkg-dist.sh
Normal file
45
app-template/create-pkg-dist.sh
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
#!/bin/bash
|
||||
|
||||
# make sure we are in the correct dir when we double-click a .command file
|
||||
dir=${0%/*}
|
||||
if [ -d "$dir" ]; then
|
||||
cd "$dir"
|
||||
fi
|
||||
|
||||
# set up your app name, architecture, and background image file name
|
||||
APP_PACKAGE=$1
|
||||
APP_VERSION=$2
|
||||
APP_NAME=$3
|
||||
APP_FULLNAME=$4
|
||||
|
||||
rm entitlements-child.plist
|
||||
ln -s ../resources/bitcoin.com/mac/pkg/entitlements-child.plist entitlements-child.plist
|
||||
|
||||
rm entitlements-parent.plist
|
||||
ln -s ../resources/bitcoin.com/mac/pkg/entitlements-parent.plist entitlements-parent.plist
|
||||
|
||||
rm build.cfg
|
||||
ln -s ../resources/bitcoin.com/mac/pkg/build.cfg build.cfg
|
||||
|
||||
rm build_mas.py
|
||||
ln -s ../resources/bitcoin.com/mac/pkg/build_mas.py build_mas.py
|
||||
|
||||
echo "Signing ${APP_NAME}"
|
||||
export APP_PATH="pkg/${APP_NAME}/osx64/${APP_NAME}"
|
||||
export TMP_PATH="tmp"
|
||||
export DIST_PATH="dist"
|
||||
|
||||
rm -rf $TMP_PATH
|
||||
mkdir $TMP_PATH
|
||||
|
||||
if [ ! -d $DIST_PATH ]; then
|
||||
mkdir $DIST_PATH
|
||||
fi
|
||||
|
||||
python build_mas.py -C build.cfg -O "${TMP_PATH}/${APP_NAME}.app" -I "${APP_PATH}.app" -P "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg"
|
||||
|
||||
echo "Signing Done"
|
||||
|
||||
echo "Done."
|
||||
|
||||
exit
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
"description": "*DESCRIPTION*",
|
||||
"author": "BitPay",
|
||||
"version": "*VERSION*",
|
||||
"androidVersion": "*ANDROIDVERSION*",
|
||||
"fullVersion": "*FULLVERSION*",
|
||||
"keywords": [
|
||||
"bitcoin",
|
||||
|
|
@ -14,8 +15,9 @@
|
|||
],
|
||||
"main": "www/index.html",
|
||||
"title": "*USERVISIBLENAME*",
|
||||
"nameCaseNoSpace": "*NAMECASENOSPACE*",
|
||||
"window": {
|
||||
"title": "*USERVISIBLENAME* - *PURPOSELINE*",
|
||||
"title": "*USERVISIBLENAME*",
|
||||
"icon": "www/img/app/icon.png",
|
||||
"toolbar": false,
|
||||
"show": true,
|
||||
|
|
@ -69,6 +71,8 @@
|
|||
"grunt-angular-gettext": "^2.2.3",
|
||||
"grunt-browserify": "^5.0.0",
|
||||
"grunt-cli": "^1.2.0",
|
||||
"grunt-curl": "^2.4.1",
|
||||
"grunt-zip": "^0.17.1",
|
||||
"grunt-contrib-compress": "^1.3.0",
|
||||
"grunt-contrib-concat": "^1.0.1",
|
||||
"grunt-contrib-copy": "^1.0.0",
|
||||
|
|
@ -99,15 +103,19 @@
|
|||
"build:ios-release": "cordova prepare ios && cordova build ios --release",
|
||||
"build:android-release": "cordova prepare android && cordova build android --release",
|
||||
"build:windows-release": "cordova prepare windows && cordova build windows --release --arch=\"ARM\"",
|
||||
"build:desktop": "grunt desktop",
|
||||
"build:osx": "grunt osx",
|
||||
"build:desktop-release": "grunt desktop-release",
|
||||
"build:desktop": "grunt desktop-build",
|
||||
"build:osx-pkg": "grunt desktop-osx-pkg",
|
||||
"build:osx-dmg": "grunt desktop-osx-dmg",
|
||||
"build:others": "grunt desktop-others",
|
||||
"sign:desktop": "grunt desktop-sign",
|
||||
"open:ios": "open platforms/ios/*.xcodeproj",
|
||||
"open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android",
|
||||
"final:www": "npm run build:www-release",
|
||||
"final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios",
|
||||
"final:android": "npm run final:www && npm run build:android-release && npm run sign:android && npm run run:android-release",
|
||||
"final:windows": "npm run final:www && npm run build:windows-release",
|
||||
"final:desktop": "npm run build:desktop && npm run build:osx",
|
||||
"final:desktop": "npm run final:www && npm run build:desktop-release",
|
||||
"run:android": "cordova run android --device",
|
||||
"run:android-release": "cordova run android --device --release",
|
||||
"log:android": "adb logcat | grep chromium",
|
||||
|
|
|
|||
40
app-template/sign-desktop-dist.sh
Normal file
40
app-template/sign-desktop-dist.sh
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
#!/bin/bash
|
||||
|
||||
# make sure we are in the correct dir when we double-click a .command file
|
||||
dir=${0%/*}
|
||||
if [ -d "$dir" ]; then
|
||||
cd "$dir"
|
||||
fi
|
||||
|
||||
APP_PACKAGE=$1
|
||||
APP_VERSION=$2
|
||||
export DIST_PATH="dist"
|
||||
|
||||
##
|
||||
# INIT GPG (YOU NEED THE PRIVATE KEY CONNECTED TO YOUR DESKTOP)
|
||||
# gpg --card-edit
|
||||
|
||||
##
|
||||
# LINUX
|
||||
|
||||
# Sig tar.gz
|
||||
gpg --yes --output "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-linux-x64.tar.gz.sig" --detach-sig "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-linux-x64.tar.gz"
|
||||
gpg --verify "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-linux-x64.tar.gz.sig" "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-linux-x64.tar.gz"
|
||||
|
||||
##
|
||||
# WINDOWS
|
||||
|
||||
# Sig zip
|
||||
gpg --yes --output "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-win-x64.zip.sig" --detach-sig "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-win-x64.zip"
|
||||
gpg --verify "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-win-x64.zip.sig" "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-win-x64.zip"
|
||||
|
||||
##
|
||||
# OSX
|
||||
|
||||
# Sig dmg
|
||||
gpg --yes --output "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.dmg.sig" --detach-sig "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.dmg"
|
||||
gpg --verify "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.dmg.sig" "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.dmg"
|
||||
|
||||
# Sig pkg
|
||||
gpg --yes --output "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg.sig" --detach-sig "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg"
|
||||
gpg --verify "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg.sig" "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg"
|
||||
Loading…
Add table
Add a link
Reference in a new issue