aphrody-labs/PowerShell
1
0 Fork 0
mirror of https://github.com/aphrody-labs/PowerShell.git synced 2026-10-17 04:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Additional fixes in preparation for review and pull request

Browse Source
This commit is contained in:
Mike Richmond committed 2016-07-19 16:41:13 -07:00
1 parent 4e349ddc2c
commit d7618d731d
5 files changed
+44 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.psm1
+40 -61
View File
@@ -59,7 +59,7 @@ function Start-PSBuild {
[switch]$XamlGen,
[Parameter(ParameterSetName='FullCLR')]
[ValidateSet('x86', 'x64')]
[ValidateSet('x86', 'x64')] # TODO: At some point, we need to add ARM support to match CoreCLR
[string]$NativeHostArch = "x64",
[ValidateSet('Linux', 'Debug', 'Release', '')] # We might need "Checked" as well
@@ -106,6 +106,12 @@ function Start-PSBuild {
}
#>
$vcVarsPath = (Get-Item(Join-Path -Path "$env:VS140COMNTOOLS" -ChildPath '../../vc')).FullName
if ((Test-Path -Path $vcVarsPath\vcvarsall.bat) -eq $false)
{
throw "Could not find Visual Studio vcvarsall.bat at" + $vcVarsPath
}
# setup msbuild configuration
if ($Configuration -eq 'Debug' -or $Configuration -eq 'Release')
{
@@ -156,36 +162,36 @@ function Start-PSBuild {
$Arguments += "--runtime", $Options.Runtime
# handle Restore
# if ($Restore -or -not (Test-Path "$($Options.Top)/project.lock.json")) {
# log "Run dotnet restore"
if ($Restore -or -not (Test-Path "$($Options.Top)/project.lock.json")) {
log "Run dotnet restore"
# $RestoreArguments = @("--verbosity")
# if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
# $RestoreArguments += "Info"
# } else {
# $RestoreArguments += "Warning"
# }
#
# $RestoreArguments += "$PSScriptRoot"
#
# Start-NativeExecution { dotnet restore $RestoreArguments }
# }
$RestoreArguments = @("--verbosity")
if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
$RestoreArguments += "Info"
} else {
$RestoreArguments += "Warning"
}
$RestoreArguments += "$PSScriptRoot"
Start-NativeExecution { dotnet restore $RestoreArguments }
}
# handle ResGen
# Heuristic to run ResGen on the fresh machine
# if ($ResGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.ConsoleHost/gen"))
# {
# log "Run ResGen (generating C# bindings for resx files)"
# Start-ResGen
# }
if ($ResGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.ConsoleHost/gen"))
{
log "Run ResGen (generating C# bindings for resx files)"
Start-ResGen
}
# handle xaml files
# Heuristic to resolve xaml on the fresh machine
# if ($FullCLR -and ($XamlGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.Activities/gen/*.g.cs")))
# {
# log "Run XamlGen (generating .g.cs and .resources for .xaml files)"
# Start-XamlGen -MSBuildConfiguration $msbuildConfiguration
# }
if ($FullCLR -and ($XamlGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.Activities/gen/*.g.cs")))
{
log "Run XamlGen (generating .g.cs and .resources for .xaml files)"
Start-XamlGen -MSBuildConfiguration $msbuildConfiguration
}
# Build native components
if ($IsLinux -or $IsOSX) {
@@ -217,12 +223,6 @@ function Start-PSBuild {
try {
Push-Location "$PSScriptRoot\src\powershell-native"
$vcPath = (Get-Item(Join-Path -Path "$env:VS140COMNTOOLS" -ChildPath '../../vc')).FullName
if ((Test-Path -Path $vcPath\vcvarsall.bat) -eq $false)
{
throw "Could not find Visual Studio vcvarsall.bat at" + $vcPath
}
<#
# Compile native resources
@("nativemsh/pwrshplugin") | % {
@@ -236,44 +236,23 @@ function Start-PSBuild {
# Disabling until I figure out if it is necessary
# $overrideFlags = "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$PSScriptRoot\src\powershell-native\windows-compiler-override.txt"
$overrideFlags = ""
$vcArch = "Win64"
$cmakeGenerator = "Visual Studio 14 2015 $vcArch"
# $CMakeArguments = "-G $cmakeGenerator ."
$vcPlatform = "x64"
$location = Get-Location
# $MSBuildArguments = "ALL_BUILD.vcxproj /p:Configuration=$msbuildConfiguration"
# if ($cmakeGenerator) {
# Start-NativeExecution { cmake $overrideFlags -G $cmakeGenerator . }
# } else {
# Start-NativeExecution { cmake $overrideFlags . }
# }
# #
# # BUILD_ONECORE
# #
$command = @"
cmd.exe /C cd /d "$location" "&" "$($vcPath)\vcvarsall.bat" "$vcPlatform" "&" cmake "$overrideFlags" -DBUILD_ONECORE=ON -G "$cmakeGenerator" . "&" msbuild ALL_BUILD.vcxproj "/p:Configuration=$msbuildConfiguration"
"@
#cmd.exe /C cd /d "$location" "&" "$($vcPath)\vcvarsall.bat" "$vcPlatform" "&" "$cmakeCmd" "&" "msbuild ALL_BUILD.vcxproj /p:Configuration=$msbuildConfiguration"
# "&" exit
log " Executing command: $command"
#Start-NativeExecution { msbuild ALL_BUILD.vcxproj /p:Configuration=$msbuildConfiguration }
Start-NativeExecution { Invoke-Expression -Command:$command }
#
# NOT BUILD_ONECORE
# BUILD_ONECORE
#
$command = @"
cmd.exe /C cd /d "$location" "&" "$($vcPath)\vcvarsall.bat" "$vcPlatform" "&" cmake "$overrideFlags" -DBUILD_ONECORE=OFF -G "$cmakeGenerator" . "&" msbuild ALL_BUILD.vcxproj "/p:Configuration=$msbuildConfiguration"
$BuildOneCoreValues = @("ON","OFF")
foreach ($oneCoreValue in $BuildOneCoreValues)
{
$command = @"
cmd.exe /C cd /d "$location" "&" "$($vcVarsPath)\vcvarsall.bat" "$NativeHostArch" "&" cmake "$overrideFlags" -DBUILD_ONECORE=$oneCoreValue -G "$cmakeGenerator" . "&" msbuild ALL_BUILD.vcxproj "/p:Configuration=$msbuildConfiguration"
"@
#cmd.exe /C cd /d "$location" "&" "$($vcPath)\vcvarsall.bat" "$vcPlatform" "&" "$cmakeCmd" "&" "msbuild ALL_BUILD.vcxproj /p:Configuration=$msbuildConfiguration"
# "&" exit
log " Executing command: $command"
#Start-NativeExecution { msbuild ALL_BUILD.vcxproj /p:Configuration=$msbuildConfiguration }
Start-NativeExecution { Invoke-Expression -Command:$command }
log " Executing command: $command"
Start-NativeExecution { Invoke-Expression -Command:$command }
}
} finally {
Pop-Location
}
throw "All done"
}
# handle TypeGen