Windows installer artifact.

freelan-developers · Oct 15, 2018 · 4444da0 · 4444da0
1 parent 99f488d
commit 4444da0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,19 +8,27 @@ environment:
   matrix:
     - platform: x64
       ARCH_BITS: 64
+      INSTALLER_BITS: amd64
     - platform: x86
       ARCH_BITS: 32
+      INSTALLER_BITS: x86
 
 configuration:
   - Release
   - Debug
 
 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
+
diff --git 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