OLD | NEW |
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.8.7.4 |
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. |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 | 71 |
72 #### Cherry-pick your change. | 72 #### Cherry-pick your change. |
73 git cherry-pick <your change> | 73 git cherry-pick <your change> |
74 # This branch should be identical to your development branch, except | 74 # This branch should be identical to your development branch, except |
75 # amalgamation. | 75 # amalgamation. |
76 | 76 |
77 # Rebuild the patch set. | 77 # Rebuild the patch set. |
78 git rm patches/* | 78 git rm patches/* |
79 git format-patch --output-directory=patches sqlite_${BASE}..HEAD | 79 git format-patch --output-directory=patches sqlite_${BASE}..HEAD |
80 git add patches/*.patch | 80 git add patches/*.patch |
81 git commit -m "Rebuild patches for sqlite_${VERSION}" | 81 git commit -m "Rebuild patches for sqlite_${BASE}" |
82 | 82 |
83 # Re-generate the amalgamation. | 83 # Re-generate the amalgamation. |
84 ./google_generate_amalgamation.sh | 84 ./google_generate_amalgamation.sh |
85 git commit -m 'google_generate_amalgamation.sh' amalgamation/ | 85 git commit -m 'google_generate_amalgamation.sh' amalgamation/ |
86 # At this point everything should build and work. | 86 # At this point everything should build and work. |
87 | 87 |
88 # Do a squash upload. This should add your single patch to patches/, and apply | 88 # Do a squash upload. This should add your single patch to patches/, and apply |
89 # the changes your patch represents to src/ and amalgamation/. Other patches | 89 # the changes your patch represents to src/ and amalgamation/. Other patches |
90 # will have hash changes. A sensible check-in comment would be something like | 90 # will have hash changes. A sensible check-in comment would be something like |
91 # the patch's checkin comment, plus "regenerate amalgamation and generate patch | 91 # the patch's checkin comment, plus "regenerate amalgamation and generate patch |
(...skipping 17 matching lines...) Expand all Loading... |
109 suitable for committing. | 109 suitable for committing. |
110 | 110 |
111 # Everything based in sqlite subdir. | 111 # Everything based in sqlite subdir. |
112 cd third_party/sqlite | 112 cd third_party/sqlite |
113 | 113 |
114 BASE=3070603 | 114 BASE=3070603 |
115 VERSION=3080704 | 115 VERSION=3080704 |
116 | 116 |
117 #### Create current-SQLite reference branch. | 117 #### Create current-SQLite reference branch. |
118 git checkout -b sqlite_${BASE} master | 118 git checkout -b sqlite_${BASE} master |
119 rm -rf src | 119 git rm -rf src |
120 cp -a sqlite-src-${BASE} src | 120 cp -a sqlite-src-${BASE} src |
121 # -f includes ignored files, of which there are a couple. | 121 # -f includes ignored files, of which there are a couple. |
122 git add -f src/ | 122 git add -f src/ |
123 git commit -m "Reset to sqlite-src-${BASE}" | 123 git commit -m "Reset to sqlite-src-${BASE}" |
124 # This branch is unlikely to build. | 124 # This branch is unlikely to build. |
125 | 125 |
126 #### Convert patches into CLs. | 126 #### Convert patches into CLs. |
127 git checkout -b sqlite_${BASE}_patched master | 127 git checkout -b sqlite_${BASE}_patched master |
128 git rebase sqlite_${BASE} | 128 git rebase sqlite_${BASE} |
129 git am --keep-non-patch patches/*.patch | 129 git am --keep-non-patch patches/*.patch |
130 git diff master | 130 git diff master |
131 # This branch should be identical to master. | 131 # This branch should be identical to master. |
132 | 132 |
133 #### Create new-SQLite reference branch. | 133 #### Create new-SQLite reference branch. |
134 git checkout -b sqlite_${VERSION} master | 134 git checkout -b sqlite_${VERSION} master |
135 git rebase sqlite_${BASE} | 135 git rebase sqlite_${BASE} |
136 # SQLite's download page is at <http://www.sqlite.org/download.html>. Scroll to | 136 # SQLite's download page is at <http://www.sqlite.org/download.html>. Scroll to |
137 # "Legacy Source Code Distribution Formats", and grab sqlite-src-<VERSION>.zip. | 137 # "Legacy Source Code Distribution Formats", and grab sqlite-src-<VERSION>.zip. |
138 # Unzip it and pull it into the repo. | 138 # Unzip it and pull it into the repo. |
139 wget http://www.sqlite.org/2014/sqlite-src-${VERSION}.zip | 139 wget http://www.sqlite.org/2014/sqlite-src-${VERSION}.zip |
140 unzip sqlite-src-${VERSION}.zip | 140 unzip sqlite-src-${VERSION}.zip |
141 rm sqlite-src-${VERSION}.zip | 141 rm sqlite-src-${VERSION}.zip |
142 # -f includes ignored files, of which there are a couple. | 142 # -f includes ignored files, of which there are a couple. |
143 git add -f sqlite-src-${VERSION}/ | 143 git add -f sqlite-src-${VERSION}/ |
| 144 git commit -m "Begin import of sqlite-src-${VERSION}" |
144 # Sometimes DOS line endings sneak into the source code. This command works on | 145 # Sometimes DOS line endings sneak into the source code. This command works on |
145 # OSX and Linux and fixes those files, but double-check the results before | 146 # OSX and Linux and fixes those files, but double-check the results before |
146 # committing: | 147 # committing: |
147 egrep --exclude="*.eps" --exclude="*.ico" --exclude="*.jpg" \ | 148 egrep --exclude="*.eps" --exclude="*.ico" --exclude="*.jpg" \ |
148 --exclude="*.gif" --exclude="*.tiff" --exclude="*.vsix" -URl '\r' . | \ | 149 --exclude="*.gif" --exclude="*.tiff" --exclude="*.vsix" -URl '\r' \ |
149 LANG=C xargs sed -i~ -e $'s/\r$//' | 150 sqlite-src-${VERSION}/ | LANG=C xargs sed -i~ -e $'s/\r$//' |
150 git commit -m "Begin import of sqlite-src-${VERSION}" sqlite-src-${VERSION} | 151 # This might fail for lack of changes. |
151 rm -rf src | 152 git commit -a -m "Fix line endings for sqlite-src-${VERSION}" |
| 153 git rm -rf src |
152 cp -a sqlite-src-${VERSION} src | 154 cp -a sqlite-src-${VERSION} src |
153 # -f includes ignored files, of which there are a couple. | 155 # -f includes ignored files, of which there are a couple. |
154 git add -f src/ | 156 git add -f src/ |
155 git commit -m "Update src to sqlite-src-${VERSION}" src/ | 157 git commit -m "Update src to sqlite-src-${VERSION}" src/ |
156 # This branch is unlikely to build. | 158 # This branch is unlikely to build. |
157 | 159 |
158 #### Create a branch for merging the CLs to the new SQLite. | 160 #### Create a branch for merging the CLs to the new SQLite. |
159 git checkout -b sqlite_${VERSION}_patched master | 161 git checkout -b sqlite_${VERSION}_patched master |
160 git rebase sqlite_${VERSION} | 162 git rebase sqlite_${VERSION} |
161 | 163 |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 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 |
250 like: | 252 like: |
251 | 253 |
252 TMPFS=/dev/shm/sqlite_build | 254 TMPFS=/dev/shm/sqlite_build |
253 BUILD=$PWD | 255 BUILD=$PWD |
254 mkdir $TMPFS | 256 mkdir $TMPFS |
255 (cd $TMPFS ; $BUILD/testfixture $BUILD/../test/veryquick.test >/tmp/test.log) | 257 (cd $TMPFS ; $BUILD/testfixture $BUILD/../test/veryquick.test >/tmp/test.log) |
256 | 258 |
257 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 |
258 real-world use. | 260 real-world use. |
OLD | NEW |