From 4ccbcb323b5fb4b62076d9cd628af6a678cb5b38 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Tue, 1 Jan 2019 21:59:41 -0500
Subject: [PATCH 01/16] First azure pipeline test. Downloading klayout bits

---
 azure-pipelines.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 000000000..671d7543f
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,47 @@
+# https://aka.ms/yaml
+jobs:
+- job: 'Test'
+  pool:
+    vmImage: 'vs2017-win2016' # other options: 'macOS-10.13', 'ubuntu-16.04'
+  strategy:
+    matrix:
+      Python27:
+        python.version: '2.7'
+      Python35:
+        python.version: '3.5'
+      Python36:
+        python.version: '3.6'
+    maxParallel: 3
+
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '$(python.version)'
+      architecture: 'x64'
+
+  # Add additional tasks to run using each Python version in the matrix above
+
+  # PowerShell
+  # Run a PowerShell script on Windows, macOS, or Linux.
+  - task: PowerShell@2
+    inputs:
+      targetType: 'inline' # Optional. Options: filePath, inline
+      #filePath: # Required when targetType == FilePath
+      #arguments: # Optional
+      script: | # Required when targetType == Inline
+        pwd
+        dir
+        Invoke-WebRequest -Uri "https://www.dropbox.com/s/ioax2mnic4987kn/klayout-microbits-1.0.zip?dl=1" -MaximumRedirection 2 -OutFile klayout-microbits-1.0.zip
+        Expand-Archive klayout-microbits-1.0.zip -DestinationPath klayout-microbits
+        dir klayout-microbits
+      #errorActionPreference: 'stop' # Optional. Options: stop, continue, silentlyContinue
+      #failOnStderr: false # Optional
+      #ignoreLASTEXITCODE: false # Optional
+      #pwsh: false # Optional
+      #workingDirectory: # Optional
+    displayName: 'Downloading and Extracting KLayout bits'
+
+  - script: |
+      python -V
+      pwd
+    displayName: 'Diagnostic information'

From 2cf52b54c1550577f24f704a96cad6278a9bbef5 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Tue, 1 Jan 2019 22:11:02 -0500
Subject: [PATCH 02/16] Building klayout python package

---
 azure-pipelines.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 671d7543f..255eb5fa1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,7 +41,13 @@ jobs:
       #workingDirectory: # Optional
     displayName: 'Downloading and Extracting KLayout bits'
 
+  - script: |
+      pip install --user --upgrade pip setuptools wheel
+    displayName: 'Updating pip, setuptools and wheel'
+
   - script: |
       python -V
-      pwd
-    displayName: 'Diagnostic information'
+      set "KLAYOUT_BITS=%cd%\klayout-microbits\klayout-microbits-1.0\msvc2017\x64"
+      python setup.py install
+
+    displayName: 'Building KLayout'

From 05d9b4c851bc921c9600060721b7cac34751d62f Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Tue, 1 Jan 2019 22:40:33 -0500
Subject: [PATCH 03/16] Trying to build for py 2.7 with msvc++ 9.0

---
 azure-pipelines.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 255eb5fa1..0c6f57476 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,16 +1,16 @@
 # https://aka.ms/yaml
 jobs:
-- job: 'Test'
+- job: 'Build'
   pool:
     vmImage: 'vs2017-win2016' # other options: 'macOS-10.13', 'ubuntu-16.04'
   strategy:
     matrix:
       Python27:
         python.version: '2.7'
-      Python35:
-        python.version: '3.5'
-      Python36:
-        python.version: '3.6'
+      # Python35:
+      #   python.version: '3.5'
+      # Python36:
+      #   python.version: '3.6'
     maxParallel: 3
 
   steps:
@@ -26,7 +26,6 @@ jobs:
   - task: PowerShell@2
     inputs:
       targetType: 'inline' # Optional. Options: filePath, inline
-      #filePath: # Required when targetType == FilePath
       #arguments: # Optional
       script: | # Required when targetType == Inline
         pwd
@@ -41,6 +40,15 @@ jobs:
       #workingDirectory: # Optional
     displayName: 'Downloading and Extracting KLayout bits'
 
+  - script: |
+      curl https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -o VCForPython27.msi
+      msiexec /i VCForPython27.msi /quiet
+      set "VS90COMNTOOLS=C:\Users\VssAdministrator\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC"
+      curl https://raw.githubusercontent.com/mattn/gntp-send/master/include/msinttypes/stdint.h -o "%VS90COMNTOOLS%\Include\stdint.h"
+      dir "%VS90COMNTOOLS%\Include"
+    condition: eq(variables['python.version'], '2.7')
+    displayName: 'Installing Microsoft Visual C++ Compiler for Python 2.7'
+
   - script: |
       pip install --user --upgrade pip setuptools wheel
     displayName: 'Updating pip, setuptools and wheel'

From 2b2d845079358ab91ac2304b0189b6b4cb9f59a5 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Tue, 1 Jan 2019 23:45:28 -0500
Subject: [PATCH 04/16] Python 2.7 not supported (old MSVC++ 9.0 fails building
 klayout)

---
 azure-pipelines.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0c6f57476..57d21f7f3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,12 +5,12 @@ jobs:
     vmImage: 'vs2017-win2016' # other options: 'macOS-10.13', 'ubuntu-16.04'
   strategy:
     matrix:
-      Python27:
-        python.version: '2.7'
-      # Python35:
-      #   python.version: '3.5'
-      # Python36:
-      #   python.version: '3.6'
+      # Python27:
+      #   python.version: '2.7'
+      Python35:
+        python.version: '3.5'
+      Python36:
+        python.version: '3.6'
     maxParallel: 3
 
   steps:
@@ -40,14 +40,14 @@ jobs:
       #workingDirectory: # Optional
     displayName: 'Downloading and Extracting KLayout bits'
 
-  - script: |
-      curl https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -o VCForPython27.msi
-      msiexec /i VCForPython27.msi /quiet
-      set "VS90COMNTOOLS=C:\Users\VssAdministrator\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC"
-      curl https://raw.githubusercontent.com/mattn/gntp-send/master/include/msinttypes/stdint.h -o "%VS90COMNTOOLS%\Include\stdint.h"
-      dir "%VS90COMNTOOLS%\Include"
-    condition: eq(variables['python.version'], '2.7')
-    displayName: 'Installing Microsoft Visual C++ Compiler for Python 2.7'
+  # - script: |
+  #     curl https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -o VCForPython27.msi
+  #     msiexec /i VCForPython27.msi /quiet
+  #     set "VS90COMNTOOLS=C:\Users\VssAdministrator\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC"
+  #     curl https://raw.githubusercontent.com/mattn/gntp-send/master/include/msinttypes/stdint.h -o "%VS90COMNTOOLS%\Include\stdint.h"
+  #     dir "%VS90COMNTOOLS%\Include"
+  #   condition: eq(variables['python.version'], '2.7')
+  #   displayName: 'Installing Microsoft Visual C++ Compiler for Python 2.7'
 
   - script: |
       pip install --user --upgrade pip setuptools wheel

From 7212d347f1db37e14539a6ef018cce142280d729 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Tue, 1 Jan 2019 23:47:47 -0500
Subject: [PATCH 05/16] Adding python 3.7

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 57d21f7f3..34876e760 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,6 +11,8 @@ jobs:
         python.version: '3.5'
       Python36:
         python.version: '3.6'
+      Python37:
+        python.version: '3.7'
     maxParallel: 3
 
   steps:

From 8dc77ee314a76940202c04a4a4116adb11073dd1 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Tue, 1 Jan 2019 23:50:18 -0500
Subject: [PATCH 06/16] Adding x86 architecture

---
 azure-pipelines.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 34876e760..e549d454c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,17 +9,29 @@ jobs:
       #   python.version: '2.7'
       Python35:
         python.version: '3.5'
+        python.architecture: 'x64'
       Python36:
         python.version: '3.6'
+        python.architecture: 'x64'
       Python37:
         python.version: '3.7'
-    maxParallel: 3
+        python.architecture: 'x64'
+      Python35_x86:
+        python.version: '3.5'
+        python.architecture: 'x86'
+      Python36_x86:
+        python.version: '3.6'
+        python.architecture: 'x86'
+      Python37_x86:
+        python.version: '3.7'
+        python.architecture: 'x86'
+    maxParallel: 6
 
   steps:
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '$(python.version)'
-      architecture: 'x64'
+      architecture: '$(python.architecture)'
 
   # Add additional tasks to run using each Python version in the matrix above
 
@@ -52,12 +64,13 @@ jobs:
   #   displayName: 'Installing Microsoft Visual C++ Compiler for Python 2.7'
 
   - script: |
-      pip install --user --upgrade pip setuptools wheel
+      python -m pip install --upgrade pip setuptools wheel
     displayName: 'Updating pip, setuptools and wheel'
 
   - script: |
       python -V
-      set "KLAYOUT_BITS=%cd%\klayout-microbits\klayout-microbits-1.0\msvc2017\x64"
+      set "KLAYOUT_BITS=%cd%\klayout-microbits\klayout-microbits-1.0\msvc2017\%PYTHON_ARCHITECTURE%"
+      echo KLAYOUT_BITS=%KLAYOUT_BITS%
       python setup.py install
 
     displayName: 'Building KLayout'

From b5788d8d7d4dc8ee65bf15e71e227d624b39a6b8 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Wed, 2 Jan 2019 00:09:27 -0500
Subject: [PATCH 07/16] Basic Unit testing after installation

---
 azure-pipelines.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e549d454c..50546bb48 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -72,5 +72,17 @@ jobs:
       set "KLAYOUT_BITS=%cd%\klayout-microbits\klayout-microbits-1.0\msvc2017\%PYTHON_ARCHITECTURE%"
       echo KLAYOUT_BITS=%KLAYOUT_BITS%
       python setup.py install
+    displayName: 'Build KLayout'
+
+  - script: |
+      set PATH=%KLAYOUT_BITS%\curl\bin;%KLAYOUT_BITS%\expat\bin;%KLAYOUT_BITS%\ptw\bin;%KLAYOUT_BITS%\zlib\bin;%PATH%
+      python testdata/pymod/import_db.py
+      python testdata/pymod/import_rdb.py
+      python testdata/pymod/import_tl.py
+      python testdata/pymod/pya_tests.py
+    displayName: 'Test KLayout pymod'
+
+  # - script : |
+  #     python setup.py bdist_wheel
+  #   displayName: 'Building KLayout wheel'
 
-    displayName: 'Building KLayout'

From b72660a95e8c676e2a0c6b3d4d2cfb184f42a7f1 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Wed, 2 Jan 2019 00:34:56 -0500
Subject: [PATCH 08/16] Including external DLLs (klayout bits) in wheel

---
 azure-pipelines.yml             | 20 ++++----
 ci-scripts/windows/fix_wheel.sh | 84 +++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 10 deletions(-)
 create mode 100644 ci-scripts/windows/fix_wheel.sh

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 50546bb48..581b16998 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,7 +52,7 @@ jobs:
       #ignoreLASTEXITCODE: false # Optional
       #pwsh: false # Optional
       #workingDirectory: # Optional
-    displayName: 'Downloading and Extracting KLayout bits'
+    displayName: 'Download and Extract KLayout bits'
 
   # - script: |
   #     curl https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -o VCForPython27.msi
@@ -61,28 +61,28 @@ jobs:
   #     curl https://raw.githubusercontent.com/mattn/gntp-send/master/include/msinttypes/stdint.h -o "%VS90COMNTOOLS%\Include\stdint.h"
   #     dir "%VS90COMNTOOLS%\Include"
   #   condition: eq(variables['python.version'], '2.7')
-  #   displayName: 'Installing Microsoft Visual C++ Compiler for Python 2.7'
+  #   displayName: 'Install Microsoft Visual C++ Compiler for Python 2.7'
 
   - script: |
       python -m pip install --upgrade pip setuptools wheel
-    displayName: 'Updating pip, setuptools and wheel'
+    displayName: 'Update pip, setuptools and wheel'
 
   - script: |
       python -V
       set "KLAYOUT_BITS=%cd%\klayout-microbits\klayout-microbits-1.0\msvc2017\%PYTHON_ARCHITECTURE%"
       echo KLAYOUT_BITS=%KLAYOUT_BITS%
-      python setup.py install
+      python setup.py bdist_wheel
     displayName: 'Build KLayout'
 
+  - bash: |
+      bash `pwd`/ci-scripts/windows/fix_wheel.sh `pwd`/dist/*.whl "`pwd`/klayout-microbits/klayout-microbits-1.0/msvc2017/$PYTHON_ARCHITECTURE"
+    displayName: 'Copy klayout bits dlls into wheel'
+
   - script: |
-      set PATH=%KLAYOUT_BITS%\curl\bin;%KLAYOUT_BITS%\expat\bin;%KLAYOUT_BITS%\ptw\bin;%KLAYOUT_BITS%\zlib\bin;%PATH%
+      echo PATH=%PATH%
+      pip install klayout --no-index -f dist
       python testdata/pymod/import_db.py
       python testdata/pymod/import_rdb.py
       python testdata/pymod/import_tl.py
       python testdata/pymod/pya_tests.py
     displayName: 'Test KLayout pymod'
-
-  # - script : |
-  #     python setup.py bdist_wheel
-  #   displayName: 'Building KLayout wheel'
-
diff --git a/ci-scripts/windows/fix_wheel.sh b/ci-scripts/windows/fix_wheel.sh
new file mode 100644
index 000000000..a63a72c93
--- /dev/null
+++ b/ci-scripts/windows/fix_wheel.sh
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+SCRIPT_NAME=`basename "$0"`
+TMP_WHEEL="$PWD/tmp/klayout_tempwheel"
+
+display_usage() { 
+    echo "This script includes external libraries in windows-based wheels."
+    echo "Caution: This will delete the original wheel." 
+    echo -e "\nUsage:\n./${SCRIPT_NAME} [--help|-h] klayout-...-win_amd64.whl \n" 
+    }
+
+if [[ ( $1 == "--help") || $1 == "-h" ]] 
+then 
+    display_usage
+    exit 0
+fi
+
+# Check number of arguments
+if [ $# -eq 0 ]; then
+    >&2 echo -e "ERROR: No filename supplied\n"
+    display_usage
+    exit 1
+elif [ ! $# -eq 2 ]; then
+    >&2 echo -e "ERROR: Too many files supplied. Provide one filename at at time.\n"
+    display_usage
+    exit 1
+fi
+
+# Read wheel file from argument
+WHL="$1"
+WHL=$(echo $WHL | sed 's/\\/\//g' | sed 's/://')
+KLAYOUT_BITS="$2"
+KLAYOUT_BITS=$(echo $KLAYOUT_BITS | sed 's/\\/\//g' | sed 's/://')
+
+
+# Check WHL is a valid file
+if [[ ! -f "$WHL" ]]; then
+    >&2 echo -e "ERROR: $WHL is not a file"
+    exit 1
+fi
+
+# Convert to absolute path (linux only)
+WHL=$(readlink -f $WHL)
+
+# Record old current directory
+OLD_PWD=$PWD
+
+# Need to include external DLLs (klayout bits) into wheel
+
+# # Checking if it was previously patched
+# if unzip -l $WHL | grep -q 'patch_external_libraries_included'; then
+#     echo "$(basename $WHL) is already patched. Doing nothing."
+#     exit 0
+# fi
+
+# Repair script below
+if [[ -d $TMP_WHEEL ]]; then
+    rm -rf $TMP_WHEEL
+else
+    mkdir -p $TMP_WHEEL
+fi
+echo "Unpacking $WHL inside $TMP_WHEEL"
+wheel unpack $WHL -d $TMP_WHEEL || exit 1
+TMP_WHEEL="$TMP_WHEEL/`ls $TMP_WHEEL`"
+
+cd $TMP_WHEEL/klayout
+echo "Copying libraries: libcurl.dll, expat.dll, pthreadVCE2.dll, zlib1.dll"
+echo pwd: `pwd`
+cp -v $KLAYOUT_BITS/curl/bin/* .
+cp -v $KLAYOUT_BITS/expat/bin/* .
+cp -v $KLAYOUT_BITS/ptw/bin/* .
+cp -v $KLAYOUT_BITS/zlib/bin/* .
+# if [ $? -ne 0 ]; then
+#     >&2 echo "ERROR: lib not found. Quitting."
+#     exit 1
+# fi
+cd $TMP_WHEEL
+touch $TMP_WHEEL/patch_external_libraries_included
+echo "Packing $WHL from $TMP_WHEEL"
+# rm -f $WHL
+wheel pack $TMP_WHEEL -d `dirname $WHL` || exit 1
+echo "Done. $(basename $WHL) is patched."
+# Cleanup (should always execute)
+cd $OLD_PWD

From b4904f137018ec322080f51493f62876369fecef Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Wed, 2 Jan 2019 01:25:08 -0500
Subject: [PATCH 09/16] Dropping wheels as artifacts

---
 azure-pipelines.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 581b16998..8affbf540 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -86,3 +86,16 @@ jobs:
       python testdata/pymod/import_tl.py
       python testdata/pymod/pya_tests.py
     displayName: 'Test KLayout pymod'
+
+  - task: CopyFiles@2
+    condition: always()
+    inputs:
+      sourceFolder: '$(Build.SourcesDirectory)'
+      targetFolder: '$(Build.ArtifactStagingDirectory)'
+      contents: '**/?(*.whl)'
+
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    inputs:
+      pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: drop

From 923d083ab4bd019e84fed6ab3cc80dfe1fe73154 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Wed, 2 Jan 2019 01:53:42 -0500
Subject: [PATCH 10/16] Unique artifact name for debug

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8affbf540..8bed8fade 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -98,4 +98,4 @@ jobs:
     condition: always()
     inputs:
       pathtoPublish: '$(Build.ArtifactStagingDirectory)'
-      artifactName: drop
+      artifactName: 'wheel-$(python.version).$(python.architecture)'

From 2b2b38d1604bf71ec6c63253c79afebbde0bb419 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Wed, 2 Jan 2019 02:35:36 -0500
Subject: [PATCH 11/16] Combining all wheels into one folder

---
 azure-pipelines.yml | 65 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8bed8fade..bc1cd1019 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,28 +1,28 @@
 # https://aka.ms/yaml
 jobs:
-- job: 'Build'
+- job: Build
   pool:
     vmImage: 'vs2017-win2016' # other options: 'macOS-10.13', 'ubuntu-16.04'
   strategy:
     matrix:
       # Python27:
       #   python.version: '2.7'
-      Python35:
+      cp35-cp35m-win_amd64.whl:
         python.version: '3.5'
         python.architecture: 'x64'
-      Python36:
+      cp36-cp36m-win_amd64.whl:
         python.version: '3.6'
         python.architecture: 'x64'
-      Python37:
+      cp37-cp37m-win_amd64.whl:
         python.version: '3.7'
         python.architecture: 'x64'
-      Python35_x86:
+      cp35-cp35m-win32.whl:
         python.version: '3.5'
         python.architecture: 'x86'
-      Python36_x86:
+      cp36-cp36m-win32.whl:
         python.version: '3.6'
         python.architecture: 'x86'
-      Python37_x86:
+      cp37-cp37m-win32.whl:
         python.version: '3.7'
         python.architecture: 'x86'
     maxParallel: 6
@@ -99,3 +99,54 @@ jobs:
     inputs:
       pathtoPublish: '$(Build.ArtifactStagingDirectory)'
       artifactName: 'wheel-$(python.version).$(python.architecture)'
+
+- job: 'Deploy'
+  displayName: 'Combine Windows wheels'
+  dependsOn: Build
+  pool:
+    vmImage: 'vs2017-win2016' # other options: 'macOS-10.13', 'ubuntu-16.04'
+  steps:
+    - checkout: none #skip checking out the default repository resource
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.7.x64'
+      inputs:
+        artifactName: 'wheel-3.7.x64'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.6.x64'
+      inputs:
+        artifactName: 'wheel-3.6.x64'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.5.x64'
+      inputs:
+        artifactName: 'wheel-3.5.x64'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.7.x86'
+      inputs:
+        artifactName: 'wheel-3.7.x86'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.6.x86'
+      inputs:
+        artifactName: 'wheel-3.6.x86'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.5.x86'
+      inputs:
+        artifactName: 'wheel-3.5.x86'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
+    - task: CopyFiles@2
+      condition: always()
+      inputs:
+        sourceFolder: '$(System.DefaultWorkingDirectory)'
+        targetFolder: '$(Build.ArtifactStagingDirectory)'
+        contents: '**/?(*.whl)'
+        flattenFolders: true
+    - task: PublishBuildArtifacts@1
+      condition: always()
+      inputs:
+        pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+        artifactName: 'windows_wheels'
+

From a823d8c5df4370ca8f416319ab21f21802193161 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Wed, 2 Jan 2019 11:47:41 -0500
Subject: [PATCH 12/16] Removing unnecessary patch_external_libraries_included
 file from wheel

---
 ci-scripts/windows/fix_wheel.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-scripts/windows/fix_wheel.sh b/ci-scripts/windows/fix_wheel.sh
index a63a72c93..3ac9593c9 100644
--- a/ci-scripts/windows/fix_wheel.sh
+++ b/ci-scripts/windows/fix_wheel.sh
@@ -75,9 +75,9 @@ cp -v $KLAYOUT_BITS/zlib/bin/* .
 #     exit 1
 # fi
 cd $TMP_WHEEL
-touch $TMP_WHEEL/patch_external_libraries_included
+# touch $TMP_WHEEL/patch_external_libraries_included
 echo "Packing $WHL from $TMP_WHEEL"
-# rm -f $WHL
+rm -f $WHL
 wheel pack $TMP_WHEEL -d `dirname $WHL` || exit 1
 echo "Done. $(basename $WHL) is patched."
 # Cleanup (should always execute)

From 68490f7891c06e47e46d4f12cfba105df4887123 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Fri, 4 Jan 2019 02:59:52 -0500
Subject: [PATCH 13/16] hosting microbits in bintray

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bc1cd1019..3317369dd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -44,7 +44,7 @@ jobs:
       script: | # Required when targetType == Inline
         pwd
         dir
-        Invoke-WebRequest -Uri "https://www.dropbox.com/s/ioax2mnic4987kn/klayout-microbits-1.0.zip?dl=1" -MaximumRedirection 2 -OutFile klayout-microbits-1.0.zip
+        Invoke-WebRequest -Uri "https://dl.bintray.com/lightwave-lab/klayout/klayout-microbits-1.0.beta.zip" -MaximumRedirection 2 -OutFile klayout-microbits-1.0.beta.zip
         Expand-Archive klayout-microbits-1.0.zip -DestinationPath klayout-microbits
         dir klayout-microbits
       #errorActionPreference: 'stop' # Optional. Options: stop, continue, silentlyContinue

From a68b8a8f37a812b3eac635e5b987f18740a47f74 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Fri, 4 Jan 2019 03:09:12 -0500
Subject: [PATCH 14/16] bintray download was not successful.

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3317369dd..0c25b9206 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,8 +43,8 @@ jobs:
       #arguments: # Optional
       script: | # Required when targetType == Inline
         pwd
+        Invoke-WebRequest -Uri "https://dl.bintray.com/lightwave-lab/klayout/klayout-microbits-1.0.beta.zip" -OutFile klayout-microbits-1.0.beta.zip
         dir
-        Invoke-WebRequest -Uri "https://dl.bintray.com/lightwave-lab/klayout/klayout-microbits-1.0.beta.zip" -MaximumRedirection 2 -OutFile klayout-microbits-1.0.beta.zip
         Expand-Archive klayout-microbits-1.0.zip -DestinationPath klayout-microbits
         dir klayout-microbits
       #errorActionPreference: 'stop' # Optional. Options: stop, continue, silentlyContinue

From 7d3ecdbe027c21a39ed93509d641e5bf35638851 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Fri, 4 Jan 2019 03:10:56 -0500
Subject: [PATCH 15/16] fix squared

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0c25b9206..efe6112d4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,7 +43,7 @@ jobs:
       #arguments: # Optional
       script: | # Required when targetType == Inline
         pwd
-        Invoke-WebRequest -Uri "https://dl.bintray.com/lightwave-lab/klayout/klayout-microbits-1.0.beta.zip" -OutFile klayout-microbits-1.0.beta.zip
+        Invoke-WebRequest -Uri "https://dl.bintray.com/lightwave-lab/klayout/klayout-microbits-1.0.beta.zip" -OutFile klayout-microbits-1.0.zip
         dir
         Expand-Archive klayout-microbits-1.0.zip -DestinationPath klayout-microbits
         dir klayout-microbits

From 7d2bfc9799b9feb17dc3c73fdb94b697f035fd51 Mon Sep 17 00:00:00 2001
From: Thomas Ferreira de Lima <tlima@princeton.edu>
Date: Fri, 4 Jan 2019 03:31:05 -0500
Subject: [PATCH 16/16] microbits-1.0 released

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index efe6112d4..28804a941 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,7 +43,7 @@ jobs:
       #arguments: # Optional
       script: | # Required when targetType == Inline
         pwd
-        Invoke-WebRequest -Uri "https://dl.bintray.com/lightwave-lab/klayout/klayout-microbits-1.0.beta.zip" -OutFile klayout-microbits-1.0.zip
+        Invoke-WebRequest -Uri "https://dl.bintray.com/lightwave-lab/klayout/klayout-microbits-1.0.zip" -OutFile klayout-microbits-1.0.zip
         dir
         Expand-Archive klayout-microbits-1.0.zip -DestinationPath klayout-microbits
         dir klayout-microbits