From 891b6c0f549daf914137b2bd8621cc9bb8db51b6 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Wed, 15 Apr 2020 09:01:54 -0700
Subject: [PATCH] Separate doc building into new script for QDK build.

---
 build/pack-docs.ps1 | 49 ++++++++++++++++++++++++++++++++++++++++++
 build/pack.ps1      | 52 ++++++++++++---------------------------------
 2 files changed, 62 insertions(+), 39 deletions(-)
 create mode 100644 build/pack-docs.ps1

diff --git a/build/pack-docs.ps1 b/build/pack-docs.ps1
new file mode 100644
index 0000000000..6aa2345ea7
--- /dev/null
+++ b/build/pack-docs.ps1
@@ -0,0 +1,49 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<#
+    .SYNOPSIS
+        Packs documentation for IQ# using a newly built Dockerfile and the
+        build_docs.py script. See build/docs/README.md.
+#>
+
+param(
+
+);
+
+$ErrorActionPreference = 'Stop';
+& "$PSScriptRoot/set-env.ps1";
+
+# If we can, pack docs using the documentation build container.
+# We use the trick at https://blog.ropnop.com/plundering-docker-images/#extracting-files
+# to build a new image containing all the docs we care about, then `docker cp`
+# them out.
+$tempTag = New-Guid | Select-Object -ExpandProperty Guid;
+# When building in release mode, we also want to document additional
+# packages that contribute IQ# magic commands.
+if ("$Env:BUILD_RELEASETYPE" -eq "release") {
+    $extraPackages = "--package Microsoft.Quantum.Katas --package Microsoft.Quantum.Chemistry.Jupyter";
+} else {
+    $extraPackages = "";
+}
+# Note that we want to use a Dockerfile read from stdin so that we can more
+# easily inject the right base image into the FROM line. In doing so,
+# the build context should include the build_docs.py script that we need.
+$dockerfile = @"
+FROM ${Env:DOCKER_PREFIX}iqsharp-base:${Env:BUILD_BUILDNUMBER}
+
+USER root
+RUN pip install click ruamel.yaml
+WORKDIR /workdir
+RUN chown -R `${USER} /workdir
+
+USER `${USER}
+COPY build_docs.py /workdir
+RUN python build_docs.py \
+        /workdir/drops/docs/iqsharp-magic \
+        microsoft.quantum.iqsharp.magic-ref \
+        $extraPackages
+"@;
+$dockerfile | docker build -t $tempTag -f - (Join-Path $PSScriptRoot "docs");
+$tempContainer = docker create $tempTag;
+docker cp "${tempContainer}:/workdir/drops/docs/iqsharp-magic" (Join-Path $Env:DOCS_OUTDIR "iqsharp-magic")
diff --git a/build/pack.ps1 b/build/pack.ps1
index b83e28c9ab..5cfc9df7aa 100644
--- a/build/pack.ps1
+++ b/build/pack.ps1
@@ -50,11 +50,6 @@ function Pack-Image() {
         [string] $Dockerfile
     );
 
-    if (($Env:AGENT_OS -ne $null) -and ($Env:AGENT_OS.StartsWith("Win"))) {
-        Write-Host "--> Cannot create docker image on Windows."
-        return
-    }
-
     Try {
         docker version
     } Catch {
@@ -143,47 +138,26 @@ if ($Env:ENABLE_PYTHON -eq "false") {
     Pack-Wheel '../src/Python/'
 }
 
+# Figure out if we can run Docker or not.
+
 if ($Env:ENABLE_DOCKER -eq "false") {
     Write-Host "##vso[task.logissue type=warning;]Skipping Creating Docker Image. Env:ENABLE_DOCKER was set to 'false'."
+    $runDocker = $false;
+} elseif (("$Env:AGENT_OS" -ne "") -and ($Env:AGENT_OS.StartsWith("Win"))) {
+    Write-Host "--> Cannot create docker image on Windows."
+    $runDocker = $false;
 } else {
+    $runDocker = $true;
+}
+
+if ($runDocker) {
     Write-Host "##[info]Packing Docker image..."
     Pack-Image -RepoName "iqsharp-base" -Dockerfile '../images/iqsharp-base/Dockerfile'
 }
 
-if (($Env:ENABLE_DOCKER -eq "false") -or ($Env:ENABLE_PYTHON -eq "false")) {
+if (-not $runDocker -or ($Env:ENABLE_PYTHON -eq "false")) {
     Write-Host "##vso[task.logissue type=warning;]Skipping IQ# magic command documentation, either ENABLE_DOCKER or ENABLE_PYTHON was false.";
 } else {
-    # If we can, pack docs using the documentation build container.
-    # We use the trick at https://blog.ropnop.com/plundering-docker-images/#extracting-files
-    # to build a new image containing all the docs we care about, then `docker cp`
-    # them out.
-    $tempTag = New-Guid | Select-Object -ExpandProperty Guid;
-    # When building in release mode, we also want to document additional
-    # packages that contribute IQ# magic commands.
-    if ("$Env:BUILD_RELEASETYPE" -eq "release") {
-        $extraPackages = "--package Microsoft.Quantum.Katas --package Microsoft.Quantum.Chemistry.Jupyter";
-    } else {
-        $extraPackages = "";
-    }
-    # Note that we want to use a Dockerfile read from stdin so that we can more
-    # easily inject the right base image into the FROM line. In doing so,
-    # the build context should include the build_docs.py script that we need.
-    $dockerfile = @"
-FROM ${Env:DOCKER_PREFIX}iqsharp-base:${Env:BUILD_BUILDNUMBER}
-
-USER root
-RUN pip install click ruamel.yaml
-WORKDIR /workdir
-RUN chown -R `${USER} /workdir
-
-USER `${USER}
-COPY build_docs.py /workdir
-RUN python build_docs.py \
-        /workdir/drops/docs/iqsharp-magic \
-        microsoft.quantum.iqsharp.magic-ref \
-        $extraPackages
-"@;
-    $dockerfile | docker build -t $tempTag -f - (Join-Path $PSScriptRoot "docs");
-    $tempContainer = docker create $tempTag;
-    docker cp "${tempContainer}:/workdir/drops/docs/iqsharp-magic" (Join-Path $Env:DOCS_OUTDIR "iqsharp-magic")
+    Write-Host "##[info]Packing IQ# reference docs..."
+    & (Join-Path $PSScriptRoot "pack-docs.ps1");
 }