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

Unified Diff: third_party/sqlite/README.chromium

Issue 1073293002: [sql] Remove fts2 patches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put back SQLITE_CORE only for the icu component for iOS Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/README.chromium
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium
index 39e085e2c803b6aa7dfb8107d8e6f66a61ac2156..1c8d74aa1f72deede68178d10592c5eefaff20b5 100644
--- a/third_party/sqlite/README.chromium
+++ b/third_party/sqlite/README.chromium
@@ -78,7 +78,7 @@ git cherry-pick <your change>
git rm patches/*
git format-patch --output-directory=patches sqlite_${BASE}..HEAD
git add patches/*.patch
-git commit -m "Rebuild patches for sqlite_${VERSION}"
+git commit -m "Rebuild patches for sqlite_${BASE}"
# Re-generate the amalgamation.
./google_generate_amalgamation.sh
@@ -116,7 +116,7 @@ VERSION=3080704
#### Create current-SQLite reference branch.
git checkout -b sqlite_${BASE} master
-rm -rf src
+git rm -rf src
cp -a sqlite-src-${BASE} src
# -f includes ignored files, of which there are a couple.
git add -f src/
@@ -141,14 +141,16 @@ unzip sqlite-src-${VERSION}.zip
rm sqlite-src-${VERSION}.zip
# -f includes ignored files, of which there are a couple.
git add -f sqlite-src-${VERSION}/
+git commit -m "Begin import of sqlite-src-${VERSION}"
# Sometimes DOS line endings sneak into the source code. This command works on
# OSX and Linux and fixes those files, but double-check the results before
# committing:
egrep --exclude="*.eps" --exclude="*.ico" --exclude="*.jpg" \
- --exclude="*.gif" --exclude="*.tiff" --exclude="*.vsix" -URl '\r' . | \
- LANG=C xargs sed -i~ -e $'s/\r$//'
-git commit -m "Begin import of sqlite-src-${VERSION}" sqlite-src-${VERSION}
-rm -rf src
+ --exclude="*.gif" --exclude="*.tiff" --exclude="*.vsix" -URl '\r' \
+ sqlite-src-${VERSION}/ | LANG=C xargs sed -i~ -e $'s/\r$//'
+# This might fail for lack of changes.
+git commit -a -m "Fix line endings for sqlite-src-${VERSION}"
+git rm -rf src
cp -a sqlite-src-${VERSION} src
# -f includes ignored files, of which there are a couple.
git add -f src/
« no previous file with comments | « third_party/sqlite/BUILD.gn ('k') | third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698