[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Add missing sqlite3.dll to windows distribution

From: G.J. Doornink <dkg_at_xs4all.nl>
Date: 2007-10-29 22:40:45 CET

Currently sqlite3.dll is missing from the windows binary distribution
(zip files and installer).

The following patch fixes this.

[[[
Add sqlite3.dll to the windows binary distribution.

* build/win32/make_dist.py
  (_disttree): Add sqlite3.dll.

* packages/windows-innosetup/Readme.txt
  Add path_sqlite to the 'Dynamic build data' section.

* packages/windows-innosetup/svn.iss
  Add sqlite3.dll to [Files] section.

* packages/windows-innosetup/templates/svn_dynamics.iss
  Define path to sqlite3.dll.

Patch by: G.J. Doornink
]]]

-- 
G.J. Doornink <dkg@xs4all.nl>

Index: build/win32/make_dist.py
===================================================================
--- build/win32/make_dist.py (revision 27468)
+++ build/win32/make_dist.py (working copy)
@@ -196,6 +196,7 @@
                      File('%(@apr-util)s/%(aprrel)s/libaprutil.pdb'),
                      File('%(@berkeley-db)s/bin/libdb%(bdbver)s.dll'),
                      OptFile('%(@berkeley-db)s/bin/libdb%(bdbver)s.pdb'),
+ File('%(@sqlite)s/bin/sqlite3.dll'),
                      OptFile('%(@openssl)s/out32dll/libeay32.dll'),
                      OptFile('%(@openssl)s/out32dll/libeay32.pdb'),
                      OptFile('%(@openssl)s/out32dll/ssleay32.dll'),
Index: packages/windows-innosetup/Readme.txt
===================================================================
--- packages/windows-innosetup/Readme.txt (revision 27468)
+++ packages/windows-innosetup/Readme.txt (working copy)
@@ -155,6 +155,7 @@
   path_brkdb_lib libdb4*.lib
   path_brkdb_inc db.h, db_cxx.h)
   path_brkdb_inc2 cxx_common.h, cxx_except.h
+ path_sqlite sqlite3.dll
   path_ssl libeay32.dll, ssleay32.dll
 
 
Index: packages/windows-innosetup/svn.iss
===================================================================
--- packages/windows-innosetup/svn.iss (revision 27468)
+++ packages/windows-innosetup/svn.iss (working copy)
@@ -83,6 +83,9 @@
 Source: {#= path_msvcr70_dll}\msvcr70.dll; DestDir: {app}\bin
 #endif
 
+;SQLite
+Source: {#= path_sqlite}\sqlite3.dll; DestDir: {app}\bin; Flags: ignoreversion
+
 ;SSL
 Source: {#= path_ssl}\libeay32.dll; DestDir: {app}\bin; Flags: ignoreversion
 Source: {#= path_ssl}\ssleay32.dll; DestDir: {app}\bin; Flags: ignoreversion
Index: packages/windows-innosetup/templates/svn_dynamics.iss
===================================================================
--- packages/windows-innosetup/templates/svn_dynamics.iss (revision 27468)
+++ packages/windows-innosetup/templates/svn_dynamics.iss (working copy)
@@ -68,6 +68,7 @@
 #define path_brkdb_dll (path_svn + "bin")
 #define path_svnpath "tools\svnpath"
 #define path_iconv (path_svn + "iconv")
+#define path_sqlite (path_svn + "bin")
 #define path_ssl (path_svn + "bin")
 ; Licenses
 #define path_licenses (path_svn + "licenses")

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 29 22:48:32 2007

This is an archived mail posted to the Subversion Dev mailing list.