Browse code

Merge pull request #33235 from Microsoft/jjh/tweakmakeps1

make.ps1 default to just building daemon

Vincent Demeester authored on 2017/05/17 23:24:23
Showing 1 changed files
... ...
@@ -17,11 +17,12 @@
17 17
              development and Windows to Windows CI.
18 18
 
19 19
              Usage Examples (run from repo root):
20
-                "hack\make.ps1 -Binary" to build the binaries
21
-                "hack\make.ps1 -Client" to build just the client 64-bit binary
20
+                "hack\make.ps1 -Client" to build docker.exe client 64-bit binary (remote repo)
22 21
                 "hack\make.ps1 -TestUnit" to run unit tests
23
-                "hack\make.ps1 -Binary -TestUnit" to build the binaries and run unit tests
22
+                "hack\make.ps1 -Daemon -TestUnit" to build the daemon and run unit tests
24 23
                 "hack\make.ps1 -All" to run everything this script knows about that can run in a container
24
+                "hack\make.ps1" to build the daemon binary (same as -Daemon)
25
+                "hack\make.ps1 -Binary" shortcut to -Client and -Daemon
25 26
 
26 27
 .PARAMETER Client
27 28
      Builds the client binaries.
... ...
@@ -30,7 +31,7 @@
30 30
      Builds the daemon binary.
31 31
 
32 32
 .PARAMETER Binary
33
-     Builds the client binaries and the daemon binary. A convenient shortcut to `make.ps1 -Client -Daemon`.
33
+     Builds the client and daemon binaries. A convenient shortcut to `make.ps1 -Client -Daemon`.
34 34
 
35 35
 .PARAMETER Race
36 36
      Use -race in go build and go test.
... ...
@@ -340,8 +341,8 @@ Try {
340 340
     # Handle the "-Binary" shortcut to build both client and daemon.
341 341
     if ($Binary) { $Client = $True; $Daemon = $True }
342 342
 
343
-    # Default to building the binaries if not asked for anything explicitly.
344
-    if (-not($Client) -and -not($Daemon) -and -not($DCO) -and -not($PkgImports) -and -not($GoFormat) -and -not($TestUnit)) { $Client=$True; $Daemon=$True }
343
+    # Default to building the daemon if not asked for anything explicitly.
344
+    if (-not($Client) -and -not($Daemon) -and -not($DCO) -and -not($PkgImports) -and -not($GoFormat) -and -not($TestUnit)) { $Daemon=$True }
345 345
 
346 346
     # Verify git is installed
347 347
     if ($(Get-Command git -ErrorAction SilentlyContinue) -eq $nil) { Throw "Git does not appear to be installed" }