OLD | NEW |
| (Empty) |
1 From 5628b1aa2f0207924e6c39f46266b396a7fe374c Mon Sep 17 00:00:00 2001 | |
2 From: "tc@google.com" <tc@google.com> | |
3 Date: Tue, 6 Jan 2009 22:39:41 +0000 | |
4 Subject: [PATCH 06/13] Custom shell.c helpers to load Chromium's ICU data. | |
5 | |
6 History uses fts3 with an icu-based segmenter. These changes allow building a | |
7 sqlite3 binary for Linux or Windows which can read those files. | |
8 | |
9 Original review URL: https://codereview.chromium.org/42250 | |
10 --- | |
11 third_party/sqlite/src/Makefile.linux-gcc | 7 ++++++ | |
12 third_party/sqlite/src/main.mk | 2 +- | |
13 third_party/sqlite/src/src/shell.c | 10 +++++++++ | |
14 third_party/sqlite/src/src/shell_icu_linux.c | 27 +++++++++++++++++++++++ | |
15 third_party/sqlite/src/src/shell_icu_win.c | 32 ++++++++++++++++++++++++++++ | |
16 5 files changed, 77 insertions(+), 1 deletion(-) | |
17 create mode 100644 third_party/sqlite/src/src/shell_icu_linux.c | |
18 create mode 100644 third_party/sqlite/src/src/shell_icu_win.c | |
19 | |
20 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/
Makefile.linux-gcc | |
21 index 952e8d1..30ac8bb 100644 | |
22 --- a/third_party/sqlite/src/Makefile.linux-gcc | |
23 +++ b/third_party/sqlite/src/Makefile.linux-gcc | |
24 @@ -81,6 +81,13 @@ OPTS += -DSQLITE_MEMDEBUG=1 | |
25 # TODO(shess) I can't see why I need this setting. | |
26 OPTS += -DOS_UNIX=1 | |
27 | |
28 +# Support for loading Chromium ICU data in sqlite3. | |
29 +ifeq ($(shell uname -s),Darwin) | |
30 +SHELL_ICU = | |
31 +else | |
32 +SHELL_ICU = $(TOP)/src/shell_icu_linux.c -licuuc | |
33 +endif | |
34 + | |
35 #### The suffix to add to executable files. ".exe" for windows. | |
36 # Nothing for unix. | |
37 # | |
38 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk | |
39 index 26f9f15..3ff3647 100644 | |
40 --- a/third_party/sqlite/src/main.mk | |
41 +++ b/third_party/sqlite/src/main.mk | |
42 @@ -476,7 +476,7 @@ libsqlite3.a: $(LIBOBJ) | |
43 | |
44 sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h | |
45 $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \ | |
46 - $(TOP)/src/shell.c libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREAD
LIB) | |
47 + $(TOP)/src/shell.c $(SHELL_ICU) libsqlite3.a $(LIBREADLINE) $(TL
IBS) $(THREADLIB) | |
48 | |
49 sqldiff$(EXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h | |
50 $(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \ | |
51 diff --git a/third_party/sqlite/src/src/shell.c b/third_party/sqlite/src/src/she
ll.c | |
52 index b7a7abc..b1d5087 100644 | |
53 --- a/third_party/sqlite/src/src/shell.c | |
54 +++ b/third_party/sqlite/src/src/shell.c | |
55 @@ -4645,6 +4645,16 @@ int SQLITE_CDECL main(int argc, char **argv){ | |
56 } | |
57 #endif | |
58 | |
59 + /* Begin evanm patch. */ | |
60 +#if !defined(__APPLE__) | |
61 + extern int sqlite_shell_init_icu(); | |
62 + if( !sqlite_shell_init_icu() ){ | |
63 + fprintf(stderr, "%s: warning: couldn't find icudt38.dll; " | |
64 + "queries against ICU FTS tables will fail.\n", argv[0]); | |
65 + } | |
66 +#endif /* !defined(__APPLE__) */ | |
67 + /* End evanm patch. */ | |
68 + | |
69 /* Do an initial pass through the command-line argument to locate | |
70 ** the name of the database file, the name of the initialization file, | |
71 ** the size of the alternative malloc heap, | |
72 diff --git a/third_party/sqlite/src/src/shell_icu_linux.c b/third_party/sqlite/s
rc/src/shell_icu_linux.c | |
73 new file mode 100644 | |
74 index 0000000..4ad0e42 | |
75 --- /dev/null | |
76 +++ b/third_party/sqlite/src/src/shell_icu_linux.c | |
77 @@ -0,0 +1,27 @@ | |
78 +/* Copyright 2007 Google Inc. All Rights Reserved. | |
79 +**/ | |
80 + | |
81 +#include <limits.h> | |
82 +#include <unistd.h> | |
83 +#include "unicode/putil.h" | |
84 +#include "unicode/udata.h" | |
85 + | |
86 +/* | |
87 +** This function attempts to load the ICU data tables from a data file. | |
88 +** Returns 0 on failure, nonzero on success. | |
89 +** This a hack job of icu_utils.cc:Initialize(). It's Chrome-specific code. | |
90 +*/ | |
91 +int sqlite_shell_init_icu() { | |
92 + char bin_dir[PATH_MAX + 1]; | |
93 + int bin_dir_size = readlink("/proc/self/exe", bin_dir, PATH_MAX); | |
94 + if (bin_dir_size < 0 || bin_dir_size > PATH_MAX) | |
95 + return 0; | |
96 + bin_dir[bin_dir_size] = 0;; | |
97 + | |
98 + u_setDataDirectory(bin_dir); | |
99 + // Only look for the packaged data file; | |
100 + // the default behavior is to look for individual files. | |
101 + UErrorCode err = U_ZERO_ERROR; | |
102 + udata_setFileAccess(UDATA_ONLY_PACKAGES, &err); | |
103 + return err == U_ZERO_ERROR; | |
104 +} | |
105 diff --git a/third_party/sqlite/src/src/shell_icu_win.c b/third_party/sqlite/src
/src/shell_icu_win.c | |
106 new file mode 100644 | |
107 index 0000000..67ebbf4 | |
108 --- /dev/null | |
109 +++ b/third_party/sqlite/src/src/shell_icu_win.c | |
110 @@ -0,0 +1,32 @@ | |
111 +/* Copyright 2011 Google Inc. All Rights Reserved. | |
112 +**/ | |
113 + | |
114 +#include <windows.h> | |
115 +#include "unicode/udata.h" | |
116 + | |
117 +/* | |
118 +** This function attempts to load the ICU data tables from a DLL. | |
119 +** Returns 0 on failure, nonzero on success. | |
120 +** This a hack job of icu_utils.cc:Initialize(). It's Chrome-specific code. | |
121 +*/ | |
122 + | |
123 +#define ICU_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat" | |
124 +int sqlite_shell_init_icu() { | |
125 + HMODULE module; | |
126 + FARPROC addr; | |
127 + UErrorCode err; | |
128 + | |
129 + // Chrome dropped U_ICU_VERSION_SHORT from the icu data dll name. | |
130 + module = LoadLibrary(L"icudt.dll"); | |
131 + if (!module) | |
132 + return 0; | |
133 + | |
134 + addr = GetProcAddress(module, ICU_DATA_SYMBOL); | |
135 + if (!addr) | |
136 + return 0; | |
137 + | |
138 + err = U_ZERO_ERROR; | |
139 + udata_setCommonData(addr, &err); | |
140 + | |
141 + return 1; | |
142 +} | |
143 -- | |
144 2.5.0 | |
145 | |
OLD | NEW |