Make uptick install script more robust, use python 3.6.6

Codaone · Jul 7, 2019 · 74c37cf · 74c37cf
1 parent 47bb0bf
commit 74c37cf
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git 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
@@ -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
@@ -43,7 +43,7 @@
   <ItemGroup>
     <Content Include="assets\dexbot-icon.ico" />
     <Content Include="assets\dexbot-icon.jpg" />
-    <Content Include="prerequisites\python-3.7.3.exe" />
+    <Content Include="prerequisites\python-3.6.6.exe" />
     <Content Include="prerequisites\uptick.bat" />
     <Content Include="resources\classic_theme.xml" />
     <Content Include="Resources\license.rtf">

diff --git a/installer/windows/bundle/bundle.wxs b/installer/windows/bundle/bundle.wxs
@@ -29,16 +29,18 @@
     <Variable Name="LaunchTarget" Value="[ProgramFilesFolder]\Bitshares\DEXBot\DEXBot.exe"/>
 
     <Chain>
-      <ExePackage SourceFile="prerequisites\python-3.7.3.exe"
+
+      <ExePackage Id="Python"
+                  SourceFile="prerequisites\python-3.6.6.exe"
                   Cache="yes"
                   Compressed="yes"
                   Permanent="yes"
                   Vital="yes"
                   DisplayName="Processing Python..."
                   InstallCommand="/q Include_pip=1 PrependPath=1 Include_launcher=1 Include_test=0"
                   />
-      <ExePackage Id="Uptick" InstallCommand="cmd /c" DisplayName="Processing Uptick..."  SourceFile="prerequisites\uptick.bat" Vital="no" PerMachine="no" />
-      <MsiPackage SourceFile="..\msi\bin\$(var.Build)\DEXBotInstaller.msi" DisplayName="Processing DEXBot..." />
+      <ExePackage Id="Uptick" DisplayName="Processing Uptick..." InstallCommand="cmd /K" SourceFile="prerequisites\uptick.bat" Vital="no" After="DEXBot"/>
+      <MsiPackage Id="DEXBot" After="Python" SourceFile="..\msi\bin\$(var.Build)\DEXBotInstaller.msi" DisplayName="Processing DEXBot..." />
     </Chain>
 	</Bundle>
 </Wix>
diff --git a/installer/windows/bundle/prerequisites/uptick.bat b/installer/windows/bundle/prerequisites/uptick.bat
@@ -1 +1,6 @@
-pip install uptick
+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
diff --git a/installer/windows/msi/Product.wxs b/installer/windows/msi/Product.wxs
@@ -4,7 +4,7 @@
   <Product Id="*"
            Name="$(var.ApplicationName)"
            Language="1033"
-           Version="4.0.0.0"
+           Version="$(var.ApplicationVersion)"
            Manufacturer="$(var.Manufacturer)"
            UpgradeCode="497F349B-D2F6-4488-9FE4-797E7E58B158" >
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />