mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1403 from karim/msi-sqlcipher

Browse Source 
Update Windows Installer to include SQLCipher
This commit is contained in:
Justin Clift
2018-06-03 03:16:29 +01:00
committed by GitHub
parent 0f207cebae 8fe09f152d
commit 5d6f60d816
3 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
installer/windows/build.cmd
View File

@@ -1,17 +1,30 @@
@echo off
:: Set the output MSI and ARCH based on the calling parameter
:: Output file name
set MSI=DB.Browser.for.SQLite
:: Set the ARCH based on the first parameter
if "%1"=="" (
echo ERROR: You must select "Win64" or "Win32"
echo ERROR: You must select a build type, either "win64" or "win32"
goto :eof
) else if "%1"=="Win32" (
set MSI=DB.Browser.for.SQLite-win32
) else if "%1"=="win32" (
set ARCH=x86
) else if "%1"=="Win64" (
set MSI=DB.Browser.for.SQLite-win64
) else if "%1"=="win64" (
set ARCH=x64
) else (
echo ERROR: Unknown ARCH="%1"
echo ERROR: Unknown build type="%1"
goto :eof
)
:: Choose between building the application with SQLite (default) or SQLCipher library
if "%2"=="" (
set SQLCIPHER=
set MSI=%MSI%-%1
) else if "%2"=="sqlcipher" (
set MSI=%MSI%-sqlcipher-%1
set SQLCIPHER=-dSQLCipher=1
) else (
echo ERROR: Second parameter can only be "sqlcipher" or nothing
goto :eof
)
@@ -26,7 +39,7 @@ set ICE=-sice:ICE03 -sice:ICE82 -sice:ICE61 -sice:ICE43 -sice:ICE57
set LIGHT=-sw1104
:: Compile & Link
"%WIX%\bin\candle.exe" -nologo -pedantic -arch %ARCH% product.wxs
"%WIX%\bin\candle.exe" -nologo -pedantic -arch %ARCH% %SQLCIPHER% product.wxs
"%WIX%\bin\light.exe" -nologo -pedantic %LIGHT% %ICE% -ext WixUIExtension -ext WixUtilExtension product.wixobj -out %MSI%.msi
:: Cleanup

14
installer/windows/product.wxs
View File

@@ -78,7 +78,11 @@
<Component><File Source="$(var.QtPath)\bin\Qt5Xml.dll" /></Component>
<Component><File Source="$(var.OpenSSLPath)\libeay32.dll" /></Component>
<Component><File Source="$(var.OpenSSLPath)\ssleay32.dll" /></Component>
<Component><File Source="$(var.SQLitePath)\sqlite3.dll" /></Component>
<?ifdef SQLCipher ?>
<Component><File Source="$(var.SQLCipherPath)\sqlcipher.dll" /></Component>
<?else?>
<Component><File Source="$(var.SQLitePath)\sqlite3.dll" /></Component>
<?endif?>
<Component>
<File Source="..\..\Release\DB Browser for SQLite.exe" Checksum="yes" KeyPath="yes">
<Shortcut
@@ -128,8 +132,12 @@
<!-- OpenSSL -->
<ComponentRef Id="libeay32.dll" />
<ComponentRef Id="ssleay32.dll" />
<!-- SQLite -->
<ComponentRef Id="sqlite3.dll" />
<!-- SQLCipher or SQLite -->
<?ifdef SQLCipher ?>
<ComponentRef Id="sqlcipher.dll" />
<?else?>
<ComponentRef Id="sqlite3.dll" />
<?endif?>
<!-- Application -->
<ComponentRef Id="DB_Browser_for_SQLite.exe" />
</Feature>

2
installer/windows/variables.wxi
View File

@@ -52,10 +52,12 @@
<?if $(sys.BUILDARCH)="x64"?>
<?define QtPath="C:\dev\Qt\5.7\msvc2013_64" ?>
<?define SQLitePath="C:\dev\SQLite-Win64" ?>
<?define SQLCipherPath="C:\git_repos\SQLCipher-Win64" ?>
<?define OpenSSLPath="C:\dev\OpenSSL-Win64" ?>
<?elseif $(sys.BUILDARCH)="x86"?>
<?define QtPath="C:\dev\Qt\5.7\msvc2013" ?>
<?define SQLitePath="C:\dev\SQLite-Win32" ?>
<?define SQLCipherPath="C:\git_repos\SQLCipher-Win32" ?>
<?define OpenSSLPath="C:\dev\OpenSSL-Win32" ?>
<?endif?>