diff --git a/electron-wix/blockchain/.gitignore b/electron-wix/blockchain/.gitignore index 4ca2de1602..0a6c107b01 100644 --- a/electron-wix/blockchain/.gitignore +++ b/electron-wix/blockchain/.gitignore @@ -1,4 +1,4 @@ * !.gitignore -!readme.md +!readme.* !install.ps1 \ No newline at end of file diff --git a/electron-wix/blockchain/install.ps1 b/electron-wix/blockchain/install.ps1 index 21e71e58bd..35836f9b1b 100644 --- a/electron-wix/blockchain/install.ps1 +++ b/electron-wix/blockchain/install.ps1 @@ -1,9 +1,9 @@ Remove-Item "./venv" -Recurse -Force -ErrorAction Ignore Start-Process "$env:HOMEDRIVE$env:HOMEPATH\AppData\Local\Programs\Python\Python37\python.exe" -ArgumentList "-m venv venv" -Wait -if ($LastExitCode) { exit $LastExitCode } . .\venv\Scripts\activate.ps1 + pip3 install --upgrade pip -pip install -i https://download.chia.net/simple/ miniupnpc==2.1 setproctitle==1.1.10 cbor2==5.1.0 -pip install -e . \ No newline at end of file + +.\wheels.ps1 \ No newline at end of file diff --git a/electron-wix/blockchain/readme.txt b/electron-wix/blockchain/readme.txt new file mode 100644 index 0000000000..5038d301d7 --- /dev/null +++ b/electron-wix/blockchain/readme.txt @@ -0,0 +1,2 @@ +To complete the install, open powershell, and navigate to `~\AppData\Local\Programs\Chia Network\Chia Blockchain\` +Execute the `install.ps1` located in that folder. \ No newline at end of file diff --git a/electron-wix/build-blockchain-msi.ps1 b/electron-wix/build-blockchain-msi.ps1 index 888df96e06..a1eda5ce68 100644 --- a/electron-wix/build-blockchain-msi.ps1 +++ b/electron-wix/build-blockchain-msi.ps1 @@ -21,6 +21,15 @@ Copy-Item ".\blockchain\install.ps1" "$blockchainDir" -Force Copy-Item ".\blockchain\readme.txt" "$blockchainDir" -Force Copy-Item ".\blockchain\*.whl" "$blockchainDir\wheels" -Force +# generate the script that will isntall all the wheels on the target machine +$text = "" +Get-ChildItem "$blockchainDir\wheels" -Filter *.whl | +Foreach-Object { + $text += "pip install .\wheels\$_`n" +} +New-Item "$blockchainDir\wheels.ps1" -Force +Set-Content "$blockchainDir\wheels.ps1" $text + # this generates package-files.wxs from the contents of the electron packager folder Write-Host "Creating manifest of python environment files" heat dir $blockchainDir -cg ChiaBlockchainFiles -nologo -gg -scom -sreg -sfrag -srd -dr INSTALLDIR -out "$buildDir\$tempName.wxs" diff --git a/electron-wix/config.ps1 b/electron-wix/config.ps1 index c7b010c432..370fd3a969 100644 --- a/electron-wix/config.ps1 +++ b/electron-wix/config.ps1 @@ -1,7 +1,7 @@ # shared variables $env:walletProductName = "chia-wallet" $env:blockchainProductName = "chia-blockchain" -$env:version = "0.1.5" # all packages share the same version +$env:version = "0.1.6" # all packages share the same version $env:resourceDir = ".\resources" # bitmaps, icons etc $env:prereqDir = ".\prerequisites" # location for any pre-req installers diff --git a/electron-wix/src/bundle.wxs b/electron-wix/src/bundle.wxs index 0371e4f926..d95d3f8719 100644 --- a/electron-wix/src/bundle.wxs +++ b/electron-wix/src/bundle.wxs @@ -30,8 +30,12 @@ - + + +