From 937a849c9363b1fb745b0948310533b535348819 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Tue, 26 Dec 2017 21:53:16 +0100
Subject: rtool: include dev version in binaries

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

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 160cdf73..7ef9d8b8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -36,7 +36,7 @@ test_script:
   - ps: |
       $Env:VERSION = $(python mitmproxy/version.py)
       $Env:SKIP_MITMPROXY = "python -c `"print('skip mitmproxy')`""
-      tox -e wheel
+      tox -e rtool -- wheel
       tox -e rtool -- bdist
 
   - ps: |
-- 
cgit v1.2.3


From d15bdf8d033b5ff2b5a465e74482e70a2a477069 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 29 Dec 2017 21:55:05 +0100
Subject: fix appveyor build script

we now have a module named "types",
which of course confuses Python 3.5. O:-)
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 7ef9d8b8..a05f33d6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -34,7 +34,7 @@ install:
 test_script:
   - ps: "tox -- --verbose --cov-report=term"
   - ps: |
-      $Env:VERSION = $(python mitmproxy/version.py)
+      $Env:VERSION = $(python -m mitmproxy.version)
       $Env:SKIP_MITMPROXY = "python -c `"print('skip mitmproxy')`""
       tox -e rtool -- wheel
       tox -e rtool -- bdist
-- 
cgit v1.2.3


From 2f150220e6da495fecf3ed66d5fedeed62d0f915 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sat, 30 Dec 2017 21:27:19 +0100
Subject: update installbuilder

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

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index a05f33d6..3ef985be 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -46,7 +46,7 @@ test_script:
       ) {
         echo "Decrypt license..."
         tox -e rtool -- decrypt release\installbuilder\license.xml.enc release\installbuilder\license.xml
-        $ibVersion = "17.9.0"
+        $ibVersion = "17.12.0"
         $ibSetup = "C:\projects\mitmproxy\release\installbuilder-installer.exe"
         $ibCli = "C:\Program Files (x86)\BitRock InstallBuilder Enterprise $ibVersion\bin\builder-cli.exe"
         if (!(Test-Path $ibSetup)) {
-- 
cgit v1.2.3