maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move resgen artifacts from submodules into src subfolders

Browse source 
Submodule adds unnessesary complexity.
This commit removes dependency on pre-generated C# bindings.
Start-PsBuild -ResGen will call Start-ResGen.
It also has auto-detect logic to simplify first time expirience.
This commit is contained in:
Sergei Vorobev 2016-06-15 03:42:54 -07:00 committed by Sergei Vorobev
parent 209a30da00
commit d92620dcf3
9 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -30,3 +30,6 @@ powershell.version
# default location for produced nuget packages
/nuget-artifacts
# resgen output
gen

17
build.psm1
View file

@ -26,6 +26,7 @@ function Start-PSBuild {
[switch]$NoPath,
[switch]$Restore,
[string]$Output,
[switch]$ResGen,
[Parameter(ParameterSetName='CoreCLR')]
[switch]$Publish,
@ -143,6 +144,13 @@ function Start-PSBuild {
Start-NativeExecution { dotnet restore $RestoreArguments }
}
# handle ResGen
if ($ResGen -or -not (Test-Path "$($Options.Top)/gen"))
{
log "Run ResGen (generating C# bindings for resx files)"
Start-ResGen
}
# Build native components
if ($IsLinux -or $IsOSX) {
$Ext = if ($IsLinux) {
@ -867,6 +875,9 @@ function Send-GitDiffToSd {
function Start-ResGen
{
[CmdletBinding()]
param()
@("Microsoft.PowerShell.Commands.Management",
"Microsoft.PowerShell.Commands.Utility",
"Microsoft.PowerShell.ConsoleHost",
@ -890,9 +901,9 @@ function Start-ResGen
}
$genSource = Get-StronglyTypeCsFileForResx -xml $xml -ModuleName $module -ClassName $className -NamespaceName $namespace
$outPath = "$PSScriptRoot/src/windows-build/gen/$module/$fileName.cs"
log "ResGen for $outPath"
mkdir -ErrorAction SilentlyContinue (Split-Path $outPath) > $null
$outPath = "$PSScriptRoot/src/$module/gen/$fileName.cs"
Write-Verbose "ResGen for $outPath"
New-Item -Type Directory -ErrorAction SilentlyContinue (Split-Path $outPath) > $null
Set-Content -Encoding Ascii -Path $outPath -Value $genSource
}
}

6
src/Microsoft.PowerShell.Commands.Management/project.json
View file

@ -18,7 +18,6 @@
"buildOptions": {
"define": [ "CORECLR" ],
"compile": {
"include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ],
"exclude": [
"commands/management/ClearRecycleBinCommand.cs",
"commands/management/CommitTransactionCommand.cs",
@ -48,11 +47,6 @@
}
},
"net451": {
"buildOptions": {
"compile": {
"include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ]
}
},
"frameworkAssemblies": {
"System.ServiceProcess": "",
"System.Windows.Forms": "",

6
src/Microsoft.PowerShell.Commands.Utility/project.json
View file

@ -17,7 +17,6 @@
"buildOptions": {
"define": [ "CORECLR" ],
"compile": {
"include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ],
"exclude": [
"commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs",
"commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs",
@ -65,11 +64,6 @@
}
},
"net451": {
"buildOptions": {
"compile": {
"include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ]
}
},
"frameworkAssemblies": {
"System.Drawing": "",
"System.Web": "",

1
src/Microsoft.PowerShell.ConsoleHost/project.json
View file

@ -7,7 +7,6 @@
"buildOptions": {
"warningsAsErrors": true,
"allowUnsafe": true,
"compile": [ "../windows-build/gen/Microsoft.PowerShell.ConsoleHost/*.cs" ],
"copyToOutput": {
"include": [
"Modules",

3
src/Microsoft.PowerShell.CoreCLR.Eventing/project.json
View file

@ -5,8 +5,7 @@
"buildOptions": {
"warningsAsErrors": true,
"allowUnsafe": true,
"compile": [ "../windows-build/gen/Microsoft.PowerShell.CoreCLR.Eventing/*.cs" ]
"allowUnsafe": true
},
"frameworks": {

3
src/Microsoft.PowerShell.LocalAccounts/project.json
View file

@ -4,8 +4,7 @@
"authors": [ "OPS" ],
"buildOptions": {
"warningsAsErrors": true,
"compile": [ "../windows-build/gen/Microsoft.PowerShell.LocalAccounts/*.cs" ]
"warningsAsErrors": true
},
"dependencies": {

6
src/Microsoft.PowerShell.Security/project.json
View file

@ -18,7 +18,6 @@
"buildOptions": {
"define": [ "CORECLR" ],
"compile": {
"include": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ],
"exclude": [
"security/CertificateCommands.cs",
"security/CmsCommands.cs",
@ -28,11 +27,6 @@
}
},
"net451": {
"buildOptions": {
"compile": {
"include": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ]
}
}
}
}
}

7
src/System.Management.Automation/project.json
View file

@ -26,7 +26,6 @@
"buildOptions": {
"define": [ "CORECLR" ],
"compile": {
"include": [ "../windows-build/gen/System.Management.Automation/*.cs" ],
"exclude": [
"cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs",
"cimSupport/cmdletization/xml/cmdlets-over-objects.xmlSerializer.autogen.cs",
@ -163,12 +162,6 @@
}
},
"net451": {
"buildOptions": {
"compile": {
"include": [ "../windows-build/gen/System.Management.Automation/*.cs" ]
}
},
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",