Skip to content
This repository has been archived by the owner on Oct 4, 2019. It is now read-only.

Commit

Permalink
fix build (correct app name, icons, images, arch)
Browse files Browse the repository at this point in the history
  • Loading branch information
splix committed Nov 19, 2016
1 parent c75a11b commit de04b9b
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 18 deletions.
37 changes: 22 additions & 15 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ function platformIsActive(osArch) {
// TASKS
gulp.task('set-variables-mist', () => {
type = 'mist';
applicationName = 'Mist';
applicationName = 'Ethereum Classic Mist';
});
gulp.task('set-variables-wallet', () => {
type = 'wallet';
applicationName = 'Ethereum Wallet';
applicationName = 'Ethereum Classic Wallet';
});


Expand Down Expand Up @@ -129,6 +129,11 @@ gulp.task('copy-app-folder-files', ['copy-app-source-files'], (done) => {


gulp.task('copy-build-folder-files', ['clean:dist', 'copy-app-folder-files'], () => {
//fix not generating icons
gulp.src([`./icons/${type}/icons/*`], { base: './' })
.pipe(flatten())
.pipe(gulp.dest(`./dist_${type}/build/icons`));

return gulp.src([
`./icons/${type}/*`,
'./interface/public/images/dmg-background.jpg',
Expand Down Expand Up @@ -218,7 +223,7 @@ gulp.task('build-dist', ['download-signatures', 'copy-i18n'], (cb) => {
console.log('Bundling platforms: ', options.platform);

const appPackageJson = _.extend({}, packJson, {
name: applicationName.replace(/\s/, ''),
name: applicationName.replace(/\s/g, ''),
productName: applicationName,
description: applicationName,
homepage: 'https://github.com/ethereumproject/mist',
Expand Down Expand Up @@ -247,19 +252,21 @@ gulp.task('build-dist', ['download-signatures', 'copy-i18n'], (cb) => {
],
},
dmg: {
// background: '../build/dmg-background.jpg', //TODO
background: '../build/dmg-background.jpg',
'icon-size': 128,
contents: [{
x: 441,
y: 448,
type: 'link',
path: '/Applications',
},
contents: [
{
x: 441,
y: 142,
x: 470,
y: 135,
type: 'link',
path: '/Applications',
},
{
x: 125,
y: 135,
type: 'file',
}],
}
],
},
},
directories: {
Expand Down Expand Up @@ -308,8 +315,8 @@ gulp.task('release-dist', ['build-dist'], (done) => {
shell.rm('-rf', releasePath);
shell.mkdir('-p', releasePath);

const appNameHypen = applicationName.replace(/\s/, '-');
const appNameNoSpace = applicationName.replace(/\s/, '');
const appNameHypen = applicationName.replace(/\s/g, '-');
const appNameNoSpace = applicationName.replace(/\s/g, '');
const versionDashed = version.replace(/\./g, '-');

const cp = (inputPath, outputPath) => {
Expand Down
Binary file added icons/wallet/dmg-background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/wallet/icons/512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "Mist",
"version": "0.9.0",
"version": "0.9.1",
"license": "GPL-3.0",
"author": "Ethereum Classic Community",
"author": "Ethereum Classic Community <[email protected]>",
"contributors": [
"Ethereum Mist Team <[email protected]>"
],
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (argv.linux) {
}

builder.build({
targets: builder.createTargets(targets, null, 'all'),
targets: builder.createTargets(targets, null, 'x64'),
devMetadata: {
build: {
afterPack(params) {
Expand Down

0 comments on commit de04b9b

Please sign in to comment.