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

fix: remove sqlite from windows installer and scripts #3362

Merged
merged 2 commits into from
Sep 17, 2021
Merged

fix: remove sqlite from windows installer and scripts #3362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d909a97
fix: remove sqlite from windows installer and scripts
StriderDM Sep 17, 2021
153493e
Merge branch 'development' into remove_sqlite_installer_windows
aviator-app[bot] Sep 17, 2021
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
34 changes: 0 additions & 34 deletions applications/tari_base_node/windows/runtime/source_base_node_env.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,6 @@ if ["%my_exe%"]==[""] (
pause
exit /b 10101
)
if ["%sqlite_runtime%"]==[""] (
echo Problem with "sqlite_runtime" environment variable: '%sqlite_runtime%'
pause
exit /b 10101
)

rem Verify SQLite's location and prepend the default location to the system path if it exist
if exist "%TARI_SQLITE_DIR%\%sqlite_runtime%" (
set "path=%TARI_SQLITE_DIR%;%path%"
echo.
echo Default location of "%sqlite_runtime%" prepended to the system path
) else if exist "%USERPROFILE%\.sqlite\%sqlite_runtime%" (
set "path=%USERPROFILE%\.sqlite;%path%"
echo.
echo Default location of "%sqlite_runtime%" prepended to the system path
) else (
set FOUND=
for %%X in (%sqlite_runtime%) do (set FOUND=%%~$PATH:X)
if defined FOUND (
echo.
echo "%sqlite_runtime%" found in system path:
where "%sqlite_runtime%"
) else (
echo.
echo Note: "%sqlite_runtime%" not found in the default location or in the system path; this may be a problem
if ["%TARI_SQLITE_DIR%"]==["%USERPROFILE%\.sqlite"] (
echo {default location: tried "%TARI_SQLITE_DIR%"}
) else (
echo {default location: tried "%TARI_SQLITE_DIR%" and "%USERPROFILE%\.sqlite"}
)
echo.
pause
)
)

rem Find the base node executable
if exist "%my_exe_path%\%my_exe%" (
Expand Down
1 change: 0 additions & 1 deletion applications/tari_base_node/windows/runtime/start_tari_base_node.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ echo Set up environment variables
echo ----------------------------
rem These are the base node executable and SQLite dynamic link library names
set my_exe=tari_base_node.exe
set sqlite_runtime=sqlite3.dll

rem This is the location of the configuration and identity files
set config_path=%~dp0..\config
Expand Down
34 changes: 0 additions & 34 deletions applications/tari_console_wallet/windows/runtime/source_console_wallet_env.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,6 @@ if ["%my_exe%"]==[""] (
pause
exit /b 10101
)
if ["%sqlite_runtime%"]==[""] (
echo Problem with "sqlite_runtime" environment variable: '%sqlite_runtime%'
pause
exit /b 10101
)

rem Verify SQLite's location and prepend the default location to the system path if it exist
if exist "%TARI_SQLITE_DIR%\%sqlite_runtime%" (
set "path=%TARI_SQLITE_DIR%;%path%"
echo.
echo Default location of "%sqlite_runtime%" prepended to the system path
) else if exist "%USERPROFILE%\.sqlite\%sqlite_runtime%" (
set "path=%USERPROFILE%\.sqlite;%path%"
echo.
echo Default location of "%sqlite_runtime%" prepended to the system path
) else (
set FOUND=
for %%X in (%sqlite_runtime%) do (set FOUND=%%~$PATH:X)
if defined FOUND (
echo.
echo "%sqlite_runtime%" found in system path:
where "%sqlite_runtime%"
) else (
echo.
echo Note: "%sqlite_runtime%" not found in the default location or in the system path; this may be a problem
if ["%TARI_SQLITE_DIR%"]==["%USERPROFILE%\.sqlite"] (
echo {default location: tried "%TARI_SQLITE_DIR%"}
) else (
echo {default location: tried "%TARI_SQLITE_DIR%" and "%USERPROFILE%\.sqlite"}
)
echo.
pause
)
)

rem Find the console wallet executable
if exist "%my_exe_path%\%my_exe%" (
Expand Down
1 change: 0 additions & 1 deletion applications/tari_console_wallet/windows/runtime/start_tari_console_wallet.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ echo Set up environment variables
echo ----------------------------
rem These are the console wallet executable and SQLite dynamic link library names
set my_exe=tari_console_wallet.exe
set sqlite_runtime=sqlite3.dll

rem This is the location of the configuration and identity files
set config_path=%~dp0..\config
Expand Down
47 changes: 0 additions & 47 deletions buildtools/install_sqlite.bat
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions buildtools/windows_inno_installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ Source: "..\common\config\presets\tari_config_example.toml"; DestDir: "{app}\con
Source: "tari_logo_purple.ico"; DestDir: "{userdocs}\..\temp\tari_icons"; Flags: ignoreversion
Source: "tor.ico"; DestDir: "{userdocs}\..\temp\tari_icons"; Flags: ignoreversion
Source: "xmr_logo.ico"; DestDir: "{userdocs}\..\temp\tari_icons"; Flags: ignoreversion
Source: "install_sqlite.bat"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "install_tor_services.bat"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "install_vs2019_redist.bat"; DestDir: "{app}\runtime"; Flags: ignoreversion
Source: "install_xmrig.bat"; DestDir: "{app}\runtime"; Flags: ignoreversion
Expand Down Expand Up @@ -149,7 +148,6 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#BaseNodeName}";
;PrivilegesRequired=admin

[Run]
Filename: "{app}\runtime\install_sqlite.bat"; Parameters: "NO_PAUSE"; Flags: runascurrentuser postinstall; Description: "Install SQLite"
Filename: "{app}\runtime\install_tor_services.bat"; Parameters: "NO_PAUSE"; Flags: runascurrentuser postinstall; Description: "Install Tor Services"
Filename: "{app}\runtime\install_xmrig.bat"; Parameters: "NO_PAUSE"; Flags: runascurrentuser postinstall; Description: "Install XMRig"
Filename: "{app}\runtime\install_vs2019_redist.bat"; Parameters: "NO_PAUSE"; Flags: runascurrentuser postinstall; Description: "Install Redistributable for Visual Studio 2019"
Expand Down