Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

584 dexbot installer #618

Closed
wants to merge 69 commits into from
Closed
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
0c01a91
Add windows installer
dominic22 May 15, 2019
ca042a7
Add variables, adjust texts
dominic22 May 26, 2019
ba79b13
Initial try to add installer into build process
dominic22 May 31, 2019
0aeb9bc
Remove duplicated key
dominic22 Jun 1, 2019
5314c9d
Remove duplicated key
dominic22 Jun 1, 2019
55c858d
move image to top
dominic22 Jun 1, 2019
5514099
remove platform
dominic22 Jun 1, 2019
9a5ae25
adjust path
dominic22 Jun 1, 2019
c00c8cd
change to vs 2015
dominic22 Jun 1, 2019
4d74657
remove nuget restore
dominic22 Jun 1, 2019
43f0180
Change platform and add project dependency
dominic22 Jun 1, 2019
28bb370
Add preprocessor var for build config,
dominic22 Jun 1, 2019
65fdcb5
Change artifact path
dominic22 Jun 1, 2019
8b77cf5
change copy script
dominic22 Jun 2, 2019
5a08e80
always copy script executable
dominic22 Jun 2, 2019
c40bc59
revert executable location
dominic22 Jun 2, 2019
38eaf9c
change artifact path
dominic22 Jun 2, 2019
8381e05
set version by env var
dominic22 Jun 2, 2019
2521372
change build order
dominic22 Jun 2, 2019
22d2aa5
output dir
dominic22 Jun 4, 2019
2ddcef0
further output
dominic22 Jun 4, 2019
e1154f0
fix output commands
dominic22 Jun 4, 2019
62f5fcf
copy correct file
dominic22 Jun 4, 2019
807a028
echo version
dominic22 Jun 4, 2019
340e528
read env vars by __init__.py, add version constant to project file
dominic22 Jun 4, 2019
c070824
fix command line
dominic22 Jun 4, 2019
6b9af88
update path to file
dominic22 Jun 4, 2019
85f650e
update path #2
dominic22 Jun 4, 2019
36382cd
use double %
dominic22 Jun 4, 2019
488cf7d
Change project preprocessor vars
dominic22 Jun 4, 2019
9c7bf83
add before build to set vars
dominic22 Jun 4, 2019
5ebbc11
add comment in init.py
dominic22 Jun 5, 2019
6f76a21
try to set applicationversion by env var
dominic22 Jun 5, 2019
52c5cd0
rename applicationversion to version
dominic22 Jun 5, 2019
3f002ac
use applicationversion and if to check if already set
dominic22 Jun 5, 2019
711ec70
change msi project file
dominic22 Jun 5, 2019
0c42da0
replace ' with empty char at version var
dominic22 Jun 5, 2019
947972d
Set Application pre proc. var by ApplicationVersion env var
dominic22 Jun 5, 2019
3c7d87b
Change preprocessor var for release also
dominic22 Jun 5, 2019
2187dcc
Add icon to pyinstaller, remove obsolete code
dominic22 Jun 8, 2019
fc9b11b
use double slash
dominic22 Jun 8, 2019
96d3d44
set include est to false for python executable
dominic22 Jun 8, 2019
ca481a1
remove obsolete code
dominic22 Jun 8, 2019
8bd5398
Add new dexbot logo
dominic22 Jun 13, 2019
8726e60
Add border to icon
dominic22 Jun 13, 2019
256b872
Change application icon
dominic22 Jun 13, 2019
52950f3
Add new payload executable
dominic22 Jun 13, 2019
aadd9c0
Add whitespaces
dominic22 Jun 16, 2019
57f0cc0
Review findings
dominic22 Jun 16, 2019
94308b4
remove line
dominic22 Jun 16, 2019
67e4ada
update variable script
dominic22 Jun 17, 2019
54bc1a1
change var script
dominic22 Jun 17, 2019
bcfa4a6
add if statement
dominic22 Jun 17, 2019
35d8843
trim var
dominic22 Jun 17, 2019
874f96d
fix path
dominic22 Jun 17, 2019
806c038
Fix path to init file
dominic22 Jun 17, 2019
5682bca
Remove obsolete code
dominic22 Jun 18, 2019
1e623a0
Remove dexbot exe from git
dominic22 Jun 19, 2019
bbd61d0
Add DEXBot executable to gitignore
dominic22 Jun 19, 2019
d1c513b
Replace # with - in license
dominic22 Jun 19, 2019
15b6caf
Ignore Dexbot.exe in specific installer gitignore
Jun 19, 2019
e5cf7c7
fix rename file name, remove python
dominic22 Jun 27, 2019
6cac34f
Fix filedownload script
dominic22 Jun 27, 2019
4be4233
Change file name of executable
dominic22 Jun 27, 2019
6c78330
Fix path of rename script
dominic22 Jun 27, 2019
bd8c91b
Fix path for rename
dominic22 Jun 27, 2019
3f3e27d
use ps env var
dominic22 Jun 27, 2019
d23dfec
Install uptick not per machine
dominic22 Jun 27, 2019
8786e75
Make uptick install script more robust, use python 3.6.6
dominic22 Jun 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,37 @@ environment:
# Build #
#---------------------------------#

build: off

configuration: Release

install:
- 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:
dominic22 marked this conversation as resolved.
Show resolved Hide resolved
- make package
- copy /Y C:\projects\dexbot\dist\DEXBot-gui.exe C:\projects\dexbot\installer\windows\msi\DEXBot.exe
dominic22 marked this conversation as resolved.
Show resolved Hide resolved
- '7z a DEXBot-gui-win64.zip %APPVEYOR_BUILD_FOLDER%\dist\DEXBot-gui.exe'
# read dexbot version from __init__.py
- for /f "delims== eol=# tokens=1,2" %%G in (.\dexbot\__init__.py) do set %%G=%%H
# set to version and replace ' with empty character
- set ApplicationVersion=%VERSION:'=%
dominic22 marked this conversation as resolved.
Show resolved Hide resolved

# visual studio configuration
configuration:
- Release
platform: x86
build:
verbosity: normal

# @TODO: Run tests..
test_script:
- "echo tests..."

# artifact as relativ path to the build folder C:\projects\dexbot
dominic22 marked this conversation as resolved.
Show resolved Hide resolved
artifacts:
- path: DEXBot-gui-win64.zip
name: DEXBot-gui-win64.zip
- path: installer\windows\bundle\bin\%CONFIGURATION%\DEXBot-installer.exe
name: DEXBot-installer.exe

#---------------------------------#
# Deployment #
Expand All @@ -51,13 +60,3 @@ deploy:
secure: 9qvwlVUHFBV4GwMz1Gu2HSnqU8Ex2nv5dsY4mVNCurrb+6ULIoHPgbvJPWTo3qV6
on:
appveyor_repo_tag: true # deploy on tag push only

dominic22 marked this conversation as resolved.
Show resolved Hide resolved
#---------------------------------#
# Notifications #
#---------------------------------#

notifications:
- provider: Slack
auth_token:
secure: G9OMj9l2s3+lX8cRiNXXhuQJpnnjcBc0cqP8gzkdKVWqGA8vBTOIPGxD/536VKpeBH/5dJFQWT+vmnGS+XciaCg4hh5s6hDpnvePq2+uEYE=
channel: '#ci'
9 changes: 5 additions & 4 deletions dexbot/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
APP_NAME = 'dexbot'
VERSION = '0.10.12'
AUTHOR = 'Codaone Oy'
__version__ = VERSION
# please don't add spaces between the variable and the value, othwerwise appveyor won't be able to read the dexbot version
dominic22 marked this conversation as resolved.
Show resolved Hide resolved
APP_NAME='dexbot'
dominic22 marked this conversation as resolved.
Show resolved Hide resolved
VERSION='0.10.12'
AUTHOR='Codaone Oy'
__version__=VERSION
Binary file added dexbot/resources/img/dexbot-icon.ico
Binary file not shown.
Binary file added dexbot/resources/img/dexbot-icon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
145 changes: 145 additions & 0 deletions dexbot/resources/svg/dexbot-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions gui.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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')

61 changes: 61 additions & 0 deletions installer/windows/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@

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
Binary file added installer/windows/bundle/assets/dexbot-icon.ico
Binary file not shown.
Binary file added installer/windows/bundle/assets/dexbot-icon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 73 additions & 0 deletions installer/windows/bundle/bundle.wixproj
Original file line number Diff line number Diff line change
@@ -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.7.3.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>
Loading