You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/12/24 11:18:57 UTC
svn commit: r1425619 - in /subversion/trunk: ./ INSTALL
build/ac-macros/sqlite.m4 get-deps.sh subversion/include/private/
subversion/libsvn_subr/sqlite.c subversion/libsvn_subr/sqlite3wrapper.c
subversion/tests/libsvn_wc/wc-queries-test.c
Author: brane
Date: Mon Dec 24 10:18:57 2012
New Revision: 1425619
URL: http://svn.apache.org/viewvc?rev=1425619&view=rev
Log:
Temporarily revert part of the change from the tweak-build-take-two branch that
moved the expected location of the SQLite amalgamation directory and used
relative paths to include those files, because it conflicts with the use of
--with-sqlite to locate an amalgamation directory outside the build tree.
Note that this can cause builds to fail if non-amalgamated SQLite is found
elsewhere on the include path before the amalagamated files.
* INSTALL, get-deps.sh:
- Change expected location of the amalgamation package.
* build/ac-macros/sqlite.m4:
- Look for $abs_srcdir/sqlite-amalgamation.
- Do add include paths to wherever the amalgamation was found.
* subversion/libsvn_subr/sqlite.c, subversion/libsvn_subr/sqlite3wrapper.c,
subversion/tests/libsvn_wc/wc-queries-test.c: Do not use relative paths
to include amalgamation sources.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/INSTALL
subversion/trunk/build/ac-macros/sqlite.m4
subversion/trunk/get-deps.sh
subversion/trunk/subversion/include/private/ (props changed)
subversion/trunk/subversion/libsvn_subr/sqlite.c
subversion/trunk/subversion/libsvn_subr/sqlite3wrapper.c
subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 24 10:18:57 2012
@@ -47,6 +47,7 @@ mkmf.log
.settings
.cproject
zlib
+sqlite-amalgamation
serf
.git
.gitignore
Propchange: subversion/trunk/
------------------------------------------------------------------------------
Reverse-merged /subversion/branches/tweak-build-take-two:r1425050
Modified: subversion/trunk/INSTALL
URL: http://svn.apache.org/viewvc/subversion/trunk/INSTALL?rev=1425619&r1=1425618&r2=1425619&view=diff
==============================================================================
--- subversion/trunk/INSTALL (original)
+++ subversion/trunk/INSTALL Mon Dec 24 10:18:57 2012
@@ -172,9 +172,9 @@ I. INTRODUCTION
libraries (Apache Portable Runtime, Sqlite, and Zlib). The script,
'get-deps.sh', is available in the same directory as this file.
When run, it will place 'apr', 'apr-util', 'serf', 'zlib', and
- 'subversion/include/private/sqlite-amalgamation' directories directly
- into your unpacked Subversion distribution, where they will be
- automatically configured and built by Subversion's build process.
+ 'sqlite-amalgamation' directories directly into your unpacked Subversion
+ distribution, where they will be automatically configured and built by
+ Subversion's build process.
Note: there are optional dependencies (such as openssl, swig, and httpd)
which get-deps.sh does not download and Subversion does not attempt to
Modified: subversion/trunk/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/sqlite.m4?rev=1425619&r1=1425618&r2=1425619&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/sqlite.m4 (original)
+++ subversion/trunk/build/ac-macros/sqlite.m4 Mon Dec 24 10:18:57 2012
@@ -27,20 +27,14 @@ dnl the recommended version of sqlite.
dnl
dnl If a --with-sqlite=PREFIX option is passed, look for a suitable sqlite
dnl either installed under the directory PREFIX or as an amalgamation file
-dnl at the path PREFIX. In this case ignore any
-dnl
-dnl subversion/include/private/sqlite-amalgamation/
-dnl
-dnl subdir within the source tree.
+dnl at the path PREFIX. In this case ignore any sqlite-amalgamation/ subdir
+dnl within the source tree.
dnl
dnl If no --with-sqlite option is passed, look first for
-dnl
-dnl subversion/include/private/sqlite-amalgamation/sqlite3.c
-dnl
-dnl which should be the amalgamated version of the source distribution.
-dnl If the amalgamation exists and is the wrong version, exit with a
-dnl failure. If no sqlite-amalgamation/ subdir is present, search
-dnl for a sqlite installed on the system.
+dnl sqlite-amalgamation/sqlite3.c which should be the amalgamated version of
+dnl the source distribution. If the amalgamation exists and is the wrong
+dnl version, exit with a failure. If no sqlite-amalgamation/ subdir is
+dnl present, search for a sqlite installed on the system.
dnl
dnl If the search for sqlite fails, set svn_lib_sqlite to no, otherwise set
dnl it to yes.
@@ -81,7 +75,7 @@ AC_DEFUN(SVN_LIB_SQLITE,
],
[
dnl see if the sqlite amalgamation exists in the source tree
- SVN_SQLITE_FILE_CONFIG([$abs_srcdir/subversion/include/private/sqlite-amalgamation/sqlite3.c])
+ SVN_SQLITE_FILE_CONFIG($abs_srcdir/sqlite-amalgamation/sqlite3.c)
if test -z "$svn_lib_sqlite"; then
dnl check the "standard" location of /usr
@@ -195,12 +189,10 @@ AC_DEFUN(SVN_SQLITE_FILE_CONFIG,
SQLITE_VERSION_OKAY
#endif],
[AC_MSG_RESULT([amalgamation found and is okay])
- dnl No additional include dirs since sources use a
- dnl relative path to include the amalgamated files.
- SVN_SQLITE_INCLUDES=""
_SVN_SQLITE_DSO_LIBS
AC_DEFINE(SVN_SQLITE_INLINE, 1,
[Defined if svn should use the amalgamated version of sqlite])
+ SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
if test -n "$svn_sqlite_dso_ldflags"; then
SVN_SQLITE_LIBS="$svn_sqlite_dso_ldflags -lpthread"
else
Modified: subversion/trunk/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1425619&r1=1425618&r2=1425619&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Mon Dec 24 10:18:57 2012
@@ -91,7 +91,7 @@ get_zlib() {
}
get_sqlite() {
- test -d $BASEDIR/subversion/include/private/sqlite-amalgamation && return
+ test -d $BASEDIR/sqlite-amalgamation && return
cd $TEMPDIR
$HTTP_FETCH http://www.sqlite.org/$SQLITE.zip
@@ -99,7 +99,7 @@ get_sqlite() {
unzip -q $TEMPDIR/$SQLITE.zip
- mv $SQLITE subversion/include/private/sqlite-amalgamation
+ mv $SQLITE sqlite-amalgamation
}
@@ -107,7 +107,7 @@ get_sqlite() {
get_deps() {
mkdir -p $TEMPDIR
- for i in zlib serf subversion/include/private/sqlite-amalgamation apr apr-util; do
+ for i in zlib serf sqlite-amalgamation apr apr-util; do
if [ -d $i ]; then
echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
fi
Propchange: subversion/trunk/subversion/include/private/
('svn:ignore' removed)
Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1425619&r1=1425618&r2=1425619&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Mon Dec 24 10:18:57 2012
@@ -45,7 +45,7 @@
#ifdef SVN_SQLITE_INLINE
/* Import the sqlite3 API vtable from sqlite3wrapper.c */
# define SQLITE_OMIT_DEPRECATED
-# include <private/sqlite-amalgamation/sqlite3ext.h>
+# include <sqlite3ext.h>
extern const sqlite3_api_routines *const svn_sqlite3__api_funcs;
extern int (*const svn_sqlite3__api_initialize)(void);
extern int (*const svn_sqlite3__api_config)(int, ...);
Modified: subversion/trunk/subversion/libsvn_subr/sqlite3wrapper.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite3wrapper.c?rev=1425619&r1=1425618&r2=1425619&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite3wrapper.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite3wrapper.c Mon Dec 24 10:18:57 2012
@@ -39,7 +39,7 @@
# pragma GCC diagnostic ignored "-Wshorten-64-to-32"
# endif
# endif
-# include <private/sqlite-amalgamation/sqlite3.c>
+# include <sqlite3.c>
# if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
# pragma GCC diagnostic pop
# endif
Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1425619&r1=1425618&r2=1425619&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c Mon Dec 24 10:18:57 2012
@@ -32,7 +32,7 @@
#ifdef SVN_SQLITE_INLINE
/* Include sqlite3 inline, making all symbols private. */
#define SQLITE_API static
- #include <private/sqlite-amalgamation/sqlite3.c>
+ #include <sqlite3.c>
#else
#include <sqlite3.h>
#endif