docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from kitematic/atom-shell-electron 

Rename atom-shell dependency to electron
This commit is contained in:
Jeffrey Morgan 2015-04-17 11:37:16 -04:00
parent 734b779df6 18b97e28b6
commit 1c82b21a1c
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -36,7 +36,7 @@ To run the app in development:
**Note: This architecture is work in progress and doesn't reflect the current state of the app, yet!**
Kitematic is an application built using [atom-shell](https://github.com/atom/atom-shell) and is powered by the [Docker Engine](https://github.com/docker/docker). While it's work in progress, the goal is to make Kitematic a high-performance, portable Javascript ES6 application built with React and Reflux. It adopts a single data flow pattern:
Kitematic is an application built using [electron](https://github.com/atom/electron) and is powered by the [Docker Engine](https://github.com/docker/docker). While it's work in progress, the goal is to make Kitematic a high-performance, portable Javascript ES6 application built with React and Reflux. It adopts a single data flow pattern:
```
╔═════════╗ ╔════════╗ ╔═════════════════╗

26
gulpfile.js
View File

@ -2,7 +2,7 @@ var babel = require('gulp-babel');
var changed = require('gulp-changed');
var concat = require('gulp-concat');
var cssmin = require('gulp-cssmin');
var downloadatomshell = require('gulp-download-atom-shell');
var downloadelectron = require('gulp-download-electron');
var fs = require('fs');
var gulp = require('gulp');
var gulpif = require('gulp-if');
@ -76,8 +76,8 @@ gulp.task('styles', function () {
});
gulp.task('download', function (cb) {
downloadatomshell({
version: packagejson['atom-shell-version'],
downloadelectron({
version: packagejson['electron-version'],
outputDir: 'cache'
}, cb);
});
@ -97,8 +97,8 @@ gulp.task('dist', function () {
var stream = gulp.src('').pipe(shell([
'rm -Rf dist',
'mkdir -p ./dist/osx',
'cp -R ./cache/Atom.app ./dist/osx/<%= filename %>',
'mv ./dist/osx/<%= filename %>/Contents/MacOS/Atom ./dist/osx/<%= filename %>/Contents/MacOS/<%= name %>',
'cp -R ./cache/Electron.app ./dist/osx/<%= filename %>',
'mv ./dist/osx/<%= filename %>/Contents/MacOS/Electron ./dist/osx/<%= filename %>/Contents/MacOS/<%= name %>',
'mkdir -p ./dist/osx/<%= filename %>/Contents/Resources/app',
'mkdir -p ./dist/osx/<%= filename %>/Contents/Resources/app/node_modules',
'cp package.json dist/osx/<%= filename %>/Contents/Resources/app/',
@ -138,9 +138,19 @@ gulp.task('sign', function () {
try {
var signing_identity = fs.readFileSync('./identity', 'utf8').trim();
return gulp.src('').pipe(shell([
'codesign --deep --force --verbose --sign "' + signing_identity + '" ' + options.appFilename.replace(' ', '\\ ').replace('(','\\(').replace(')','\\)')
'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Framework.framework',
'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Helper\\ EH.app',
'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Helper\\ NP.app',
'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Helper.app',
'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/ReactiveCocoa.framework',
'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Squirrel.framework',
'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Mantle.framework',
'codesign --force --verbose --sign <%= identity %> <%= filename %>',
], {
cwd: './dist/osx/'
templateData: {
filename: 'dist/osx/' + options.appFilename.replace(' ', '\\ ').replace('(','\\(').replace(')','\\)'),
identity: '\"' + signing_identity + '\"'
}
}));
} catch (error) {
gutil.log(gutil.colors.red('Error: ' + error.message));
@ -181,7 +191,7 @@ gulp.task('default', ['download', 'copy', 'js', 'images', 'styles'], function ()
var env = process.env;
env.NODE_ENV = 'development';
gulp.src('').pipe(shell(['./cache/Atom.app/Contents/MacOS/Atom .'], {
gulp.src('').pipe(shell(['./cache/Electron.app/Contents/MacOS/Electron .'], {
env: env
}));
});

4
package.json
View File

@ -47,7 +47,7 @@
},
"docker-version": "1.6.0",
"docker-machine-version": "0.2.0",
"atom-shell-version": "0.23.0",
"electron-version": "0.24.0",
"virtualbox-version": "4.3.26",
"virtualbox-filename": "VirtualBox-4.3.26.pkg",
"virtualbox-checksum": "668f61c95efe37f8fc65cafe95b866fba64e37f2492dfc1e2b44a7ac3dcafa3b",
@ -79,7 +79,7 @@
"gulp-changed": "^1.2.1",
"gulp-concat": "^2.5.2",
"gulp-cssmin": "^0.1.6",
"gulp-download-atom-shell": "0.0.4",
"gulp-download-electron": "^0.0.5",
"gulp-if": "^1.2.5",
"gulp-insert": "^0.4.0",
"gulp-less": "^3.0.2",