From 4444da082e3707baf1f3d9d5949347b01c83f8d6 Mon Sep 17 00:00:00 2001
From: bchavez <bchavez@bitarmory.com>
Date: Sun, 14 Oct 2018 10:25:10 -0700
Subject: [PATCH] Windows installer artifact.

---
 appveyor.yml                  | 16 ++++++++++++++++
 packaging/windows/freelan.iss |  2 --
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a63b1f0c..a785c569 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,8 +8,10 @@ environment:
   matrix:
     - platform: x64
       ARCH_BITS: 64
+      INSTALLER_BITS: amd64
     - platform: x86
       ARCH_BITS: 32
+      INSTALLER_BITS: x86
 
 configuration:
   - Release
@@ -17,10 +19,16 @@ configuration:
 
 init:
   - '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%'
+  
 
 install:
   - cinst cmake
   - xcopy /I third-party\vcpkg\ports\miniupnpc c:\tools\vcpkg\ports\miniupnpc
+  # Install python wheels, necessary to install SCons via pip
+  - python -m pip install wheel
+  # Install SCons
+  - python -m pip install scons==2.5.1
+  - scons --version
 
 before_build:
   - vcpkg install libiconv --triplet %PLATFORM%-windows-static
@@ -34,6 +42,11 @@ build_script:
 
 after_build:
   - 7z a BuildArtifacts.zip install\*
+  - ps: >-
+      If ($env:Configuration -Match "Release") {
+        scons -C packaging\windows --arch=%INSTALLER_BITS%
+      }
+        
 
 branches:
     only:
@@ -43,3 +56,6 @@ branches:
 artifacts:
     - path: BuildArtifacts.zip
       name: Zip
+    - path: packaging\windows\*.exe
+      name: Setup
+      
\ No newline at end of file
diff --git a/packaging/windows/freelan.iss b/packaging/windows/freelan.iss
index b69273eb..1f39f528 100644
--- a/packaging/windows/freelan.iss
+++ b/packaging/windows/freelan.iss
@@ -37,8 +37,6 @@ Name: german; MessagesFile: compiler:Languages\German.isl
 [Files]
 Source: ..\..\install\{#XARCH}\Release\bin\freelan.exe; DestDir: {app}\bin; Flags: ignoreversion; Components: binaries
 Source: ..\..\install\{#XARCH}\Release\config\freelan.cfg; DestDir: {app}\config; Flags: ignoreversion onlyifdoesntexist; Components: configuration
-Source: ..\..\install\{#XARCH}\Release\bin\ssleay32.dll; DestDir: {app}\bin; Flags: ignoreversion; Components: binaries
-Source: ..\..\install\{#XARCH}\Release\bin\libeay32.dll; DestDir: {app}\bin; Flags: ignoreversion; Components: binaries
 Source: files\{#ARCH}\{#TAPINF}.inf; DestDir: {app}\driver; Flags: ignoreversion; Components: tap_adapter
 Source: files\{#ARCH}\{#TAP}.cat; DestDir: {app}\driver; Flags: ignoreversion; Components: tap_adapter
 Source: files\{#ARCH}\{#TAP}.sys; DestDir: {app}\driver; Flags: ignoreversion; Components: tap_adapter