Skip to content

Fix offline packaging for Windows to include both the CoreCLR and Desktop versions of OmniSharp #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2016
Merged

Fix offline packaging for Windows to include both the CoreCLR and Desktop versions of OmniSharp #600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ gulp.task('clean', ['omnisharp:clean', 'debugger:clean', 'package:clean'], () =
});

/// Omnisharp Tasks
function installOmnisharp(flavor, platform) {
function installOmnisharp(omnisharps) {
const logger = (message) => { console.log(message); };
return download.go(flavor, platform, logger);
const promises = omnisharps.map((omni) => download.go(omni.flavor, omni.platform, logger));

return Promise.all(promises);
}

function cleanOmnisharp() {
Expand All @@ -51,7 +53,7 @@ gulp.task('omnisharp:install', ['omnisharp:clean'], () => {
const flavor = gulpUtil.env.flavor || Flavor.CoreCLR;
const platform = gulpUtil.env.platform || platform.getCurrentPlatform();

return installOmnisharp(flavor, platform);
return installOmnisharp([{flavor, platform}]);
});

/// Debugger Tasks
Expand Down Expand Up @@ -102,11 +104,11 @@ function doPackageSync(packageName) {
}
}

function doOfflinePackage(runtimeId, flavor, platform, packageName) {
function doOfflinePackage(runtimeId, omnisharps, packageName) {
return clean().then(() => {
return installDebugger(runtimeId);
}).then(() => {
return installOmnisharp(flavor, platform);
return installOmnisharp(omnisharps);
}).then(() => {
doPackageSync(packageName + '-' + runtimeId + '.vsix');
});
Expand All @@ -127,21 +129,21 @@ gulp.task('package:offline', ['clean'], () => {
var packageName = name + '.' + version;

var packages = [];
packages.push({rid: 'win7-x64', flavor: Flavor.Desktop, platform: Platform.Windows});
packages.push({rid: 'osx.10.11-x64', flavor: Flavor.CoreCLR, platform: Platform.OSX});
packages.push({rid: 'centos.7-x64', flavor: Flavor.CoreCLR, platform: Platform.CentOS});
packages.push({rid: 'debian.8-x64', flavor: Flavor.CoreCLR, platform: Platform.Debian});
packages.push({rid: 'fedora.23-x64', flavor: Flavor.CoreCLR, platform: Platform.Fedora});
packages.push({rid: 'opensuse.13.2-x64', flavor: Flavor.CoreCLR, platform: Platform.OpenSUSE});
packages.push({rid: 'rhel.7.2-x64', flavor: Flavor.CoreCLR, platform: Platform.RHEL});
packages.push({rid: 'ubuntu.14.04-x64', flavor: Flavor.CoreCLR, platform: Platform.Ubuntu14});
packages.push({rid: 'ubuntu.16.04-x64', flavor: Flavor.CoreCLR, platform: Platform.Ubuntu16});
packages.push({rid: 'win7-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.Windows}, {flavor: Flavor.Desktop, platform: Platform.Windows}]});
packages.push({rid: 'osx.10.11-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.OSX}]});
packages.push({rid: 'centos.7-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.CentOS}]});
packages.push({rid: 'debian.8-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.Debian}]});
packages.push({rid: 'fedora.23-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.Fedora}]});
packages.push({rid: 'opensuse.13.2-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.OpenSUSE}]});
packages.push({rid: 'rhel.7.2-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.RHEL}]});
packages.push({rid: 'ubuntu.14.04-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.Ubuntu14}]});
packages.push({rid: 'ubuntu.16.04-x64', omnisharps: [{flavor: Flavor.CoreCLR, platform: Platform.Ubuntu16}]});

var promise = Promise.resolve();

packages.forEach(data => {
promise = promise.then(() => {
return doOfflinePackage(data.rid, data.flavor, data.platform, packageName);
return doOfflinePackage(data.rid, data.omnisharps, packageName);
})
});

Expand Down