rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

corrected installer paths

This commit is contained in:
Nick Bolton 2011-04-28 10:50:42 +00:00
parent 2155247425
commit a4d9eca006
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
res/Installer.nsi.in
View File

@ -17,6 +17,7 @@
!define vcRedistFile "vcredist_${arch}.exe" !define vcRedistFile "vcredist_${arch}.exe"
!define startMenuApp "qsynergy.exe" !define startMenuApp "qsynergy.exe"
!define binDir "..\bin" !define binDir "..\bin"
!define libDir "..\lib"
!define uninstall "uninstall.exe" !define uninstall "uninstall.exe"
!define icon "..\src\gui\res\win\QSynergy.ico" !define icon "..\src\gui\res\win\QSynergy.ico"
!define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" !define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
@ -36,7 +37,7 @@
!insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "English"
Name ${product} Name ${product}
OutFile "${packageName}-${version}-${platform}-${arch}.exe" OutFile "..\bin\${packageName}-${version}-${platform}-${arch}.exe"
InstallDir "${installDirVar}\${product}" InstallDir "${installDirVar}\${product}"
InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${product}" "" InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${product}" ""
@ -112,9 +113,9 @@ SectionEnd
Section "Server and Client" core Section "Server and Client" core
; client and server files ; client and server files
File "${binDir}\src\cmd\synergys\Release\synergys.exe" File "${binDir}\Release\synergys.exe"
File "${binDir}\src\cmd\synergyc\Release\synergyc.exe" File "${binDir}\Release\synergyc.exe"
File "${binDir}\src\lib\platform\Release\synrgyhk.dll" File "${libDir}\Release\synrgyhk.dll"
SectionEnd SectionEnd

2
tools/build/toolchain.py
View File

@ -561,7 +561,7 @@ class InternalCommands:
template = template.replace('${in:qtDir}', qtDir) template = template.replace('${in:qtDir}', qtDir)
template = template.replace('${in:installDirVar}', installDirVar) template = template.replace('${in:installDirVar}', installDirVar)
nsiPath = 'bin\Installer.nsi' nsiPath = self._bin_dir + '\Installer.nsi'
nsiFile = open(nsiPath, 'w') nsiFile = open(nsiPath, 'w')
nsiFile.write(template) nsiFile.write(template)
nsiFile.close() nsiFile.close()