SQLite

Changes On Branch error-no-tclsh
Login
Hide Diff Patch Unified Diff

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch error-no-tclsh Excluding Merge-Ins

This is equivalent to a diff from e4f9d394 to 9f640283

2023-10-04
11:52
Modify the main makefile so that it fails with an error if the tclsh found by ./configure is not tclsh 8.5 or later. Forum post 4380363682708ece. (check-in: 1765f3b5 user: drh tags: trunk)
11:04
Hard fail the ./configure script if it is unable to find a working tclsh. Forum post 4380363682708ece. (Closed-Leaf check-in: 9f640283 user: drh tags: error-no-tclsh)
2023-10-03
11:36
Merge the latest trunk enhancements into the jsonb branch. (check-in: e6406a98 user: drh tags: jsonb)
2023-10-02
17:12
JNI: when fetching text-or-blob/length pairs, fetch the text-or-blob first, then the length, as the API docs suggest. (check-in: e4f9d394 user: stephan tags: trunk)
17:06
Fix the length of the string in the new concat() and concat_ws() functions. (check-in: 32524322 user: drh tags: trunk)

Changes to configure.

︙︙
10358
10359
10360
10361
10362
10363
10364
10365
10366
10367
10368




10369


10370
10371
10372
10373
10374
10375
10376



  test -n "$TCLSH_CMD" && break
done
test -n "$TCLSH_CMD" || TCLSH_CMD="none"

if test "$TCLSH_CMD" = "none"; then
  # If we can't find a local tclsh, then building the amalgamation will fail.
  # We act as though --disable-amalgamation has been used.
  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
  USE_AMALGAMATION=0




  TCLSH_CMD="tclsh"


fi



if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR='$(libdir)'
  for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do








|
|
|
<
>
>
>
>
|
>
>








10358
10359
10360
10361
10362
10363
10364
10365
10366
10367

10368
10369
10370
10371
10372
10373
10374
10375
10376
10377
10378
10379
10380
10381



  test -n "$TCLSH_CMD" && break
done
test -n "$TCLSH_CMD" || TCLSH_CMD="none"

if test "$TCLSH_CMD" = "none"; then
  echo 'ERROR: SQLite requires tclsh to build from canonical sources.'
  echo 'Use the alternative "amalgamation tarball" distribution to build'
  echo 'without using tclsh.  Note, however, that the amalgmatation'

  echo 'tarball does not contain all of the build targets that this'
  echo 'package supports.  If you want to build everything associated'
  echo 'with SQLite (such as runnings tests or building auxiliary tools'
  echo 'like "sqldiff" or "sqlite3_analyzer") then you really do need'
  echo 'to install tclsh version 8.5 or later.'
  echo 'ERROR: configure failed'
  exit 1
fi



if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR='$(libdir)'
  for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do
︙︙

Changes to configure.ac.

︙︙
118
119
120
121
122
123
124
125
126
127
128




129


130
131
132
133
134
135
136

#########
# See whether we can run specific tclsh versions known to work well;
# if not, then we fall back to plain tclsh.
# TODO: try other versions before falling back?
# 
AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.7 tclsh8.6 tclsh8.5 tclsh], none)
if test "$TCLSH_CMD" = "none"; then
  # If we can't find a local tclsh, then building the amalgamation will fail.
  # We act as though --disable-amalgamation has been used.
  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
  USE_AMALGAMATION=0




  TCLSH_CMD="tclsh"


fi
AC_SUBST(TCLSH_CMD)

AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin])
if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR='$(libdir)'
  for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do








|
|
|
<
>
>
>
>
|
>
>








118
119
120
121
122
123
124
125
126
127

128
129
130
131
132
133
134
135
136
137
138
139
140
141

#########
# See whether we can run specific tclsh versions known to work well;
# if not, then we fall back to plain tclsh.
# TODO: try other versions before falling back?
# 
AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.7 tclsh8.6 tclsh8.5 tclsh], none)
if test "$TCLSH_CMD" = "none"; then
  echo 'ERROR: SQLite requires tclsh to build from canonical sources.'
  echo 'Use the alternative "amalgamation tarball" distribution to build'
  echo 'without using tclsh.  Note, however, that the amalgmatation'

  echo 'tarball does not contain all of the build targets that this'
  echo 'package supports.  If you want to build everything associated'
  echo 'with SQLite (such as runnings tests or building auxiliary tools'
  echo 'like "sqldiff" or "sqlite3_analyzer") then you really do need'
  echo 'to install tclsh version 8.5 or later.'
  echo 'ERROR: configure failed'
  exit 1
fi
AC_SUBST(TCLSH_CMD)

AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin])
if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR='$(libdir)'
  for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do
︙︙