Skip to content

Commit

Permalink
fix cannot build when outside vs/ folder
Browse files Browse the repository at this point in the history
  • Loading branch information
GongT committed Sep 26, 2018
1 parent 9516061 commit c663f88
Show file tree
Hide file tree
Showing 167 changed files with 323 additions and 323 deletions.
35 changes: 0 additions & 35 deletions src/kendryte/kendryte.workbench.main.ts

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion src/vs/code/electron-main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { CommandLineDialogService } from 'vs/platform/dialogs/node/dialogService';
import { ILabelService, LabelService } from 'vs/platform/label/common/label';
import 'kendryte/vs/code/electron-main/kendryte.electron.main';
import 'vs/kendryte/vs/code/electron-main/kendryte.electron.main';

function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService {
const services = new ServiceCollection();
Expand Down
2 changes: 1 addition & 1 deletion src/vs/code/electron-main/menus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { IHistoryMainService } from 'vs/platform/history/common/history';
import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import { URI } from 'vs/base/common/uri';
import { ILabelService } from 'vs/platform/label/common/label';
import { installMaixMenu } from 'kendryte/vs/code/electron-main/menu.maix';
import { installMaixMenu } from 'vs/kendryte/vs/code/electron-main/menu.maix';

interface IMenuItemClickHandler {
inDevTools: (contents: Electron.WebContents) => void;
Expand Down
35 changes: 35 additions & 0 deletions src/vs/kendryte/kendryte.workbench.main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//// included by "vs/workbench/workbench.main.ts"

// misc
import 'vs/kendryte/vs/platform/node/nodePathService';
import 'vs/kendryte/vs/platform/node/nodeRequestService';
import 'vs/kendryte/vs/platform/electron-browser/packagesUpdateService';
// Settings sections
import 'vs/kendryte/vs/workbench/config/browser/categoryContribution';
import 'vs/kendryte/vs/workbench/config/electron-browser/pathSettingsContribution';
import 'vs/kendryte/vs/workbench/config/common/openocdSettingsContribution';
import 'vs/kendryte/vs/workbench/config/common/flashSettingsContribution';
import 'vs/kendryte/vs/workbench/config/browser/internalSettingsCategoryContribution';
// Settings Page Patcher
import 'vs/kendryte/vs/workbench/patchSettings2/browser/settingsTreePathcer';
import 'vs/kendryte/vs/workbench/patchSettings2/browser/settingsPage2Pathcer';
// IO Config
import 'vs/kendryte/vs/workbench/fpioaConfig/node/generateorContribution';
import 'vs/kendryte/vs/workbench/fpioaConfig/electron-browser/fpioaContribution';
import 'vs/kendryte/vs/workbench/fpioaConfig/common/packagings/includeAllContribution';
// Serial Devices
import 'vs/kendryte/vs/workbench/serialPort/node/configContribution';
import 'vs/kendryte/vs/workbench/serialPort/electron-browser/serialService';
import 'vs/kendryte/vs/workbench/serialPort/node/reloadAction';
// Serial Upload
import 'vs/kendryte/vs/workbench/serialPort/upload/node/uploadContribution';
// Serial Monitor
import 'vs/kendryte/vs/workbench/serialPort/terminal/electron-browser/terminal.contribution';
import 'vs/kendryte/vs/workbench/serialPort/panel/electron-browser/serialPanelContribution';
// menus
import 'vs/kendryte/vs/platform/electron-browser/menuContribution';
import 'vs/kendryte/vs/platform/node/shortcutsContribution';
// cmake
import 'vs/kendryte/vs/workbench/cmake/electron-browser/cmakeContribution';
// PM
import 'vs/kendryte/vs/workbench/packageManager/node/actionsContribution';
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
import { exists, readFile } from 'vs/base/node/pfs';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { resolvePath } from 'kendryte/vs/platform/node/resolvePath';
import { resolvePath } from 'vs/kendryte/vs/platform/node/resolvePath';

class WrappedWindowsService extends wss.WindowsService {
async openAboutDialog(): TPromise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'vs/kendryte/vs/code/electron-main/aboutMenuDialog';
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ILogService } from 'vs/platform/log/common/log';
import { array_has_diff, object_has_diff } from 'kendryte/vs/platform/common/utils';
import { array_has_diff, object_has_diff } from 'vs/kendryte/vs/platform/common/utils';
import { Emitter } from 'vs/base/common/event';

export class ValueNotify {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
import { FpioaEditorAction } from 'kendryte/vs/workbench/fpioaConfig/electron-browser/fpioaActions';
import { MaixCMakeCleanupAction } from 'kendryte/vs/workbench/cmake/electron-browser/actions/cleanupAction';
import { MaixCMakeConfigureAction } from 'kendryte/vs/workbench/cmake/electron-browser/actions/configureAction';
import { MaixCMakeBuildAction } from 'kendryte/vs/workbench/cmake/electron-browser/actions/buildAction';
import { MaixCMakeDebugAction } from 'kendryte/vs/workbench/cmake/electron-browser/actions/debugRunAction';
import { CreateShortcutsAction } from 'kendryte/vs/platform/node/shortcutsContribution';
import { MaixSerialUploadAction } from 'kendryte/vs/workbench/serialPort/upload/node/uploadAction';
import { FpioaEditorAction } from 'vs/kendryte/vs/workbench/fpioaConfig/electron-browser/fpioaActions';
import { MaixCMakeCleanupAction } from 'vs/kendryte/vs/workbench/cmake/electron-browser/actions/cleanupAction';
import { MaixCMakeConfigureAction } from 'vs/kendryte/vs/workbench/cmake/electron-browser/actions/configureAction';
import { MaixCMakeBuildAction } from 'vs/kendryte/vs/workbench/cmake/electron-browser/actions/buildAction';
import { MaixCMakeDebugAction } from 'vs/kendryte/vs/workbench/cmake/electron-browser/actions/debugRunAction';
import { CreateShortcutsAction } from 'vs/kendryte/vs/platform/node/shortcutsContribution';
import { MaixSerialUploadAction } from 'vs/kendryte/vs/workbench/serialPort/upload/node/uploadAction';

// SYNC: vs/code/electron-main/menu.maix.ts

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import request_progress = require('request-progress');
import gunzip = require('gunzip-maybe');
import { IPackageVersion } from 'kendryte/vs/workbench/cmake/common/type';
import { IPackageVersion } from 'vs/kendryte/vs/workbench/cmake/common/type';
import { TPromise } from 'vs/base/common/winjs.base';
import { parse, resolve as resolveUrl } from 'url';
import { OperatingSystem, OS } from 'vs/base/common/platform';
import { is64Bit } from 'kendryte/vs/platform/node/versions';
import { INodePathService, IPackagesUpdateService, PACKAGE_UPDATER_LOG_CHANNEL } from 'kendryte/vs/platform/common/type';
import { is64Bit } from 'vs/kendryte/vs/platform/node/versions';
import { INodePathService, IPackagesUpdateService, PACKAGE_UPDATER_LOG_CHANNEL } from 'vs/kendryte/vs/platform/common/type';
import { copy, exists, lstat, mkdirp, readdir, readFile, rename, rimraf, unlink, writeFile } from 'vs/base/node/pfs';
import { IProgressService2, IProgressStep, ProgressLocation } from 'vs/workbench/services/progress/common/progress';
import { IProgress } from 'vs/platform/progress/common/progress';
Expand All @@ -27,13 +27,13 @@ import { inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegist
import packageJson from 'vs/platform/node/package';
import { Action } from 'vs/base/common/actions';
import { shell } from 'electron';
import { INodeRequestService } from 'kendryte/vs/platform/node/nodeRequestService';
import { dumpDate } from 'kendryte/vs/platform/common/dumpDate';
import { INodeRequestService } from 'vs/kendryte/vs/platform/node/nodeRequestService';
import { dumpDate } from 'vs/kendryte/vs/platform/common/dumpDate';
import { IUpdateService, State, StateType, UpdateType } from 'vs/platform/update/common/update';
import { Emitter, Event } from 'vs/base/common/event';
import { IProgressFn, simpleProgressTranslate } from 'kendryte/vs/platform/common/progress';
import { IChannelLogger, IChannelLogService } from 'kendryte/vs/platform/node/channelLogService';
import { resolvePath } from 'kendryte/vs/platform/node/resolvePath';
import { IProgressFn, simpleProgressTranslate } from 'vs/kendryte/vs/platform/common/progress';
import { IChannelLogger, IChannelLogService } from 'vs/kendryte/vs/platform/node/channelLogService';
import { resolvePath } from 'vs/kendryte/vs/platform/node/resolvePath';
import { basename } from 'vs/base/common/paths';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { CancellationToken } from 'vs/base/common/cancellation';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { INodePathService } from 'kendryte/vs/platform/common/type';
import { INodePathService } from 'vs/kendryte/vs/platform/common/type';
import { isWindows } from 'vs/base/common/platform';
import { normalize } from 'path';
import { PathListSep, ShellExportCommand } from 'kendryte/vs/platform/common/platformEnv';
import { PathListSep, ShellExportCommand } from 'vs/kendryte/vs/platform/common/platformEnv';
import { writeFile } from 'vs/base/node/pfs';
import { resolvePath } from 'kendryte/vs/platform/node/resolvePath';
import { resolvePath } from 'vs/kendryte/vs/platform/node/resolvePath';

export function getEnvKey(upperKey: string) {
for (const key in process.env) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { INodeFileSystemService } from 'kendryte/vs/platform/common/type';
import { INodeFileSystemService } from 'vs/kendryte/vs/platform/common/type';
import { TPromise } from 'vs/base/common/winjs.base';
import { exists, mkdirp, readFile, stat, writeFile } from 'vs/base/node/pfs';
import { ILogService } from 'vs/platform/log/common/log';
import { resolvePath } from 'kendryte/vs/platform/node/resolvePath';
import { resolvePath } from 'vs/kendryte/vs/platform/node/resolvePath';

class NodeFileSystemService implements INodeFileSystemService {
_serviceBrand: any;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
import product from 'vs/platform/node/product';
import { isWindows } from 'vs/base/common/platform';
import { lstatSync } from 'fs';
import { resolvePath } from 'kendryte/vs/platform/node/resolvePath';
import { resolvePath } from 'vs/kendryte/vs/platform/node/resolvePath';

/** @deprecated */
export function getInstallPath(environmentService: IEnvironmentService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import product from 'vs/platform/node/product';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { isWindows } from 'vs/base/common/platform';
import { lstatSync } from 'fs';
import { resolvePath } from 'kendryte/vs/platform/node/resolvePath';
import { resolvePath } from 'vs/kendryte/vs/platform/node/resolvePath';
import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
import { INodePathService } from 'kendryte/vs/platform/common/type';
import { createLinuxDesktopShortcut, ensureLinkEquals, pathResolveNow } from 'kendryte/vs/platform/node/shortcuts';
import { INodePathService } from 'vs/kendryte/vs/platform/common/type';
import { createLinuxDesktopShortcut, ensureLinkEquals, pathResolveNow } from 'vs/kendryte/vs/platform/node/shortcuts';
import { IShortcutOptions } from 'windows-shortcuts';
import { TPromise } from 'vs/base/common/winjs.base';
import { tmpdir } from 'os';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { lstat, mkdirp, readlink, rimraf, symlink, writeFile } from 'vs/base/nod
import { nfcall } from 'vs/base/common/async';
import { TPromise } from 'vs/base/common/winjs.base';
import * as fs from 'fs';
import { resolvePath } from 'kendryte/vs/platform/node/resolvePath';
import { resolvePath } from 'vs/kendryte/vs/platform/node/resolvePath';
import { dirname, posix } from 'path';
import product from 'vs/platform/node/product';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { MenuId, MenuRegistry, SyncActionDescriptor } from 'vs/platform/actions/
import { Registry } from 'vs/platform/registry/common/platform';
import { Action } from 'vs/base/common/actions';
import { localize } from 'vs/nls';
import { ACTION_ID_CREATE_SHORTCUTS, INodePathService } from 'kendryte/vs/platform/common/type';
import { ACTION_ID_CREATE_SHORTCUTS, INodePathService } from 'vs/kendryte/vs/platform/common/type';
import { TPromise } from 'vs/base/common/winjs.base';
import { INotificationService } from 'vs/platform/notification/common/notification';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { StatusBarItem } from 'kendryte/vs/workbench/cmake/common/statusBarButton';
import { StatusBarItem } from 'vs/kendryte/vs/workbench/cmake/common/statusBarButton';
import {
ACTION_ID_MAIX_CMAKE_BUILD,
ACTION_ID_MAIX_CMAKE_CLEANUP,
Expand All @@ -11,8 +11,8 @@ import {
ACTION_ID_MAIX_CMAKE_SELECT_TARGET,
ACTION_ID_MAIX_CMAKE_SELECT_VARIANT,
ACTION_ID_MAIX_SERIAL_UPLOAD,
} from 'kendryte/vs/platform/common/type';
import { StatusBarController } from 'kendryte/vs/workbench/cmake/common/statusBarController';
} from 'vs/kendryte/vs/platform/common/type';
import { StatusBarController } from 'vs/kendryte/vs/workbench/cmake/common/statusBarController';
import { localize } from 'vs/nls';

let entries: IDisposable[] = [];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CMAKE_EVENT_TYPE, ICMakeResponse } from 'kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';
import { CMAKE_EVENT_TYPE, ICMakeResponse } from 'vs/kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';

export interface ICMakeProtocolError extends ICMakeResponse {
type: CMAKE_EVENT_TYPE.ERROR;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CMAKE_EVENT_TYPE, ICMakeProtocolAny, ICMakeResponse } from 'kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';
import { CMAKE_EVENT_TYPE, ICMakeProtocolAny, ICMakeResponse } from 'vs/kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';

export interface ICMakeProtocolReply extends ICMakeResponse, ICMakeProtocolAny {
type: CMAKE_EVENT_TYPE.REPLY;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CMAKE_EVENT_TYPE, ICMakeProtocolBase, ICMakeRequest, ICMakeResponse } from 'kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';
import { ICMakeSettings } from 'kendryte/vs/workbench/cmake/common/cmakeProtocol/settings';
import { ICMakeCodeModel } from 'kendryte/vs/workbench/cmake/common/cmakeProtocol/config';
import { ICMakeTestInfo } from 'kendryte/vs/workbench/cmake/common/cmakeProtocol/ctest';
import { CMAKE_EVENT_TYPE, ICMakeProtocolBase, ICMakeRequest, ICMakeResponse } from 'vs/kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';
import { ICMakeSettings } from 'vs/kendryte/vs/workbench/cmake/common/cmakeProtocol/settings';
import { ICMakeCodeModel } from 'vs/kendryte/vs/workbench/cmake/common/cmakeProtocol/config';
import { ICMakeTestInfo } from 'vs/kendryte/vs/workbench/cmake/common/cmakeProtocol/ctest';

export interface SupportedVersion {
major: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CMAKE_EVENT_TYPE, CMAKE_SIGNAL_TYPE, ICMakeResponse } from 'kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';
import { CMAKE_EVENT_TYPE, CMAKE_SIGNAL_TYPE, ICMakeResponse } from 'vs/kendryte/vs/workbench/cmake/common/cmakeProtocol/cmakeProtocol';

export interface ICMakeProtocolSignal extends ICMakeResponse {
type: CMAKE_EVENT_TYPE.SIGNAL;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { StatusBarItem } from 'kendryte/vs/workbench/cmake/common/statusBarButton';
import { ACTION_ID_MAIX_CMAKE_HELLO_WORLD } from 'kendryte/vs/platform/common/type';
import { StatusBarItem } from 'vs/kendryte/vs/workbench/cmake/common/statusBarButton';
import { ACTION_ID_MAIX_CMAKE_HELLO_WORLD } from 'vs/kendryte/vs/platform/common/type';

enum State {
Lock,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Action } from 'vs/base/common/actions';
import { TPromise } from 'vs/base/common/winjs.base';
import { localize } from 'vs/nls';
import { ACTION_ID_MAIX_CMAKE_BUILD } from 'kendryte/vs/platform/common/type';
import { CMAKE_CHANNEL, ICMakeService } from 'kendryte/vs/workbench/cmake/common/type';
import { ACTION_ID_MAIX_CMAKE_BUILD } from 'vs/kendryte/vs/platform/common/type';
import { CMAKE_CHANNEL, ICMakeService } from 'vs/kendryte/vs/workbench/cmake/common/type';
import { IOutputChannel, IOutputService } from 'vs/workbench/parts/output/common/output';
import { INotificationService } from 'vs/platform/notification/common/notification';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Action } from 'vs/base/common/actions';
import { TPromise } from 'vs/base/common/winjs.base';
import { localize } from 'vs/nls';
import { IOutputChannel, IOutputService } from 'vs/workbench/parts/output/common/output';
import { ACTION_ID_MAIX_CMAKE_CLEANUP } from 'kendryte/vs/platform/common/type';
import { CMAKE_CHANNEL, ICMakeService } from 'kendryte/vs/workbench/cmake/common/type';
import { ACTION_ID_MAIX_CMAKE_CLEANUP } from 'vs/kendryte/vs/platform/common/type';
import { CMAKE_CHANNEL, ICMakeService } from 'vs/kendryte/vs/workbench/cmake/common/type';

export class MaixCMakeCleanupAction extends Action {
public static readonly ID = ACTION_ID_MAIX_CMAKE_CLEANUP;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Action } from 'vs/base/common/actions';
import { TPromise } from 'vs/base/common/winjs.base';
import { localize } from 'vs/nls';
import { ACTION_ID_MAIX_CMAKE_CONFIGURE } from 'kendryte/vs/platform/common/type';
import { CMAKE_CHANNEL, ICMakeService } from 'kendryte/vs/workbench/cmake/common/type';
import { ACTION_ID_MAIX_CMAKE_CONFIGURE } from 'vs/kendryte/vs/platform/common/type';
import { CMAKE_CHANNEL, ICMakeService } from 'vs/kendryte/vs/workbench/cmake/common/type';
import { IOutputChannel, IOutputService } from 'vs/workbench/parts/output/common/output';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';

Expand Down
Loading

0 comments on commit c663f88

Please sign in to comment.