Merge pull request #1140 from PowerShell/vors/typegen

TypeGen enhancements
This commit is contained in:
Sergei Vorobev authored and GitHub committed 2016-06-17 15:05:48 -07:00
commit cfb8765a6e
5 files changed
+122 -3

No files matched your search

+41
View File
@@ -27,6 +27,7 @@ function Start-PSBuild {
[switch]$Restore,
[string]$Output,
[switch]$ResGen,
[switch]$TypeGen,
[Parameter(ParameterSetName='CoreCLR')]
[switch]$Publish,
@@ -195,6 +196,13 @@ function Start-PSBuild {
}
}
# handle TypeGen
if ($TypeGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs"))
{
log "Run TypeGen (generating CorePsTypeCatalog.cs)"
Start-TypeGen
}
try {
# Relative paths do not work well if cwd is not changed to project
Push-Location $Options.Top
@@ -868,6 +876,39 @@ function Send-GitDiffToSd {
}
}
function Start-TypeGen
{
[CmdletBinding()]
param()
if (!$IsWindows)
{
throw "Start-TypeGen is not supported on non-windows. Use src/TypeCatalogGen/build.sh instead"
}
Push-Location "$PSScriptRoot/src/TypeCatalogParser"
try
{
dotnet restore -v Warning
dotnet run
}
finally
{
Pop-Location
}
Push-Location "$PSScriptRoot/src/TypeCatalogGen"
try
{
dotnet restore -v Warning
dotnet run ../Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs powershell.inc
}
finally
{
Pop-Location
}
}
function Start-ResGen
{
[CmdletBinding()]