fix: remove sqlite from windows installer and scripts (#3362)

Description --- sqlite is now static linked in the windows binaries, so installing sqlite separately via scripts can be removed. Motivation and Context --- How Has This Been Tested? ---
tari-project · Sep 17, 2021 · b2b6912 · b2b6912
1 parent 6ddd9f8
commit b2b6912
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 119 deletions.
diff --git a/applications/tari_base_node/windows/runtime/source_base_node_env.bat b/applications/tari_base_node/windows/runtime/source_base_node_env.bat
@@ -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%" (

diff --git a/applications/tari_base_node/windows/runtime/start_tari_base_node.bat b/applications/tari_base_node/windows/runtime/start_tari_base_node.bat
@@ -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

diff --git a/applications/tari_console_wallet/windows/runtime/source_console_wallet_env.bat b/applications/tari_console_wallet/windows/runtime/source_console_wallet_env.bat
@@ -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%" (

diff --git a/applications/tari_console_wallet/windows/runtime/start_tari_console_wallet.bat b/applications/tari_console_wallet/windows/runtime/start_tari_console_wallet.bat
@@ -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

diff --git a/buildtools/install_sqlite.bat b/buildtools/install_sqlite.bat
diff --git a/buildtools/windows_inno_installer.iss b/buildtools/windows_inno_installer.iss
@@ -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
@@ -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"