BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3655 from cmgustavo/ref/build-desktop 

Ref building for desktop
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-11 15:16:03 -03:00
parent 2417ae0edd 946591ca7e
commit 68d2cbe922
6 changed files with 23 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -14,8 +14,7 @@ cordova/*.keystore
cache
webkitbuilds/*
!webkitbuilds/README.md
!webkitbuilds/setup-win32.iss
!webkitbuilds/setup-win64.iss
!webkitbuilds/setup-win.iss
!webkitbuilds/favicon.ico
!webkitbuilds/.desktop
!webkitbuilds/build-osx.sh

39
Gruntfile.js
View File

@ -10,11 +10,8 @@ module.exports = function(grunt) {
clear: {
command: 'rm -Rf bower_components node_modules'
},
osx64: {
command: 'webkitbuilds/build-osx.sh osx64'
},
osx32: {
command: 'webkitbuilds/build-osx.sh osx32'
osx: {
command: 'webkitbuilds/build-osx.sh'
}
},
watch: {
@ -144,17 +141,10 @@ module.exports = function(grunt) {
expand: true,
cwd: 'webkitbuilds/',
src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'],
dest: 'webkitbuilds/copay/linux32/',
dest: 'webkitbuilds/Copay/linux64/',
flatten: true,
filter: 'isFile'
}, {
expand: true,
cwd: 'webkitbuilds/',
src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'],
dest: 'webkitbuilds/copay/linux64/',
flatten: true,
filter: 'isFile'
}, ],
}],
}
},
karma: {
@ -178,7 +168,7 @@ module.exports = function(grunt) {
nodewebkit: {
options: {
appName: 'Copay',
platforms: ['win', 'osx', 'linux'],
platforms: ['win64', 'osx64', 'linux64'],
buildDir: './webkitbuilds',
version: '0.12.2',
macIcns: './public/img/icons/icon.icns',
@ -187,23 +177,14 @@ module.exports = function(grunt) {
src: ['./package.json', './public/**/*']
},
compress: {
linux32: {
linux: {
options: {
archive: './webkitbuilds/copay-linux32.zip'
archive: './webkitbuilds/Copay-linux.zip'
},
expand: true,
cwd: './webkitbuilds/copay/linux32/',
cwd: './webkitbuilds/Copay/linux64/',
src: ['**/*'],
dest: 'copay-linux32/'
},
linux64: {
options: {
archive: './webkitbuilds/copay-linux64.zip'
},
expand: true,
cwd: './webkitbuilds/copay/linux64/',
src: ['**/*'],
dest: 'copay-linux64/'
dest: 'copay-linux/'
}
},
browserify: {
@ -232,5 +213,5 @@ module.exports = function(grunt) {
grunt.registerTask('translate', ['nggettext_extract']);
grunt.registerTask('test', ['karma:unit']);
grunt.registerTask('test-coveralls', ['karma:prod', 'coveralls']);
grunt.registerTask('desktop', ['prod', 'nodewebkit', 'copy:linux', 'compress:linux32', 'compress:linux64', 'exec:osx32', 'exec:osx64']);
grunt.registerTask('desktop', ['prod', 'nodewebkit', 'copy:linux', 'compress:linux', 'exec:osx']);
};

18
Makefile
View File

@ -6,20 +6,14 @@ verify:
gpg --verify browser-extensions/chrome/copay-chrome-extension.zip.sig browser-extensions/chrome/copay-chrome-extension.zip
sign-desktop:
gpg -u 1112CFA1 --output webkitbuilds/copay-linux32.zip.sig --detach-sig webkitbuilds/copay-linux32.zip
gpg -u 1112CFA1 --output webkitbuilds/copay-linux64.zip.sig --detach-sig webkitbuilds/copay-linux64.zip
gpg -u 1112CFA1 --output webkitbuilds/copay-osx32.dmg.sig --detach-sig webkitbuilds/copay-osx32.dmg
gpg -u 1112CFA1 --output webkitbuilds/copay-osx64.dmg.sig --detach-sig webkitbuilds/copay-osx64.dmg
gpg -u 1112CFA1 --output webkitbuilds/copay-win32.exe.sig --detach-sig webkitbuilds/copay-win32.exe
gpg -u 1112CFA1 --output webkitbuilds/copay-win64.exe.sig --detach-sig webkitbuilds/copay-win64.exe
gpg -u 1112CFA1 --output webkitbuilds/Copay-linux.zip.sig --detach-sig webkitbuilds/Copay-linux.zip
gpg -u 1112CFA1 --output webkitbuilds/Copay-osx.dmg.sig --detach-sig webkitbuilds/Copay-osx.dmg
gpg -u 1112CFA1 --output webkitbuilds/Copay-win.exe.sig --detach-sig webkitbuilds/Copay-win.exe
verify-desktop:
gpg --verify webkitbuilds/copay-linux32.zip.sig webkitbuilds/copay-linux32.zip
gpg --verify webkitbuilds/copay-linux64.zip.sig webkitbuilds/copay-linux64.zip
gpg --verify webkitbuilds/copay-osx32.dmg.sig webkitbuilds/copay-osx32.dmg
gpg --verify webkitbuilds/copay-osx64.dmg.sig webkitbuilds/copay-osx64.dmg
gpg --verify webkitbuilds/copay-win32.exe.sig webkitbuilds/copay-win32.exe
gpg --verify webkitbuilds/copay-win64.exe.sig webkitbuilds/copay-win64.exe
gpg --verify webkitbuilds/Copay-linux.zip.sig webkitbuilds/Copay-linux.zip
gpg --verify webkitbuilds/Copay-osx.dmg.sig webkitbuilds/Copay-osx.dmg
gpg --verify webkitbuilds/Copay-win.exe.sig webkitbuilds/Copay-win.exe
chrome:
browser-extensions/chrome/build.sh

5
webkitbuilds/build-osx.sh
View File

@ -11,14 +11,13 @@ fi
# set up your app name, architecture, and background image file name
APP_NAME="Copay"
ARCH="$1"
DMG_BACKGROUND_IMG="Background.png"
PATH_NAME="Copay/$1/"
PATH_NAME="Copay/osx64/"
# you should not need to change these
APP_EXE="${PATH_NAME}${APP_NAME}.app/Contents/MacOS/nwjs"
VOL_NAME="${APP_NAME}-${ARCH}"
VOL_NAME="${APP_NAME}-osx"
DMG_TMP="${VOL_NAME}-temp.dmg"
DMG_FINAL="${VOL_NAME}.dmg"
STAGING_DIR="tmp"

8
webkitbuilds/setup-win32.iss → webkitbuilds/setup-win.iss
View File

@ -5,7 +5,7 @@
#define MyAppVersion "1.6.1"
#define MyAppPublisher "BitPay"
#define MyAppURL "https://copay.io"
#define MyAppExeName "copay.exe"
#define MyAppExeName "Copay.exe"
[Setup]
AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c}
@ -18,7 +18,7 @@ AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}
DefaultGroupName={#MyAppName}
OutputBaseFilename=copay-win32
OutputBaseFilename=Copay-win
OutputDir=./
Compression=lzma
SolidCompression=yes
@ -33,8 +33,8 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
Source: "copay\win32\copay.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "copay\win32\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "Copay\win64\copay.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "Copay\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

47
webkitbuilds/setup-win64.iss
View File

@ -1,47 +0,0 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Copay"
#define MyAppVersion "1.6.1"
#define MyAppPublisher "BitPay"
#define MyAppURL "https://copay.io"
#define MyAppExeName "copay.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=copay-win64
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: "copay\win64\copay.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "copay\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
[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