提交 5875aad5 编写于 作者: B Benjamin Pasero

code main - partition windows into subfolders

上级 cc3c0ba9
......@@ -82,7 +82,7 @@ const vscodeResources = [
'out-build/vs/workbench/parts/welcome/walkThrough/**/*.md',
'out-build/vs/workbench/services/files/**/*.exe',
'out-build/vs/workbench/services/files/**/*.md',
'out-build/vs/code/electron-browser/sharedProcess.js',
'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
'!**/test/**'
];
......
......@@ -12,6 +12,7 @@ function createModuleDescription(name, exclude) {
excludes = excludes.concat(exclude);
}
result.exclude= excludes;
return result;
}
......@@ -20,6 +21,6 @@ exports.collectModules= function() {
createModuleDescription('vs/code/electron-main/main', []),
createModuleDescription('vs/code/node/cli', []),
createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
createModuleDescription('vs/code/electron-browser/sharedProcessMain', [])
createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain', [])
];
};
\ No newline at end of file
......@@ -5,7 +5,7 @@
'use strict';
import { NodeCachedDataCleaner } from 'vs/code/electron-browser/contrib/nodeCachedDataCleaner';
import { NodeCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
export function createSharedProcessContributions(service: IInstantiationService): void {
......
......@@ -89,7 +89,7 @@ function main() {
});
}
require(['vs/code/electron-browser/sharedProcessMain'], function (sharedProcess) {
require(['vs/code/electron-browser/sharedProcess/sharedProcessMain'], function (sharedProcess) {
sharedProcess.startup({
machineId: configuration.machineId
});
......
......@@ -36,7 +36,7 @@ import { IWindowsService } from 'vs/platform/windows/common/windows';
import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
import { ipcRenderer } from 'electron';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { createSharedProcessContributions } from 'vs/code/electron-browser/contrib/contributions';
import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions';
import { createLogService } from 'vs/platform/log/node/spdlogService';
import { ILogService } from 'vs/platform/log/common/log';
......
......@@ -68,7 +68,7 @@ export class ProxyAuthHandler {
const win = new BrowserWindow(opts);
const config = {};
const baseUrl = require.toUrl('./auth.html');
const baseUrl = require.toUrl('vs/code/electron-browser/proxy/auth.html');
const url = `${baseUrl}?config=${encodeURIComponent(JSON.stringify(config))}`;
const proxyUrl = `${authInfo.host}:${authInfo.port}`;
const title = localize('authRequire', "Proxy Authentication Required");
......
......@@ -43,7 +43,7 @@ export class SharedProcess implements ISharedProcess {
userEnv: this.userEnv
});
const url = `${require.toUrl('vs/code/electron-browser/sharedProcess.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
const url = `${require.toUrl('vs/code/electron-browser/sharedProcess/sharedProcess.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
this.window.loadURL(url);
// Prevent the window from dying
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册