Skip to content

Commit 9b86af5

Browse files
JoeRobichJoeRobich
committed
Update build scripts.
1 parent 2049b8c commit 9b86af5

File tree

4 files changed

+112
-194
lines changed

4 files changed

+112
-194
lines changed

‎build.ps1

+20-82
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ The build script target to run.
2121
The build configuration to use.
2222
.PARAMETER Verbosity
2323
Specifies the amount of information to be displayed.
24-
.PARAMETER ShowDescription
25-
Shows description about tasks.
26-
.PARAMETER DryRun
27-
Performs a dry run.
28-
.PARAMETER Experimental
29-
Uses the nightly builds of the Roslyn script engine.
30-
.PARAMETER Mono
31-
Uses the Mono Compiler rather than the Roslyn script engine.
32-
.PARAMETER SkipToolPackageRestore
33-
Skips restoring of packages.
3424
.PARAMETER UseDotNetTest
3525
Run tests against the .NET SDK build of OmniSharp
3626
.PARAMETER ScriptArgs
@@ -43,50 +33,38 @@ https://cakebuild.net
4333

4434
[CmdletBinding()]
4535
Param(
46-
[parameter(position=0)]
36+
[parameter(position = 0)]
4737
[string]$Target = "Default",
4838
[string]$Script = "build.cake",
4939
[string]$Configuration,
5040
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
5141
[string]$Verbosity,
52-
[switch]$ShowDescription,
53-
[Alias("WhatIf", "Noop")]
54-
[switch]$DryRun,
55-
[switch]$Experimental,
56-
[switch]$Mono,
57-
[switch]$SkipToolPackageRestore,
5842
[switch]$UseDotNetTest,
59-
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
43+
[Parameter(Position = 0, Mandatory = $false, ValueFromRemainingArguments = $true)]
6044
[string[]]$ScriptArgs
6145
)
6246

6347
[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
64-
function MD5HashFile([string] $filePath)
65-
{
66-
if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
67-
{
48+
function MD5HashFile([string] $filePath) {
49+
if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) {
6850
return $null
6951
}
7052

7153
[System.IO.Stream] $file = $null;
7254
[System.Security.Cryptography.MD5] $md5 = $null;
73-
try
74-
{
55+
try {
7556
$md5 = [System.Security.Cryptography.MD5]::Create()
7657
$file = [System.IO.File]::OpenRead($filePath)
7758
return [System.BitConverter]::ToString($md5.ComputeHash($file))
7859
}
79-
finally
80-
{
81-
if ($file -ne $null)
82-
{
60+
finally {
61+
if ($file -ne $null) {
8362
$file.Dispose()
8463
}
8564
}
8665
}
8766

88-
function GetProxyEnabledWebClient
89-
{
67+
function GetProxyEnabledWebClient {
9068
$wc = New-Object System.Net.WebClient
9169
$proxy = [System.Net.WebRequest]::GetSystemWebProxy()
9270
$proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
@@ -96,19 +74,15 @@ function GetProxyEnabledWebClient
9674

9775
Write-Host "Preparing to run build script..."
9876

99-
if(!$PSScriptRoot){
77+
if (!$PSScriptRoot) {
10078
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
10179
}
10280

10381
$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
104-
$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
105-
$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
10682
$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
10783
$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
10884
$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
10985
$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
110-
$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
111-
$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
11286

11387
# Make sure tools folder exists
11488
if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
@@ -121,7 +95,9 @@ if (!(Test-Path $PACKAGES_CONFIG)) {
12195
Write-Verbose -Message "Downloading packages.config..."
12296
try {
12397
$wc = GetProxyEnabledWebClient
124-
$wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
98+
$wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG)
99+
}
100+
catch {
125101
Throw "Could not download packages.config."
126102
}
127103
}
@@ -143,25 +119,26 @@ if (!(Test-Path $NUGET_EXE)) {
143119
try {
144120
$wc = GetProxyEnabledWebClient
145121
$wc.DownloadFile($NUGET_URL, $NUGET_EXE)
146-
} catch {
122+
}
123+
catch {
147124
Throw "Could not download NuGet.exe."
148125
}
149126
}
150127

151128
# Save nuget.exe path to environment to be available to child processed
152129
$ENV:NUGET_EXE = $NUGET_EXE
153130

154-
# Restore tools from NuGet?
155-
if(-Not $SkipToolPackageRestore.IsPresent) {
131+
# Restore tools from NuGet
132+
if (Test-Path $PACKAGES_CONFIG) {
156133
Push-Location
157134
Set-Location $TOOLS_DIR
158135

159136
# Check for changes in packages.config and remove installed tools if true.
160137
[string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
161-
if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
162-
($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
138+
if ((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
139+
($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
163140
Write-Verbose -Message "Missing or changed package.config hash..."
164-
Remove-Item * -Recurse -Exclude packages.config,nuget.exe
141+
Remove-Item * -Recurse -Exclude packages.config, nuget.exe
165142
}
166143

167144
Write-Verbose -Message "Restoring tools from NuGet..."
@@ -170,60 +147,21 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
170147
if ($LASTEXITCODE -ne 0) {
171148
Throw "An error occurred while restoring NuGet tools."
172149
}
173-
else
174-
{
150+
else {
175151
$md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
176152
}
177153
Write-Verbose -Message ($NuGetOutput | out-string)
178154

179155
Pop-Location
180156
}
181157

182-
# Restore addins from NuGet
183-
if (Test-Path $ADDINS_PACKAGES_CONFIG) {
184-
Push-Location
185-
Set-Location $ADDINS_DIR
186-
187-
Write-Verbose -Message "Restoring addins from NuGet..."
188-
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
189-
190-
if ($LASTEXITCODE -ne 0) {
191-
Throw "An error occurred while restoring NuGet addins."
192-
}
193-
194-
Write-Verbose -Message ($NuGetOutput | out-string)
195-
196-
Pop-Location
197-
}
198-
199-
# Restore modules from NuGet
200-
if (Test-Path $MODULES_PACKAGES_CONFIG) {
201-
Push-Location
202-
Set-Location $MODULES_DIR
203-
204-
Write-Verbose -Message "Restoring modules from NuGet..."
205-
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
206-
207-
if ($LASTEXITCODE -ne 0) {
208-
Throw "An error occurred while restoring NuGet modules."
209-
}
210-
211-
Write-Verbose -Message ($NuGetOutput | out-string)
212-
213-
Pop-Location
214-
}
215-
216158
dotnet tool restore
217159

218160
# Build Cake arguments
219161
$cakeArguments = @("$Script");
220162
if ($Target) { $cakeArguments += "--target=$Target" }
221163
if ($Configuration) { $cakeArguments += "--configuration=$Configuration" }
222164
if ($Verbosity) { $cakeArguments += "--verbosity=$Verbosity" }
223-
if ($ShowDescription) { $cakeArguments += "--showdescription" }
224-
if ($DryRun) { $cakeArguments += "--dryrun" }
225-
if ($Experimental) { $cakeArguments += "--experimental" }
226-
if ($Mono) { $cakeArguments += "--mono" }
227165
if ($UseDotNetTest) { $cakeArguments += "--use-dotnet-test" }
228166
$cakeArguments += $ScriptArgs
229167

‎build.sh

+92-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,97 @@
11
#!/bin/bash
2-
# Handle to many files on osx
3-
if [ "$TRAVIS_OS_NAME" == "osx" ] || [ `uname` == "Darwin" ]; then
4-
ulimit -n 4096
5-
fi
62

7-
if [ "$TRAVIS_OS_NAME" == "osx" ] || [ `uname` == "Darwin" ]; then
8-
export OMNISHARP_PACKAGE_OSNAME=osx-x64
3+
# Define default arguments.
4+
SCRIPT="build.cake"
5+
TARGET="Default"
6+
CONFIGURATION="Release"
7+
VERBOSITY="Verbose"
8+
SCRIPT_ARGUMENTS=()
9+
10+
# Parse arguments.
11+
for i in "$@"; do
12+
case $1 in
13+
-s|--script) SCRIPT="$2"; shift ;;
14+
-t|--target) TARGET="$2"; shift ;;
15+
-c|--configuration) CONFIGURATION="$2"; shift ;;
16+
-v|--verbosity) VERBOSITY="$2"; shift ;;
17+
--) shift; SCRIPT_ARGUMENTS+=("$@"); break ;;
18+
*) SCRIPT_ARGUMENTS+=("$1") ;;
19+
esac
20+
shift
21+
done
22+
23+
# Define md5sum or md5 depending on Linux/OSX
24+
MD5_EXE=
25+
if [[ "$(uname -s)" == "Darwin" ]]; then
26+
MD5_EXE="md5 -r"
927
else
10-
export OMNISHARP_PACKAGE_OSNAME=linux-x64
28+
MD5_EXE="md5sum"
29+
fi
30+
31+
echo "Preparing to run build script..."
32+
33+
# Define directories.
34+
ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
35+
TOOLS_DIR=$ROOT_DIR/tools
36+
NUGET_EXE=$TOOLS_DIR/nuget.exe
37+
PACKAGES_CONFIG=$TOOLS_DIR/packages.config
38+
PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum
39+
40+
# Make sure the tools folder exist.
41+
if [ ! -d "$TOOLS_DIR" ]; then
42+
echo "Creating tools directory..."
43+
mkdir "$TOOLS_DIR"
44+
fi
45+
46+
# Make sure that packages.config exist.
47+
if [ ! -f "$PACKAGES_CONFIG" ]; then
48+
echo "Downloading packages.config..."
49+
curl -Lsfo "$PACKAGES_CONFIG" https://cakebuild.net/download/bootstrapper/packages
50+
if [ $? -ne 0 ]; then
51+
echo "An error occurred while downloading packages.config."
52+
exit 1
53+
fi
1154
fi
1255

13-
bash ./scripts/cake-bootstrap.sh "$@"
56+
# Download NuGet if it does not exist.
57+
if [ ! -f "$NUGET_EXE" ]; then
58+
echo "Downloading NuGet..."
59+
curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
60+
if [ $? -ne 0 ]; then
61+
echo "An error occurred while downloading nuget.exe."
62+
exit 1
63+
fi
64+
fi
65+
66+
# Restore tools from NuGet.
67+
if [ -f "$PACKAGES_CONFIG" ]; then
68+
pushd "$TOOLS_DIR" >/dev/null
69+
70+
# Check for changes in packages.config and remove installed tools if true.
71+
if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then
72+
find . -type d ! -name . | xargs rm -rf
73+
fi
74+
75+
echo "Restoring tools from NuGet..."
76+
mono "$NUGET_EXE" install -ExcludeVersion
77+
if [ $? -ne 0 ]; then
78+
echo "An error occurred while restoring NuGet tools."
79+
exit 1
80+
else
81+
$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5"
82+
fi
83+
84+
popd >/dev/null
85+
fi
86+
87+
dotnet tool restore
88+
89+
# Build Cake arguments
90+
CAKE_ARGUMENTS=($SCRIPT);
91+
CAKE_ARGUMENTS+=("--target=$TARGET");
92+
CAKE_ARGUMENTS+=("--configuration=$CONFIGURATION")
93+
CAKE_ARGUMENTS+=("--verbosity=$VERBOSITY")
94+
CAKE_ARGUMENTS+=(${SCRIPT_ARGUMENTS[@]})
95+
96+
# Start Cake
97+
dotnet cake "${CAKE_ARGUMENTS[@]}"

0 commit comments

Comments
 (0)