584 dexbot installer

appveyor.yml

@@ -11,28 +11,42 @@ environment:
 #        Build                    #
 #---------------------------------#
 
-build: off
-
-configuration: Release
-
 install:
+  - ps: Start-FileDownload 'https://www.python.org/ftp/python/3.6.6/python-3.6.6-amd64.exe'
+  - copy python-3.6.6-amd64.exe installer\windows\bundle\prerequisites\python-3.6.6.exe
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%;C:\MinGW\bin
   - copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe
   - copy c:\Python36-x64\python.exe c:\Python36-x64\python3.exe
   - python --version
   - make install
-
-after_test:
   - make package
-  - '7z a DEXBot-gui-win64.zip %APPVEYOR_BUILD_FOLDER%\dist\DEXBot-gui.exe'
+  - copy /Y dist\DEXBot-gui.exe installer\windows\msi\DEXBot.exe
+  # Read dexbot version from __init__.py
+  - ps:  Get-Content dexbot\__init__.py | Foreach-Object { $var = $_.Split('='); if($var[0].Trim() -eq 'VERSION') { $env:VERSION = $var[1].Trim(); }}
+  # Set to version and replace ' with empty character
+  - set ApplicationVersion=%VERSION:'=%
+  - '7z a DEXBot-gui-win64-%ApplicationVersion%.zip %APPVEYOR_BUILD_FOLDER%\dist\DEXBot-gui.exe'
+
+# Visual studio configuration
+configuration:
+- Release
+platform: x86
+build:
+  verbosity: normal
+
+after_build:
+  - ps: Rename-Item -Path ".\installer\windows\bundle\bin\$env:CONFIGURATION\DEXBot-installer.exe" -NewName "DEXBot-installer-$env:ApplicationVersion.exe"
 
 # @TODO: Run tests..
 test_script:
   - "echo tests..."
 
+# Artifacts as relative path to the build folder C:\projects\dexbot
 artifacts:
-  - path: DEXBot-gui-win64.zip
-    name: DEXBot-gui-win64.zip
+  - path: DEXBot-gui-win64-%ApplicationVersion%.zip
+    name: DEXBot-gui-win64-%ApplicationVersion%.zip
+  - path: installer\windows\bundle\bin\%CONFIGURATION%\DEXBot-installer-%ApplicationVersion%.exe
+    name: DEXBot-installer-%ApplicationVersion%.exe
 
 #---------------------------------#
 #        Deployment               #
@@ -50,7 +64,7 @@ deploy:
     auth_token:
       secure: 9qvwlVUHFBV4GwMz1Gu2HSnqU8Ex2nv5dsY4mVNCurrb+6ULIoHPgbvJPWTo3qV6
     on:
-      appveyor_repo_tag: true     # deploy on tag push only
+      appveyor_repo_tag: true     # Deploy on tag push only
 
 #---------------------------------#
 #         Notifications           #

gui.spec

@@ -49,13 +49,13 @@ exe = EXE(pyz,
           name=os.path.join('dist', 'DEXBot-gui' + ('.exe' if sys.platform == 'win32' else '')),
           debug=True,
           strip=False,
-          icon=None,
+          icon='.\\installer\\windows\\msi\\assets\\dexbot-icon.ico',
           upx=True,
           runtime_tmpdir=None,
           console=True)
 
 if sys.platform == 'darwin':
    app = BUNDLE(exe,
                 name='DEXBot-gui.app',
-                icon=None)
+                icon='./installer/windows/msi/assets/dexbot-icon.ico')
 

installer/windows/.gitignore

@@ -0,0 +1,64 @@
+
+DexbotInstallerBootstrapper/bin/Debug
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+DEXBot.exe
+python-3.*.*.exe

installer/windows/bundle/bundle.wixproj

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>0a6fa202-7443-4f18-a462-f77c543bf921</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <!-- VERSION property to set it von __init__.py -->
+    <!--<VERSION Condition=" '$(VERSION)' == '' ">0.0.0.0</VERSION>-->
+    <OutputName>DEXBot-installer</OutputName>
+    <OutputType>Bundle</OutputType>
+    <Name>bundle</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>ApplicationVersion=$(ApplicationVersion);Build=$(Configuration)</DefineConstants>
+    <CompilerAdditionalOptions>
+    </CompilerAdditionalOptions>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>ApplicationVersion=$(ApplicationVersion);Build=$(Configuration)</DefineConstants>
+    <CompilerAdditionalOptions>
+    </CompilerAdditionalOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixBalExtension">
+      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
+      <Name>WixBalExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="assets\" />
+    <Folder Include="resources" />
+    <Folder Include="prerequisites" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="assets\dexbot-icon.ico" />
+    <Content Include="assets\dexbot-icon.jpg" />
+    <Content Include="prerequisites\python-3.6.6.exe" />
+    <Content Include="prerequisites\uptick.bat" />
+    <Content Include="resources\classic_theme.xml" />
+    <Content Include="Resources\license.rtf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="resources\variables.wxi" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="resources\classic_theme.wxl" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <PropertyGroup>
+    <PreBuildEvent />
+  </PropertyGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>