Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved tor binaries into subfolder "tor" for Windows build

Browse Source
This commit is contained in:
thunder2 2021-03-16 21:36:26 +01:00
parent 130d846e47
commit 5b1b0cadf9
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_scripts/Windows-msys2/build/pack.bat
View File

@ -132,8 +132,14 @@ del /Q "%RsDeployPath%\imageformats\*d?.dll" %Quite%
if "%ParamTor%"=="1" (
echo copy tor
copy "%RsMinGWPath%\bin\tor.exe" "%RsDeployPath%" %Quite%
copy "%RsMinGWPath%\bin\tor-gencert.exe" "%RsDeployPath%" %Quite%
if not exist "%RsDeployPath%\tor" mkdir "%RsDeployPath%\tor"
copy "%RsMinGWPath%\bin\tor.exe" "%RsDeployPath%\tor" %Quite%
copy "%RsMinGWPath%\bin\tor-gencert.exe" "%RsDeployPath%\tor" %Quite%
echo copy tor dependencies
for /R "%RsDeployPath%\tor" %%D in (*.exe) do (
call :copy_dependencies "%%D" "%RsDeployPath%\tor"
)
)
echo copy dependencies

3
build_scripts/Windows/build/pack.bat
View File

@ -173,7 +173,8 @@ if exist "%SourcePath%\libresapi\src\webui" (
if "%ParamTor%"=="1" (
echo copy tor
echo n | copy /-y "%EnvTorPath%\Tor\*.*" "%RsDeployPath%" %Quite%
if not exist "%RsDeployPath%\tor" mkdir "%RsDeployPath%\tor"
echo n | copy /-y "%EnvTorPath%\Tor\*.*" "%RsDeployPath%\tor" %Quite%
)
rem pack files

2
build_scripts/Windows/installer/retroshare-Qt5.nsi
View File

@ -285,7 +285,7 @@ SectionEnd
# Tor
!ifdef TOR_EXISTS
Section /o $(Section_Tor) Section_Tor
SetOutPath "$INSTDIR"
SetOutPath "$INSTDIR\tor"
File /r "${TORDIR}\*"
SectionEnd
!endif

2
retroshare-gui/src/TorControl/TorManager.cpp
View File

@ -465,7 +465,7 @@ QString TorManagerPrivate::torExecutablePath() const
return path;
#ifdef Q_OS_WIN
QString filename(QStringLiteral("/tor.exe"));
QString filename(QStringLiteral("/tor/tor.exe"));
#else
QString filename(QStringLiteral("/tor"));
#endif