Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-27 02:19:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Move old edgehill src/pro into K2/packages/nylas-private

Browse source
This commit is contained in:
Evan Morikawa 2016-12-12 10:10:26 -05:00
parent 9cf05c780e
commit 2650613ef1
8 changed files with 18 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.flowconfig
View file

@ -1,12 +0,0 @@
[ignore]
<PROJECT_ROOT>/.*\.json$
<PROJECT_ROOT>/.*node_modules/.*node_modules.*
<PROJECT_ROOT>/src/pro/packages/nylas-private-analytics/node_modules/editions/.*
[options]
module.file_ext=.js
module.file_ext=.es6
module.file_ext=.jsx
[include]
<PROJECT_ROOT>/src/global

3
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "build/resources/nylas"]
path = src/pro
url = git@github.com:nylas/edgehill.git
[submodule "src/K2"]
path = src/K2
url = git@github.com:nylas/K2.git

8
.travis.yml
View file

@ -38,17 +38,17 @@ before_install:
chmod 400 ~/.ssh/id_rsa;
ssh-keyscan github.com >> ~/.ssh/known_hosts;
git submodule update --init --recursive;
2>/dev/null 1>/dev/null openssl aes-256-cbc -K $encrypted_d583b56b822e_key -iv $encrypted_d583b56b822e_iv -in src/pro/encrypted_certificates/travis/travis-files.tar.enc -out src/pro/encrypted_certificates/travis/travis-files.tar -d;
2>/dev/null 1>/dev/null openssl aes-256-cbc -K $encrypted_d583b56b822e_key -iv $encrypted_d583b56b822e_iv -in src/K2/packages/local-private/encrypted_certificates/travis/travis-files.tar.enc -out src/K2/packages/local-private/encrypted_certificates/travis/travis-files.tar -d;
mkdir build/resources/certs;
2>/dev/null 1>/dev/null tar xvf src/pro/encrypted_certificates/travis/travis-files.tar --directory=build/resources/certs/;
2>/dev/null 1>/dev/null tar xvf src/K2/packages/local-private/encrypted_certificates/travis/travis-files.tar --directory=build/resources/certs/;
2>/dev/null 1>/dev/null source build/resources/certs/set_unix_env.sh;
fi
- if [ "${MIRROR}" = "true" ]; then
export PUBLISH_BUILD=true;
git submodule update --init --recursive;
2>/dev/null 1>/dev/null openssl aes-256-cbc -K $encrypted_e6bb7e15b74d_key -iv $encrypted_e6bb7e15b74d_iv -in src/pro/encrypted_certificates/travis/travis-files-mirror.tar.enc -out src/pro/encrypted_certificates/travis/travis-files.tar -d;
2>/dev/null 1>/dev/null openssl aes-256-cbc -K $encrypted_e6bb7e15b74d_key -iv $encrypted_e6bb7e15b74d_iv -in src/K2/packages/local-private/encrypted_certificates/travis/travis-files-mirror.tar.enc -out src/K2/packages/local-private/encrypted_certificates/travis/travis-files.tar -d;
mkdir build/resources/certs;
2>/dev/null 1>/dev/null tar xvf src/pro/encrypted_certificates/travis/travis-files.tar --directory=build/resources/certs/;
2>/dev/null 1>/dev/null tar xvf src/K2/packages/local-private/encrypted_certificates/travis/travis-files.tar --directory=build/resources/certs/;
2>/dev/null 1>/dev/null source build/resources/certs/set_unix_env.sh;
fi

8
appveyor.yml
View file

@ -32,9 +32,9 @@ install:
# http://stackoverflow.com/questions/21002919/running-a-remote-powershell-script-with-a-git-command-in-it-results-in-nativecom
Start-Process -FilePath git.exe -ArgumentList 'submodule update --init --recursive' -Wait -NoNewWindow
secure-file\tools\secure-file -decrypt src\pro\encrypted_certificates\appveyor\win-nylas-n1.p12.enc -secret $env:DECRYPTION_PASSWORD
secure-file\tools\secure-file -decrypt src\pro\encrypted_certificates\appveyor\set_win_env.ps1.enc -secret $env:DECRYPTION_PASSWORD
. src\pro\encrypted_certificates\appveyor\set_win_env.ps1
secure-file\tools\secure-file -decrypt src\K2\packages\local-private\encrypted_certificates\appveyor\win-nylas-n1.p12.enc -secret $env:DECRYPTION_PASSWORD
secure-file\tools\secure-file -decrypt src\K2\packages\local-private\encrypted_certificates\appveyor\set_win_env.ps1.enc -secret $env:DECRYPTION_PASSWORD
. src\K2\packages\local-private\encrypted_certificates\appveyor\set_win_env.ps1
}
build_script:
@ -51,7 +51,7 @@ environment:
- NODE_VERSION: 6.9
PUBLISH_BUILD: true
global:
CERTIFICATE_FILE: .\src\pro\encrypted_certificates\appveyor\win-nylas-n1.p12
CERTIFICATE_FILE: .\src\K2\packages\local-private\encrypted_certificates\appveyor\win-nylas-n1.p12
DECRYPTION_PASSWORD:
secure: 48VSzDtdBd52Xlo3TZ1NeR1yRRrZ3AU6Px5XjD5RDp44cFU5GYVspecGqX6DGCV7i0D7nldGMyEbXNrjM1t1Kw==

1
build/tasks/package-task.js
View file

@ -172,7 +172,6 @@ module.exports = (grunt) => {
'^[\\/]+build',
'^[\\/]+electron',
'^[\\/]+flow-typed',
'^[\\/]+src[\\/]+pro',
'^[\\/]+spec_integration',
// general dirs we never want

16
script/bootstrap
View file

@ -38,10 +38,10 @@ function installPrivateResources() {
console.log("\n-- Linking Nylas submodule resources --")
const fs = require('fs-plus');
const proDir = path.resolve(path.join('src', 'pro'))
const canaryFileExists = fs.existsSync(path.join(proDir, "README.md"))
const privateDir = path.resolve(path.join('src', 'K2', 'packages', 'local-private'))
const canaryFileExists = fs.existsSync(path.join(privateDir, "README.md"))
if (!canaryFileExists) {
console.log(`Could not find pro submodule at ${proDir}. Skipping...`)
console.log(`Could not find pro submodule at ${privateDir}. Skipping...`)
return;
}
@ -50,15 +50,17 @@ function installPrivateResources() {
}
// copy Arc Files
fs.copySync(path.join(proDir, 'arc-N1'), '.')
fs.copySync(path.join('src', 'K2', '.arcconfig'), '.')
fs.copySync(path.join('src', 'K2', '.arclint'), '.')
fs.copySync(path.join('src', 'K2', 'arclib'), '.')
// copy Source Extensions
unlinkIfExistsSync(path.join('src', 'error-logger-extensions'));
fs.copySync(path.join(proDir, 'src'), 'src');
fs.copySync(path.join(privateDir, 'src'), 'src');
// link Plugins
for (const plugin of fs.readdirSync(path.join(proDir, 'packages'))) {
const from = path.join(proDir, 'packages', plugin);
for (const plugin of fs.readdirSync(path.join(privateDir, 'packages'))) {
const from = path.join(privateDir, 'packages', plugin);
const to = path.join(path.resolve('internal_packages'), plugin);
unlinkIfExistsSync(to);
fs.symlinkSync(from, to, 'dir');

2
src/K2

@ -1 +1 @@
Subproject commit bc60882a13687c30e4ff620d18a0d4c827c048a4
Subproject commit 85de77c9645010e7a463e55b16617de50362c49c

1
src/pro

@ -1 +0,0 @@
Subproject commit 0a264823850e2986d1e055eec47d963476875569