Skip to content

Commit 1b32770

Browse files
threema-danilothreema-danilo
authored
Sort defines alphabetically (WiseLibs#878)
When modifying the defines, this makes it less likely to accidentally add a define twice. This also includes a fix for the documentation patching, which previously ignored the HAVE_* variables and duplicated them on every call to `download.sh`.
1 parent ba9fcec commit 1b32770

File tree

3 files changed

+76
-74
lines changed

3 files changed

+76
-74
lines changed

‎deps/defines.gypi

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
# THIS FILE IS AUTOMATICALLY GENERATED (DO NOT EDIT)
1+
# THIS FILE IS AUTOMATICALLY GENERATED BY deps/download.sh (DO NOT EDIT)
22

33
{
44
'defines': [
5-
'SQLITE_DQS=0',
6-
'SQLITE_LIKE_DOESNT_MATCH_BLOBS',
7-
'SQLITE_THREADSAFE=2',
8-
'SQLITE_USE_URI=0',
9-
'SQLITE_DEFAULT_MEMSTATUS=0',
10-
'SQLITE_OMIT_DEPRECATED',
11-
'SQLITE_OMIT_GET_TABLE',
12-
'SQLITE_OMIT_TCL_VARIABLE',
13-
'SQLITE_OMIT_PROGRESS_CALLBACK',
14-
'SQLITE_OMIT_SHARED_CACHE',
15-
'SQLITE_TRACE_SIZE_LIMIT=32',
5+
'HAVE_INT16_T=1',
6+
'HAVE_INT32_T=1',
7+
'HAVE_INT8_T=1',
8+
'HAVE_STDINT_H=1',
9+
'HAVE_UINT16_T=1',
10+
'HAVE_UINT32_T=1',
11+
'HAVE_UINT8_T=1',
1612
'SQLITE_DEFAULT_CACHE_SIZE=-16000',
1713
'SQLITE_DEFAULT_FOREIGN_KEYS=1',
14+
'SQLITE_DEFAULT_MEMSTATUS=0',
1815
'SQLITE_DEFAULT_WAL_SYNCHRONOUS=1',
19-
'SQLITE_ENABLE_MATH_FUNCTIONS',
20-
'SQLITE_ENABLE_DESERIALIZE',
16+
'SQLITE_DQS=0',
2117
'SQLITE_ENABLE_COLUMN_METADATA',
22-
'SQLITE_ENABLE_UPDATE_DELETE_LIMIT',
23-
'SQLITE_ENABLE_STAT4',
24-
'SQLITE_ENABLE_FTS3_PARENTHESIS',
18+
'SQLITE_ENABLE_DESERIALIZE',
2519
'SQLITE_ENABLE_FTS3',
20+
'SQLITE_ENABLE_FTS3_PARENTHESIS',
2621
'SQLITE_ENABLE_FTS4',
2722
'SQLITE_ENABLE_FTS5',
23+
'SQLITE_ENABLE_GEOPOLY',
2824
'SQLITE_ENABLE_JSON1',
25+
'SQLITE_ENABLE_MATH_FUNCTIONS',
2926
'SQLITE_ENABLE_RTREE',
30-
'SQLITE_ENABLE_GEOPOLY',
27+
'SQLITE_ENABLE_STAT4',
28+
'SQLITE_ENABLE_UPDATE_DELETE_LIMIT',
3129
'SQLITE_INTROSPECTION_PRAGMAS',
30+
'SQLITE_LIKE_DOESNT_MATCH_BLOBS',
31+
'SQLITE_OMIT_DEPRECATED',
32+
'SQLITE_OMIT_GET_TABLE',
33+
'SQLITE_OMIT_PROGRESS_CALLBACK',
34+
'SQLITE_OMIT_SHARED_CACHE',
35+
'SQLITE_OMIT_TCL_VARIABLE',
3236
'SQLITE_SOUNDEX',
33-
'HAVE_STDINT_H=1',
34-
'HAVE_INT8_T=1',
35-
'HAVE_INT16_T=1',
36-
'HAVE_INT32_T=1',
37-
'HAVE_UINT8_T=1',
38-
'HAVE_UINT16_T=1',
39-
'HAVE_UINT32_T=1',
37+
'SQLITE_THREADSAFE=2',
38+
'SQLITE_TRACE_SIZE_LIMIT=32',
39+
'SQLITE_USE_URI=0',
4040
],
4141
}

‎deps/download.sh

+27-25
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,43 @@
2121
YEAR="2022"
2222
VERSION="3390400"
2323

24+
# Defines below are sorted alphabetically
2425
DEFINES="
25-
SQLITE_DQS=0
26-
SQLITE_LIKE_DOESNT_MATCH_BLOBS
27-
SQLITE_THREADSAFE=2
28-
SQLITE_USE_URI=0
29-
SQLITE_DEFAULT_MEMSTATUS=0
30-
SQLITE_OMIT_DEPRECATED
31-
SQLITE_OMIT_GET_TABLE
32-
SQLITE_OMIT_TCL_VARIABLE
33-
SQLITE_OMIT_PROGRESS_CALLBACK
34-
SQLITE_OMIT_SHARED_CACHE
35-
SQLITE_TRACE_SIZE_LIMIT=32
26+
HAVE_INT16_T=1
27+
HAVE_INT32_T=1
28+
HAVE_INT8_T=1
29+
HAVE_STDINT_H=1
30+
HAVE_UINT16_T=1
31+
HAVE_UINT32_T=1
32+
HAVE_UINT8_T=1
3633
SQLITE_DEFAULT_CACHE_SIZE=-16000
3734
SQLITE_DEFAULT_FOREIGN_KEYS=1
35+
SQLITE_DEFAULT_MEMSTATUS=0
3836
SQLITE_DEFAULT_WAL_SYNCHRONOUS=1
39-
SQLITE_ENABLE_MATH_FUNCTIONS
40-
SQLITE_ENABLE_DESERIALIZE
37+
SQLITE_DQS=0
4138
SQLITE_ENABLE_COLUMN_METADATA
42-
SQLITE_ENABLE_UPDATE_DELETE_LIMIT
43-
SQLITE_ENABLE_STAT4
44-
SQLITE_ENABLE_FTS3_PARENTHESIS
39+
SQLITE_ENABLE_DESERIALIZE
4540
SQLITE_ENABLE_FTS3
41+
SQLITE_ENABLE_FTS3_PARENTHESIS
4642
SQLITE_ENABLE_FTS4
4743
SQLITE_ENABLE_FTS5
44+
SQLITE_ENABLE_GEOPOLY
4845
SQLITE_ENABLE_JSON1
46+
SQLITE_ENABLE_MATH_FUNCTIONS
4947
SQLITE_ENABLE_RTREE
50-
SQLITE_ENABLE_GEOPOLY
48+
SQLITE_ENABLE_STAT4
49+
SQLITE_ENABLE_UPDATE_DELETE_LIMIT
5150
SQLITE_INTROSPECTION_PRAGMAS
51+
SQLITE_LIKE_DOESNT_MATCH_BLOBS
52+
SQLITE_OMIT_DEPRECATED
53+
SQLITE_OMIT_GET_TABLE
54+
SQLITE_OMIT_PROGRESS_CALLBACK
55+
SQLITE_OMIT_SHARED_CACHE
56+
SQLITE_OMIT_TCL_VARIABLE
5257
SQLITE_SOUNDEX
53-
HAVE_STDINT_H=1
54-
HAVE_INT8_T=1
55-
HAVE_INT16_T=1
56-
HAVE_INT32_T=1
57-
HAVE_UINT8_T=1
58-
HAVE_UINT16_T=1
59-
HAVE_UINT32_T=1
58+
SQLITE_THREADSAFE=2
59+
SQLITE_TRACE_SIZE_LIMIT=32
60+
SQLITE_USE_URI=0
6061
"
6162

6263
# ========== START SCRIPT ========== #
@@ -89,7 +90,7 @@ cp sqlite3.c sqlite3.h sqlite3ext.h "$OUTPUT/" || exit 1
8990

9091
echo "updating gyp configs..."
9192
GYP="$DEPS/defines.gypi"
92-
printf "# THIS FILE IS AUTOMATICALLY GENERATED (DO NOT EDIT)\n\n{\n 'defines': [\n" > "$GYP"
93+
printf "# THIS FILE IS AUTOMATICALLY GENERATED BY deps/download.sh (DO NOT EDIT)\n\n{\n 'defines': [\n" > "$GYP"
9394
printf "$DEFINES" | sed -e "/^\s*$/d" -e "s/\(.*\)/ '\1',/" >> "$GYP"
9495
printf " ],\n}\n" >> "$GYP"
9596

@@ -100,6 +101,7 @@ MINOR=`expr "${VERSION:1:2}" + 0`
100101
PATCH=`expr "${VERSION:3:2}" + 0`
101102
sed -Ei.bak -e "s/version [0-9]+\.[0-9]+\.[0-9]+/version $MAJOR.$MINOR.$PATCH/g" "$DOCS"
102103
sed -i.bak -e "/^SQLITE_/,\$d" "$DOCS"
104+
sed -i.bak -e "/^HAVE_/,\$d" "$DOCS"
103105
rm "$DOCS".bak
104106
printf "$DEFINES" | sed -e "/^\s*$/d" >> "$DOCS"
105107
printf "\`\`\`\n" >> "$DOCS"

‎docs/compilation.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -45,39 +45,39 @@ If you're using a SQLite3 encryption extension that is a drop-in replacement for
4545
By default, this distribution currently uses SQLite3 **version 3.39.4** with the following [compilation options](https://www.sqlite.org/compile.html):
4646

4747
```
48-
SQLITE_DQS=0
49-
SQLITE_LIKE_DOESNT_MATCH_BLOBS
50-
SQLITE_THREADSAFE=2
51-
SQLITE_USE_URI=0
52-
SQLITE_DEFAULT_MEMSTATUS=0
53-
SQLITE_OMIT_DEPRECATED
54-
SQLITE_OMIT_GET_TABLE
55-
SQLITE_OMIT_TCL_VARIABLE
56-
SQLITE_OMIT_PROGRESS_CALLBACK
57-
SQLITE_OMIT_SHARED_CACHE
58-
SQLITE_TRACE_SIZE_LIMIT=32
48+
HAVE_INT16_T=1
49+
HAVE_INT32_T=1
50+
HAVE_INT8_T=1
51+
HAVE_STDINT_H=1
52+
HAVE_UINT16_T=1
53+
HAVE_UINT32_T=1
54+
HAVE_UINT8_T=1
5955
SQLITE_DEFAULT_CACHE_SIZE=-16000
6056
SQLITE_DEFAULT_FOREIGN_KEYS=1
57+
SQLITE_DEFAULT_MEMSTATUS=0
6158
SQLITE_DEFAULT_WAL_SYNCHRONOUS=1
62-
SQLITE_ENABLE_MATH_FUNCTIONS
63-
SQLITE_ENABLE_DESERIALIZE
59+
SQLITE_DQS=0
6460
SQLITE_ENABLE_COLUMN_METADATA
65-
SQLITE_ENABLE_UPDATE_DELETE_LIMIT
66-
SQLITE_ENABLE_STAT4
67-
SQLITE_ENABLE_FTS3_PARENTHESIS
61+
SQLITE_ENABLE_DESERIALIZE
6862
SQLITE_ENABLE_FTS3
63+
SQLITE_ENABLE_FTS3_PARENTHESIS
6964
SQLITE_ENABLE_FTS4
7065
SQLITE_ENABLE_FTS5
66+
SQLITE_ENABLE_GEOPOLY
7167
SQLITE_ENABLE_JSON1
68+
SQLITE_ENABLE_MATH_FUNCTIONS
7269
SQLITE_ENABLE_RTREE
73-
SQLITE_ENABLE_GEOPOLY
70+
SQLITE_ENABLE_STAT4
71+
SQLITE_ENABLE_UPDATE_DELETE_LIMIT
7472
SQLITE_INTROSPECTION_PRAGMAS
73+
SQLITE_LIKE_DOESNT_MATCH_BLOBS
74+
SQLITE_OMIT_DEPRECATED
75+
SQLITE_OMIT_GET_TABLE
76+
SQLITE_OMIT_PROGRESS_CALLBACK
77+
SQLITE_OMIT_SHARED_CACHE
78+
SQLITE_OMIT_TCL_VARIABLE
7579
SQLITE_SOUNDEX
76-
HAVE_STDINT_H=1
77-
HAVE_INT8_T=1
78-
HAVE_INT16_T=1
79-
HAVE_INT32_T=1
80-
HAVE_UINT8_T=1
81-
HAVE_UINT16_T=1
82-
HAVE_UINT32_T=1
80+
SQLITE_THREADSAFE=2
81+
SQLITE_TRACE_SIZE_LIMIT=32
82+
SQLITE_USE_URI=0
8383
```

0 commit comments

Comments
 (0)