dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-21 05:18:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Builder improvements.

Browse source
This commit is contained in:
José Pedro 2018-03-28 01:18:46 +01:00
parent d2dec6e316
commit 44f06b8e4e
No known key found for this signature in database
GPG key ID: B8247B9301707B83
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs
View file

@ -8,10 +8,8 @@ namespace Cosmos.Build.Builder
{
public bool NoVsLaunch => GetSwitch();
public bool UserKit => GetSwitch();
public bool ResetHive => GetSwitch();
public bool StayOpen => GetSwitch();
public bool NoClean => GetSwitch();
public bool VsExpHive => GetSwitch();
public string VsPath => GetOption();
private Dictionary<string, string> _args;

17
source/Cosmos.Build.Builder/CosmosTask.cs
View file

@ -46,13 +46,7 @@ namespace Cosmos.Build.Builder {
/// <param name="releaseNumber">Release number for the current setup.</param>
/// <returns>Name of the setup file.</returns>
public static string GetSetupName(int releaseNumber) {
string setupName = $"CosmosUserKit-{releaseNumber}-vs2017";
if (App.BuilderConfiguration.VsExpHive) {
setupName += "Exp";
}
return setupName;
return $"CosmosUserKit-{releaseNumber}-vs2017";
}
private void CleanDirectory(string aName, string aPath) {
@ -415,10 +409,6 @@ namespace Cosmos.Build.Builder {
string xCfg = App.BuilderConfiguration.UserKit ? "UserKit" : "DevKit";
string vsVersionConfiguration = "vs2017";
// Use configuration which will install to the VS Exp Hive
if (App.BuilderConfiguration.VsExpHive) {
vsVersionConfiguration += "Exp";
}
Logger.LogMessage($" {xISCC} /Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
StartConsole(xISCC, $"/Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
}
@ -432,11 +422,6 @@ namespace Cosmos.Build.Builder {
return;
}
if (App.BuilderConfiguration.ResetHive) {
Logger.LogMessage("Resetting hive");
Start(xVisualStudio, @"/setup /rootsuffix Exp /ranu");
}
Logger.LogMessage("Launching Visual Studio");
Start(xVisualStudio, Quoted(mCosmosPath + @"Kernel.sln"), false, true);
}

2
source/Cosmos.Build.Builder/IBuilderConfiguration.cs
View file

@ -4,10 +4,8 @@
{
bool NoVsLaunch { get; }
bool UserKit { get; }
bool ResetHive { get; }
bool StayOpen { get; }
bool NoClean { get; }
bool VsExpHive { get; }
string VsPath { get; }
}
}