diff --git a/appveyor.yml b/appveyor.yml index fff5f3bc9..7471a4292 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,8 @@ environment: #---------------------------------# install: - - ps: Start-FileDownload 'https://www.python.org/ftp/python/3.7.3/python-3.7.3.exe' - - copy python-3.7.3.exe installer\windows\bundle\prerequisites\python-3.7.3.exe + - 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 diff --git a/installer/windows/.gitignore b/installer/windows/.gitignore index d509d1301..078486f70 100644 --- a/installer/windows/.gitignore +++ b/installer/windows/.gitignore @@ -61,4 +61,4 @@ bld/ *.scc DEXBot.exe -python-3.7.3.exe +python-3.*.*.exe diff --git a/installer/windows/bundle/bundle.wixproj b/installer/windows/bundle/bundle.wixproj index b14ea97d4..f3d5cd6ec 100644 --- a/installer/windows/bundle/bundle.wixproj +++ b/installer/windows/bundle/bundle.wixproj @@ -43,7 +43,7 @@ - + diff --git a/installer/windows/bundle/bundle.wxs b/installer/windows/bundle/bundle.wxs index 4ba5c52de..218609d98 100644 --- a/installer/windows/bundle/bundle.wxs +++ b/installer/windows/bundle/bundle.wxs @@ -29,7 +29,9 @@ - - - + + diff --git a/installer/windows/bundle/prerequisites/uptick.bat b/installer/windows/bundle/prerequisites/uptick.bat index 839484557..68a2d47d1 100644 --- a/installer/windows/bundle/prerequisites/uptick.bat +++ b/installer/windows/bundle/prerequisites/uptick.bat @@ -1 +1,6 @@ -pip install uptick \ No newline at end of file +SET python36=%LocalAppData%\Programs\Python\Python36\python.exe +SET python36_32=%LocalAppData%\Programs\Python\Python36-32\python.exe +if exist %python36% %python36% -m pip install uptick +if exist %python36_32% %python36_32% -m pip install uptick +rem If both paths are not found try to use pip to install uptick +if not exist %python36_32% & %python36% pip install uptick \ No newline at end of file diff --git a/installer/windows/msi/Product.wxs b/installer/windows/msi/Product.wxs index 984528407..74dd75eff 100644 --- a/installer/windows/msi/Product.wxs +++ b/installer/windows/msi/Product.wxs @@ -4,7 +4,7 @@