Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Side by Side Diff: third_party/sqlite/README.chromium

Issue 2366013002: [sqlite] Bring patches up-to-date with trunk. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/sqlite/patches/0005-Virtual-table-supporting-recovery-of-corrupted-datab.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Name: sqlite 1 Name: sqlite
2 URL: http://sqlite.org/ 2 URL: http://sqlite.org/
3 Version: 3.8.7.4 3 Version: 3.10.2
4 Included In Release: Yes 4 Included In Release: Yes
5 Security Critical: Yes 5 Security Critical: Yes
6 License: Public domain 6 License: Public domain
7 7
8 1) Managing differences between SQLite core and Chromium's version. 8 1) Managing differences between SQLite core and Chromium's version.
9 2) Making changes to Chromium SQLite. 9 2) Making changes to Chromium SQLite.
10 3) Import new release of SQLite. 10 3) Import new release of SQLite.
11 4) Running SQLite's test suite within the Chromium checkout. 11 4) Running SQLite's test suite within the Chromium checkout.
12 12
13 --- 13 ---
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 or OSX. They may assume a modern version of git (I'm using 2.2.1). 48 or OSX. They may assume a modern version of git (I'm using 2.2.1).
49 49
50 # Everything based in sqlite subdir. 50 # Everything based in sqlite subdir.
51 cd third_party/sqlite 51 cd third_party/sqlite
52 52
53 BASE=3080704 53 BASE=3080704
54 54
55 #### Create a reference branch. 55 #### Create a reference branch.
56 git checkout -b sqlite_${BASE} master 56 git checkout -b sqlite_${BASE} master
57 git rm -rf src 57 git rm -rf src
58 rm -rf src # In case there are things git doesn't know in there.
58 cp -a sqlite-src-${BASE} src 59 cp -a sqlite-src-${BASE} src
59 # -f includes ignored files, of which there are a couple. 60 # -f includes ignored files, of which there are a couple.
60 git add -f src/ 61 git add -f src/
61 git commit -m "Reset to sqlite-src-${BASE}" 62 git commit -m "Reset to sqlite-src-${BASE}"
62 # This branch is unlikely to build. 63 # This branch is unlikely to build.
63 64
64 #### Create a reference branch with patches applied. 65 #### Create a reference branch with patches applied.
65 git checkout -b sqlite_${BASE}_patched master 66 git checkout -b sqlite_${BASE}_patched master
66 git rebase sqlite_${BASE} 67 git rebase sqlite_${BASE}
67 git am --keep-non-patch patches/*.patch 68 git am --keep-non-patch patches/*.patch
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 NOTE(shess): On Ubuntu it is possible to run the tests in a tmpfs something 251 NOTE(shess): On Ubuntu it is possible to run the tests in a tmpfs something
251 like: 252 like:
252 253
253 TMPFS=/dev/shm/sqlite_build 254 TMPFS=/dev/shm/sqlite_build
254 BUILD=$PWD 255 BUILD=$PWD
255 mkdir $TMPFS 256 mkdir $TMPFS
256 (cd $TMPFS ; $BUILD/testfixture $BUILD/../test/veryquick.test >/tmp/test.log) 257 (cd $TMPFS ; $BUILD/testfixture $BUILD/../test/veryquick.test >/tmp/test.log)
257 258
258 This is faster, but it is plausible that different things are being tested than 259 This is faster, but it is plausible that different things are being tested than
259 real-world use. 260 real-world use.
OLDNEW
« no previous file with comments | « no previous file | third_party/sqlite/patches/0005-Virtual-table-supporting-recovery-of-corrupted-datab.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698