Merge pull request #865 from DustinCampbell/fix-runtime-dependencies

Ensure OmniSharp binaries are executable on Unix

Author: DustinCampbell

package.json

@@ -74,6 +74,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "win7-x86"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -82,6 +85,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "win7-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -90,6 +96,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "osx.10.11-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -98,6 +107,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "centos.7-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -106,6 +118,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "debian.8-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -114,6 +129,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "fedora.23-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -122,6 +140,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "opensuse.13.2-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -130,6 +151,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "rhel.7-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -138,6 +162,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "ubuntu.14.04-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -146,6 +173,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "ubuntu.16.04-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {

src/main.ts

@@ -13,7 +13,7 @@ import * as OmniSharp from './omnisharp/extension';
 import * as util from './common';
 import { Logger } from './logger';
 import { PackageManager, Status } from './packages';
-import { PlatformInformation, OperatingSystem } from './platform';
+import { PlatformInformation } from './platform';
 
 export function activate(context: vscode.ExtensionContext): any {
 
@@ -88,10 +88,6 @@ function installRuntimeDependencies(extension: vscode.Extension<any>): Promise<v
             installationStage = 'installPackages';
             return packageManager.InstallPackages(logger, status);
         })
-        .then(() => {
-            installationStage = 'makeBinariesExecutable';
-            return allowExecution(path.resolve(util.getBinPath(), 'run'), platformInfo, logger);
-        })
         .then(() => {
             installationStage = 'touchLockFile';
             return util.touchLockFile();
@@ -114,7 +110,7 @@ function installRuntimeDependencies(extension: vscode.Extension<any>): Promise<v
 
 function allowExecution(filePath: string, platformInfo: PlatformInformation, logger: Logger): Promise<void> {
     return new Promise<void>((resolve, reject) => {
-        if (platformInfo.operatingSystem !== OperatingSystem.Windows) {
+        if (!platformInfo.isWindows()) {
             util.fileExists(filePath)
                 .then(exists => {
                     if (exists) {

src/omnisharp/launcher.ts

@@ -5,9 +5,9 @@
 
 'use strict';
 
-import {spawn, ChildProcess} from 'child_process';
-import {satisfies} from 'semver';
-import {PlatformInformation, OperatingSystem} from '../platform';
+import { spawn, ChildProcess } from 'child_process';
+import { satisfies } from 'semver';
+import { PlatformInformation } from '../platform';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as util from '../common';
@@ -165,7 +165,7 @@ function launch(cwd: string, args: string[], kind: LaunchTargetKind): Promise<La
 
         const launchPath = options.path || getLaunchPath(platformInfo, kind);
 
-        if (platformInfo.operatingSystem === OperatingSystem.Windows) {
+        if (platformInfo.isWindows()) {
             return launchWindows(launchPath, cwd, args);
         }
         else {
@@ -176,14 +176,20 @@ function launch(cwd: string, args: string[], kind: LaunchTargetKind): Promise<La
 
 function getLaunchPath(platformInfo: PlatformInformation, kind: LaunchTargetKind): string {
     if (kind === LaunchTargetKind.Solution) {
-        if (platformInfo.operatingSystem === OperatingSystem.Windows) {
+        if (platformInfo.isWindows()) {
             return path.join(util.getExtensionPath(), '.omnisharp-desktop', 'OmniSharp.exe');
         }
 
-        return path.join(util.getExtensionPath(), '.omnisharp-mono', "OmniSharp.exe");
+        return path.join(util.getExtensionPath(), '.omnisharp-mono', 'OmniSharp.exe');
     }
 
-    return path.join(util.getExtensionPath(), '.omnisharp-coreclr', "OmniSharp.exe");
+    let basePath = path.join(util.getExtensionPath(), '.omnisharp-coreclr');
+    if (platformInfo.isWindows()) {
+        return path.join(basePath, 'OmniSharp.exe');
+    }
+    else {
+        return path.join(basePath, 'OmniSharp');
+    }
 }
 
 function launchWindows(launchPath: string, cwd: string, args: string[]): LaunchResult {

src/omnisharp/server.ts

@@ -15,7 +15,7 @@ import {Options} from './options';
 import {Logger} from '../logger';
 import {DelayTracker} from './delayTracker';
 import {LaunchTarget, findLaunchTargets} from './launcher';
-import {PlatformInformation, OperatingSystem} from '../platform';
+import {PlatformInformation} from '../platform';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import * as vscode from 'vscode';
 

src/platform.ts

@@ -87,28 +87,13 @@ export enum OperatingSystem {
 }
 
 export class PlatformInformation {
-    public operatingSystem: OperatingSystem;
     public runtimeId: string;
 
     public constructor(
         public platform: string,
         public architecture: string,
         public distribution: LinuxDistribution = null)
     {
-        switch (platform) {
-            case 'win32':
-                this.operatingSystem = OperatingSystem.Windows;
-                break;
-
-            case 'darwin':
-                this.operatingSystem = OperatingSystem.MacOS;
-                break;
-
-            case 'linux':
-                this.operatingSystem = OperatingSystem.Linux;
-                break;
-        }
-
         try {
             this.runtimeId = PlatformInformation.getRuntimeId(platform, architecture, distribution);
         }
@@ -117,6 +102,18 @@ export class PlatformInformation {
         }
     }
 
+    public isWindows(): boolean {
+        return this.platform === 'win32';
+    }
+
+    public isMacOS(): boolean {
+        return this.platform === 'darwin';
+    }
+
+    public isLinux(): boolean {
+        return this.platform === 'linux';
+    }
+
     public toString(): string {
         let result = this.platform;
 

test/platform.tests.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { should } from 'chai';
-import { LinuxDistribution, PlatformInformation, OperatingSystem } from '../src/platform';
+import { LinuxDistribution, PlatformInformation } from '../src/platform';
 
 suite("Platform", () => {
     before(() => should());