diff --git a/app-template/apply.js b/app-template/apply.js index a7be2af30..115044cae 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -10,8 +10,9 @@ var templates = { 'ProjectMakefile': 'cordova/', 'config.xml': 'cordova/', 'Package.appxmanifest': 'cordova/wp/', - '.desktop': 'webkitbuilds/.desktop', - 'setup-win.iss': 'webkitbuilds/setup-win.iss', + '.desktop': 'webkitbuilds/', + 'setup-win.iss': 'webkitbuilds/', + 'manifest.json': 'chrome-app/', // 'bower.json': '/', }; var configDir = process.argv[2] || 'copay'; @@ -108,13 +109,12 @@ copyDir(configDir + '/img/', '../public/img/', function() { copyDir(configDir + '/iosIcons/', '../cordova/ios/icons/', function() { copyDir(configDir + '/iosSplash/', '../cordova/ios/splash/', function() { copyDir(configDir + '/wpAssets/', '../cordova/wp/Assets/', function() { - copyDir(configDir + '/wpImg/', '../cordova/wp/', function() { - - // TODO WP - console.log("apply.js finished. \n\n"); + copyDir(configDir + '/wpImg/', '../cordova/wp/', function() { + // TODO WP + console.log("apply.js finished. \n\n"); + }); + }); }); }); - }); - }); }); }); diff --git a/app-template/copay/img/icon-chrome-128.png b/app-template/copay/img/icon-chrome-128.png new file mode 100644 index 000000000..0044af9ca Binary files /dev/null and b/app-template/copay/img/icon-chrome-128.png differ diff --git a/app-template/manifest.json b/app-template/manifest.json new file mode 100644 index 000000000..dc9419ca5 --- /dev/null +++ b/app-template/manifest.json @@ -0,0 +1,21 @@ +{ + "manifest_version": 2, + "name": "*NAMECASENOSPACE*", + "description": "*DESCRIPTION*", + "version": "*VERSION*", + "permissions": [ + "storage", + "unlimitedStorage", + "notifications", + "videoCapture", + "webview" + ], + "app": { + "background": { + "scripts": ["initial.js"] + } + }, + "icons": { + "128": "img/icon-chrome-128.png" + } +} diff --git a/chrome-app/Makefile b/chrome-app/Makefile index c66c7effd..d862e8c9c 100644 --- a/chrome-app/Makefile +++ b/chrome-app/Makefile @@ -1,7 +1,6 @@ # Configs BUILDDIR=build ZIPFILE=copay-chrome-extension.zip -VERSION=`cut -d '"' -f2 ../src/js/version.js|head -n 1` INCLUDE=$(shell cat ./include) INITIAL=./initial.js @@ -13,7 +12,7 @@ all: $(ZIPFILE) dir: rm -rf $(BUILDDIR) mkdir -p $(BUILDDIR) - sed "s/APP_VERSION/$(VERSION)/g" manifest.json > $(BUILDDIR)/manifest.json + cp manifest.json $(BUILDDIR)/manifest.json cp -vf $(INITIAL) $(BUILDDIR) files: diff --git a/chrome-app/README.md b/chrome-app/README.md deleted file mode 100644 index 0eec88a19..000000000 --- a/chrome-app/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Development - -* Just run: - -``` -$ sh chrome/build.sh -``` - -* The ZIP file is *chrome/copay-chrome-extension.zip* diff --git a/chrome-app/include b/chrome-app/include index 25f00ad10..22d904fd4 100644 --- a/chrome-app/include +++ b/chrome-app/include @@ -1,8 +1,7 @@ ./index.html +./cordova.js ./css/*.css -./font/* ./fonts/* -./icons/* ./img/* ./img/**/* ./js/*.js diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json index c4dc8df6a..3ba8bdce0 100644 --- a/chrome-app/manifest.json +++ b/chrome-app/manifest.json @@ -1,8 +1,11 @@ -{ + { + "//":"PLEASE! Do not edit this file directly", + "//":" Modify it at app-template/", + "manifest_version": 2, - "name": "Copay", - "description": "A secure Bitcoin wallet for friends and companies", - "version": "APP_VERSION", + "name": "BitPay", + "description": "The BitPay Bitcoin Wallet", + "version": "0.2.0", "permissions": [ "storage", "unlimitedStorage", @@ -16,6 +19,6 @@ } }, "icons": { - "128": "img/icons/icon-chrome-128.png" + "128": "img/icon-chrome-128.png" } } diff --git a/public/img/icon-chrome-128.png b/public/img/icon-chrome-128.png new file mode 100644 index 000000000..0044af9ca Binary files /dev/null and b/public/img/icon-chrome-128.png differ diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 07f30e12f..661f2b128 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,12 +1,11 @@ [Desktop Entry] Type=Application -Version=2.5.0 -Name=Copay -Comment=A multisignature wallet -Exec=copay +Version=0.2.0 +Name=BitPay +Comment=The BitPay Bitcoin Wallet +Exec=bitpay Icon=icon-256.png Terminal=false Categories=Finance X-Ubuntu-Touch=true X-Ubuntu-StageHint=SideStage - diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index 20d92af17..828b1a75f 100755 --- a/webkitbuilds/setup-win.iss +++ b/webkitbuilds/setup-win.iss @@ -1,11 +1,11 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define MyAppName "Copay" -#define MyAppVersion "2.5.0" +#define MyAppName "bitpay" +#define MyAppVersion "0.2.0" #define MyAppPublisher "BitPay" -#define MyAppURL "https://copay.io" -#define MyAppExeName "Copay.exe" +#define MyAppURL "https://bitpay.com" +#define MyAppExeName "*NAMECASENOSPACE.exe" [Setup] AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} @@ -18,11 +18,10 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} -OutputBaseFilename=Copay-win +OutputBaseFilename=BitPay-win OutputDir=./ Compression=lzma SolidCompression=yes - [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" Name: "french"; MessagesFile: "compiler:Languages\French.isl" @@ -33,8 +32,8 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "Copay\win64\copay.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "Copay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "BitPay\win64\bitpay.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "BitPay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files @@ -51,8 +50,8 @@ Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueName: "URL Protocol"; V Root: HKCR; Subkey: "bitcoin\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" Root: HKCR; Subkey: "bitcoin\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" -Root: HKCR; Subkey: "copay"; ValueType: "string"; ValueData: "URL:Copay Custom Protocol"; Flags: uninsdeletekey -Root: HKCR; Subkey: "copay"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "copay\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" -Root: HKCR; Subkey: "copay\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" +Root: HKCR; Subkey: "bitpay"; ValueType: "string"; ValueData: "URL:BitPay Custom Protocol"; Flags: uninsdeletekey +Root: HKCR; Subkey: "bitpay"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" +Root: HKCR; Subkey: "bitpay\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" +Root: HKCR; Subkey: "bitpay\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1"""