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.

Sign up for GitHub

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

Jump to bottom

improvement/offline_windows_installer #5

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

improvement/offline_windows_installer #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b19710
NSIS: hobovr_installer.nsi - Converted header for Conda
Minothor Apr 9, 2023
59d51d5
GITHUB: nsis.yml - workflow to listen to pushes on Main branch and tr…
Minothor Apr 9, 2023
5843a94
NSIS: [hobovr_installer.nsi, hobo_installer_web.nsi]
Minothor Apr 15, 2023
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
68 changes: 68 additions & 0 deletions .github/workflows/nsis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: nsis

on:
workflow_run:
workflows: [ Build ]
types: [ completed ]
workflow_dispatch:

jobs:
config:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.files.outputs.matrix }}
branch: ${{ steps.branch-ref.outputs.name }}
steps:
- uses: actions/checkout@master
with:
ref: ${{ github.event.workflow_run.head_branch }}

- name: Return Branch
id: branch-ref
run: echo "::set-output name=${{ github.event.workflow_run.head_branch }}"

- name: Get Script Files
id: list-files
uses: Rishabh510/Path-lister-action@master
with:
path: installers/
type: .nsi

- name: Return Script Files
id: files
run: echo "::set-output name=matrix::$(echo "${{ steps.list-files.outputs.paths }}" | sed 's/\//\\/g' | jq --raw-input --compact-output '[splits(" ") | select(length > 0)]')"

make-installer:
runs-on: windows-latest
needs: [ config ]
strategy:
fail-fast: false
matrix:
file: ${{ fromJson(needs.config.outputs.matrix) }}
steps:
- uses: actions/checkout@master
with:
ref: ${{ github.event.workflow_run.head_branch }}

- name: Download artifact
uses: dawidd6/action-download-artifact@v2
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
workflow_conclusion: success
name: hobovr-build-windows-latest
path: ${{ github.workspace }}

- name: Create nsis installer
id: create-installer
shell: powershell
run: |
"$CONDA\bin\conda.bat execute ${{ matrix.file }}"
working-directory: ${{ github.workspace }}\installers\win

- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: "hobovr_setup.exe" # Get the Output Name
path: |
hobovr
246 changes: 32 additions & 214 deletions installers/win/hobovr_installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,196 +1,24 @@
# plugins required:
# Inetc: https://nsis.sourceforge.io/Inetc_plug-in
# Nsisunz: https://nsis.sourceforge.io/Nsisunz_plug-in
# ExecDos: https://nsis.sourceforge.io/ExecDos_plug-in
# Locate: https://nsis.sourceforge.io/Locate_plugin
# Download the zip files from each of those and copy the contents of the plugin.zip/Plugins directory to program files/NSIS/plugins
# conda execute
# env:
# - nsis 3.*
# - AccessControl
# - InetC
# - Nsisunz
# - ExecDos
# - Locate
# - Registry
# - nsDialogs
# - winmessages
# - MUI2
# - Logiclib
# - x64
# channels:
# - nsis
# run_with: makensis
!include nsDialogs.nsh
!include MUI2.nsh
!include "winmessages.nsh"
!include LogicLib.nsh
!include "Locate.nsh"
!include registry.nsh
!include x64.nsh
#---------------------------------------------------------------------------------------------------

; https://nsis.sourceforge.io/StrContains
; StrContains
; This function does a case sensitive searches for an occurrence of a substring in a string.
; It returns the substring if it is found.
; Otherwise it returns null("").
; Written by kenglish_hi
; Adapted from StrReplace written by dandaman32

Var STR_HAYSTACK
Var STR_NEEDLE
Var STR_CONTAINS_VAR_1
Var STR_CONTAINS_VAR_2
Var STR_CONTAINS_VAR_3
Var STR_CONTAINS_VAR_4
Var STR_RETURN_VAR

Function StrContains
Exch $STR_NEEDLE
Exch 1
Exch $STR_HAYSTACK
; Uncomment to debug
;MessageBox MB_OK 'STR_NEEDLE = $STR_NEEDLE STR_HAYSTACK = $STR_HAYSTACK '
StrCpy $STR_RETURN_VAR ""
StrCpy $STR_CONTAINS_VAR_1 -1
StrLen $STR_CONTAINS_VAR_2 $STR_NEEDLE
StrLen $STR_CONTAINS_VAR_4 $STR_HAYSTACK
loop:
IntOp $STR_CONTAINS_VAR_1 $STR_CONTAINS_VAR_1 + 1
StrCpy $STR_CONTAINS_VAR_3 $STR_HAYSTACK $STR_CONTAINS_VAR_2 $STR_CONTAINS_VAR_1
StrCmp $STR_CONTAINS_VAR_3 $STR_NEEDLE found
StrCmp $STR_CONTAINS_VAR_1 $STR_CONTAINS_VAR_4 done
Goto loop
found:
StrCpy $STR_RETURN_VAR $STR_NEEDLE
Goto done
done:
Pop $STR_NEEDLE ;Prevent "invalid opcode" errors and keep the
Exch $STR_RETURN_VAR
FunctionEnd

!macro _StrContainsConstructor OUT NEEDLE HAYSTACK
Push `${HAYSTACK}`
Push `${NEEDLE}`
Call StrContains
Pop `${OUT}`
!macroend

!define StrContains '!insertmacro "_StrContainsConstructor"'

#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------

; FindPython - SimLeek
; Searches for Python 3.7-3.9 and returns the EXE and Version if found.

Var pythonExe
Var pythonVer
Var minPythonMinorVer
Var pythonExeDownloaded

Function FindPython
ExecDos::exec /TOSTACK /TIMEOUT=2000 "where py"
Pop $1
Pop $1

StrCpy $pythonExe $1
${StrContains} $0 "INFO" $pythonExe
StrCmp $0 "" foundpy
#MessageBox MB_OK 'Found string $0'
${locate::Open} "C:\Python38" "/L=F /M=python.exe /S=1K" $0
StrCmp $0 0 0 foundcpy
${locate::Close} $0
${locate::Open} "C:\Python39" "/L=F /M=python.exe /S=1K" $0
StrCmp $0 0 0 foundcpy
${locate::Close} $0
${locate::Open} "C:\Python37" "/L=F /M=python.exe /S=1K" $0
StrCmp $0 0 0 foundcpy
${locate::Close} $0
${locate::Open} "$APPDATA\Local\Programs\Python" "/L=F /M=python.exe /S=1K" $0
StrCmp $0 0 0 foundcpy
MessageBox MB_OK "Python could not be found. Please locate or install it."
Goto closebad
foundcpy:
${locate::Find} $0 $1 $2 $3 $4 $5 $6
StrCpy $pythonExe $0
Goto done
Goto done
foundpy:
StrCpy $pythonExe "py -3"
#MessageBox MB_OK 'Found command line python'
done:

#check that we have the right version
ExecDos::exec /TOSTACK /TIMEOUT=2000 "$pythonExe -V"
Pop $1
#MessageBox MB_OK 'pyver: $1'
Pop $1
#MessageBox MB_OK 'pyver: $1'
StrCpy $pythonVer $1 1 9
#MessageBox MB_OK 'Found minor ver $pythonVer'
${If} $pythonVer > $minPythonMinorVer
#MessageBox MB_OK "Correct Python version found: 3.$pythonVer."
Goto closegood
${Else}
MessageBox MB_OK "Incorrect Python version found: 3.$pythonVer. Installing correct one."
Goto closebad
${EndIf}
Goto closegood

closebad:
${locate::Close} $0
${locate::Unload}
StrCpy $pythonExe "false"
StrCpy $pythonVer "false"
Return
closegood:
${locate::Close} $0
${locate::Unload}
Return
FunctionEnd

Function EnsurePython
Call FindPython
StrCmp $pythonExe "false" noPython
Goto pydone
noPython:
inetc::get "https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe" "$TEMP\python-3.8.10-amd64.exe" $pythonExeDownloaded
Pop $R0
StrCpy $pythonExeDownloaded $R0
StrCmp $pythonExeDownloaded "OK" python_downloaded python_not_downloaded
python_not_downloaded:
MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to download python: $pythonExeDownloaded."
Quit
python_downloaded:
MessageBox MB_OK|MB_ICONEXCLAMATION "Python downloaded. Please install with 'Add Python to PATH' checked."
ExecDos::exec "$TEMP\python-3.8.10-amd64.exe"
Call FindPython
StrCmp $pythonExe "" failPython
Goto pydone
failPython:
MessageBox MB_OK|MB_ICONEXCLAMATION "Python was not installed correctly. Please install Python 3.8 and re-launch the installer."
Quit
pydone:
FunctionEnd


#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------

; FindSteam - Minothor
; Searches the registry for the Steam installation directory and checks that Steam VR is installed.

; Useful? https://nsis.sourceforge.io/Docs/Chapter4.html#instattribs
Var steamRegistryKey
Var steamRegistryKeyType
Var isSteamInstalled
Var steamInstallDirectory
Var VRPathRegEXE

Function EnsureSteam

${If} ${Runningx64}
StrCpy $steamRegistryKey "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Valve\Steam"
${Else}
StrCpy $steamRegistryKey "HKEY_LOCAL_MACHINE\SOFTWARE\Valve\Steam"
${EndIf}

${registry::KeyExists} $steamRegistryKey $isSteamInstalled
IntCmp $isSteamInstalled 0 steamPresent steamNotPresent
steamNotPresent:
MessageBox MB_OK|MB_ICONEXCLAMATION "Steam installation not found. Please install Steam and re-launch the installer."
Quit
steamPresent:
${registry::Read} $steamRegistryKey "InstallPath" $steamInstallDirectory $steamRegistryKeyType
StrCpy $VRPathRegEXE "$steamInstallDirectory\steamapps\common\SteamVR\bin\win32\vrpathreg.exe"

FunctionEnd

#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -228,12 +56,11 @@ FunctionEnd
#---------------------------------------------------------------------------------------------------

Name "HoboVR"
OutFile "hobovr_setup_web.exe"
OutFile "hobovr_setup.exe"
XPStyle on


Var EXIT_CODE
Var HobovrZipDownloaded

!insertmacro MUI_PAGE_LICENSE "..\..\LICENSE"
#Page custom preExpressCustom
Expand All @@ -245,41 +72,32 @@ UninstPage instfiles
Function .onInit
StrCpy $isexpress "true"
StrCpy $INSTDIR "$PROGRAMFILES\Hobo VR"
StrCpy $minPythonMinorVer 7
FunctionEnd


Section

CreateDirectory $INSTDIR
AccessControl::GrantOnFile "$INSTDIR" "(S-1-5-32-545)" "FullAccess"

Call EnsurePython

# Download and Unzip HoboVR Master branch to install directory
inetc::get "https://github.com/okawo80085/hobo_vr/archive/refs/heads/master.zip" "$TEMP\hobovr_master.zip" $HobovrZipDownloaded
Pop $R0
StrCpy $HobovrZipDownloaded $R0
StrCmp $HobovrZipDownloaded "OK" 0 hobo_download_failed
nsisunz::Unzip "$TEMP\hobovr_master.zip" "$INSTDIR"

# Tell Steam where the VR DLLs are
Call EnsureSteam

IfFileExists $VRPathRegEXE PathGood
MessageBox MB_OK|MB_ICONEXCLAMATION "Steam VR path doesn't exist. has steam and steamvr been installed?"
IfFileExists "C:\Program Files (x86)\Steam\steamapps\common\SteamVR\bin\win32\vrpathreg.exe" PathGood
MessageBox MB_OK|MB_ICONEXCLAMATION "Steam vr path register exe doesn't exist. has steam and steamvr been installed?"
Quit
PathGood:
ExecDos::exec /DETAILED '"$VRPathRegEXE" adddriver "$INSTDIR\hobo_vr-master\hobovr"' $EXIT_CODE install_log.txt
ExecDos::exec /DETAILED '"$VRPathRegEXE" show' $EXIT_CODE install_log.txt
# Create Directory
CreateDirectory $INSTDIR
AccessControl::GrantOnFile "$INSTDIR" "(S-1-5-32-545)" "FullAccess"
# Unpack the files
SetOutPath $INSTDIR
File /a /r "..\..\hobovr\*.*"

ExecDos::exec /DETAILED '"C:\Program Files (x86)\Steam\steamapps\common\SteamVR\bin\win32\vrpathreg.exe" adddriver "$INSTDIR\hobovr"' $EXIT_CODE install_log.txt
ExecDos::exec /DETAILED '"C:\Program Files (x86)\Steam\steamapps\common\SteamVR\bin\win32\vrpathreg.exe" show' $EXIT_CODE install_log.txt

# Install hobovr virtualreality python bindings
ExecDos::exec /DETAILED '$pythonExe -m pip install -e "$INSTDIR\hobo_vr-master\bindings\python"' $EXIT_CODE install_log.txt
# ExecDos::exec /DETAILED '$pythonExe -m pip install -e "$INSTDIR\hobo_vr-master\bindings\python"' $EXIT_CODE install_log.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work? pythonExe was a var created for the FindPython stuff, which is removed in this version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nvm. Commented out code is a code smell for this reason though.

goto end

# Handle errors
hobo_download_failed:
MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to download hobo_vr: $HobovrZipDownloaded."
hobo_failed:
Copy link
Member

@SimLeek SimLeek Apr 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work though? I don't think that goto end will ever be skipped. If there are crashing errors, the program would just exit instead. This is the only instance of hobo_failed, so nothing calls it.

MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to Install hobo_vr."
Quit
end:

Expand Down
Loading