Merge pull request #524 from bitjson/wip/build-scripts

Fix npm install

.gitignore

@@ -112,6 +112,11 @@ www/img/logo-negative.svg
 www/img/logo.svg
 src/js/appConfig.js
 src/js/externalServices.js
+chrome-app/manifest.json
+webkitbuilds/.desktop
+webkitbuilds/setup-win.iss
+www/img/favicon.ico
+www/img/icon-128.png
 
 
 cordova/Makefile

app-template/apply.js

@@ -17,7 +17,7 @@ var templates = {
   //  'bower.json': '/',
 };
 var configDir = process.argv[2] || 'copay';
-var JSONheader = ' { ' + "\n" + '  "//":"PLEASE! Do not edit this file directly",' + "\n" + '  "//":"        Modify it at app-template/", ' + "\n";
+var JSONheader = ' { ' + "\n" + '  "//":"Changes to this file will be overwritten",' + "\n" + '  "//":"        Modify it in the app-template directory", ' + "\n";
 
 var MakefileHeader = "# PLEASE! Do not edit this file directly \n#       Modify it at app-template/\n";
 

app-template/package.json

@@ -75,11 +75,12 @@
     "shelljs": "^0.3.0"
   },
   "scripts": {
-    "preinstall":             "bower install && npm i fs-extra",
+    "preinstall":             "bower install && npm install fs-extra",
-    "postinstall":            "npm run apply:bitpay && cordova prepare",
+    "postinstall":            "echo && echo \"To finish, choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo",
     "start":                  "npm run build:www && ionic serve --nolivereload --nogulp -s",
     "start:ios":              "npm run build:www && npm run build:ios && npm run open:ios",
     "start:android":          "npm run build:www && npm run build:android && npm run run:android",
+    "start:desktop":          "grunt desktop",
     "watch":                  "grunt watch",
     "build:www":              "grunt",
     "build:www-release":      "grunt prod",
@@ -89,15 +90,16 @@
     "build:android-release":  "cordova prepare android && cordova build android --release",
     "open:ios":               "open platforms/ios/*.xcodeproj",
     "open:android":           "open -a open -a /Applications/Android\\ Studio.app platforms/android",
-    "final:www":              "npm run clean-all && npm run build:www-release",
+    "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 run:android",
+    "final:desktop":          "grunt desktop",
     "run:android":            "cordova run android --device",
     "log:android":            "adb logcat | grep chromium",
-    "apply:copay":            "cd app-template && node apply.js copay",
+    "apply:copay":            "cd app-template && node apply.js copay && cordova prepare",
-    "apply:bitpay":           "cd app-template && node apply.js bitpay",
+    "apply:bitpay":           "cd app-template && node apply.js bitpay && cordova prepare",
     "test":                   "./node_modules/.bin/grunt test-coveralls",
-    "clean":                  "trash platforms && trash plugins && npm run postinstall",
+    "clean":                  "trash platforms && trash plugins && cordova prepare",
     "clean-all":              "git clean -dfx && npm install"
   },
   "devDependencies": {

chrome-app/manifest.json

@@ -1,24 +0,0 @@
- { 
-  "//":"PLEASE! Do not edit this file directly",
-  "//":"        Modify it at app-template/", 
-
-  "manifest_version": 2,
-  "name": "bitpay",
-  "description": "Secure Bitcoin Wallet",
-  "version": "0.14.0",
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "notifications",
-    "videoCapture",
-    "webview"
-  ],
-  "app": {
-    "background": {
-      "scripts": ["initial.js"]
-    }
-  },
-  "icons": {
-    "128": "img/icon-chrome-128.png"
-  }
-}

package.json

@@ -1,113 +1,18 @@
- { 
+{
-  "//":"PLEASE! Do not edit this file directly",
+  "name": "distribution-not-selected",
-  "//":"        Modify it at app-template/", 
+  "description": "Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.",
-
+  "primary-package-json": "See the tempate in app-template/package.json",
-  "name": "bitpay",
+  "scripts": {
-  "description": "Secure Bitcoin Wallet",
+    "postinstall": "npm run apply:copay && npm install",
-  "author": "BitPay",
+    "apply:copay": "cd app-template && node apply.js copay",
-  "version": "0.14.0",
+    "apply:bitpay": "cd app-template && node apply.js bitpay"
-  "keywords": [
-    "bitcoin",
-    "wallet",
-    "bitpay",
-    "copay",
-    "multisignature",
-    "bitcore"
-  ],
-  "main": "www/index.html",
-  "window": {
-    "title": "BitPay - Secure Bitcoin Wallet",
-    "icon": "www/img/icon-128.png",
-    "toolbar": false,
-    "show": true,
-    "visible": true,
-    "resizable": true,
-    "frame": true,
-    "width": 400,
-    "height": 650,
-    "position": "center",
-    "fullscreen": false
-  },
-  "webkit": {
-    "page-cache": false,
-    "java": false,
-    "plugin": false
-  },
-  "dom_storage_quota": 200,
-  "id": "jid1-x7bV5evAaI1P9Q",
-  "homepage": "https://bitpay.com",
-  "license": "MIT",
-  "repository": {
-    "url": "git://github.com/bitpay/bitpay-wallet.git",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/bitpay/bitpay-wallet/issues"
   },
   "dependencies": {
-    "adm-zip": "^0.4.7",
+    "fs-extra": "^0.30.0"
-    "angular": "1.4.6",
-    "angular-mocks": "1.4.10",
-    "bezier-easing": "^2.0.3",
-    "bhttp": "^1.2.1",
-    "bitauth": "^0.3.2",
-    "bitcore-wallet-client": "4.3.2",
-    "bower": "^1.7.9",
-    "chai": "^3.5.0",
-    "cordova-android": "5.1.1",
-    "cordova-custom-config": "^3.0.5",
-    "cordova-plugin-qrscanner": "^2.3.1",
-    "coveralls": "^2.11.9",
-    "express": "^4.11.2",
-    "fs": "0.0.2",
-    "fs-extra": "^0.30.0",
-    "grunt-angular-gettext": "^2.2.3",
-    "grunt-browserify": "^5.0.0",
-    "grunt-cli": "^1.2.0",
-    "grunt-contrib-compress": "^1.3.0",
-    "grunt-contrib-concat": "^1.0.1",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-uglify": "^2.0.0",
-    "grunt-contrib-watch": "^1.0.0",
-    "grunt-exec": "^1.0.0",
-    "grunt-nw-builder": "^2.0.3",
-    "grunt-sass": "^1.2.0",
-    "load-grunt-tasks": "^3.5.0",
-    "mocha": "^2.4.5",
-    "phantomjs-prebuilt": "^2.1.7",
-    "shelljs": "^0.3.0"
   },
-  "scripts": {
+  "license": "MIT",
-    "preinstall":             "bower install && npm i fs-extra",
+  "repository": {
-    "postinstall":            "npm run apply:bitpay && cordova prepare",
+    "url": "git://github.com/bitpay/copay.git",
-    "start":                  "npm run build:www && ionic serve --nolivereload --nogulp -s",
+    "type": "git"
-    "start:ios":              "npm run build:www && npm run build:ios && npm run open:ios",
-    "start:android":          "npm run build:www && npm run build:android && npm run run:android",
-    "watch":                  "grunt watch",
-    "build:www":              "grunt",
-    "build:www-release":      "grunt prod",
-    "build:ios":              "cordova prepare ios && cordova build ios --debug",
-    "build:android":          "cordova prepare android && cordova build android --debug",
-    "build:ios-release":      "cordova prepare ios && cordova build ios --release",
-    "build:android-release":  "cordova prepare android && cordova build android --release",
-    "open:ios":               "open platforms/ios/*.xcodeproj",
-    "open:android":           "open -a open -a /Applications/Android\\ Studio.app platforms/android",
-    "final:www":              "npm run clean-all && 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 run:android",
-    "run:android":            "cordova run android --device",
-    "log:android":            "adb logcat | grep chromium",
-    "apply:copay":            "cd app-template && node apply.js copay",
-    "apply:bitpay":           "cd app-template && node apply.js bitpay",
-    "test":                   "./node_modules/.bin/grunt test-coveralls",
-    "clean":                  "trash platforms && trash plugins && npm run postinstall",
-    "clean-all":              "git clean -dfx && npm install"
-  },
-  "devDependencies": {
-    "cordova": "^6.3.1",
-    "grunt": "^1.0.1",
-    "ionic": "^2.1.0",
-    "trash-cli": "^1.4.0",
-    "lodash": "^4.3.0"
   }
 }

webkitbuilds/.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=0.14.0
-Name=BitPay
-Comment=Secure Bitcoin Wallet
-Exec=bitpay
-Icon=icon-256.png
-Terminal=false
-Categories=Finance
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage

webkitbuilds/setup-win.iss

@@ -1,56 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "BitPay"
-#define MyAppVersion "0.14.0"
-#define MyAppPublisher "BitPay"
-#define MyAppURL "https://bitpay.com"
-#define MyAppExeName "*PACKAGENAME.exe"
-
-[Setup]
-AppId={804636ee-b017-4cad-8719-e58ac97ffa5c}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DefaultGroupName={#MyAppName}
-OutputBaseFilename=bitpay-win
-OutputDir=./
-Compression=lzma
-SolidCompression=yes
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "bitpay\win64\bitpay.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "bitpay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "../www/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; IconFilename: "{app}/icon.ico"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}/icon.ico"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-[Registry]
-Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueData: "URL:Bitcoin Custom Protocol"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: ""
-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: "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"""