summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-03 18:31:05 (GMT)
committerBrad King <brad.king@kitware.com>2016-08-03 18:31:05 (GMT)
commitf59ab43370dc9bff7e6480032c95505cdd00e3cd (patch)
tree02962c8b256eeccd344580526eaf1ddbc3a3b215 /Utilities
parentf53f4a8a2d215dac634effea575a27e000dfcb29 (diff)
downloadCMake-f59ab43370dc9bff7e6480032c95505cdd00e3cd.zip
CMake-f59ab43370dc9bff7e6480032c95505cdd00e3cd.tar.gz
CMake-f59ab43370dc9bff7e6480032c95505cdd00e3cd.tar.bz2
curl: Remove CMake-specific README
We will now manage the curl source tree updates using the `Utilities/Scripts/update-curl.bash` script. Drop the README that covered the old method.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmcurl/README-CMake.txt66
1 files changed, 0 insertions, 66 deletions
diff --git a/Utilities/cmcurl/README-CMake.txt b/Utilities/cmcurl/README-CMake.txt
deleted file mode 100644
index 1e75672..0000000
--- a/Utilities/cmcurl/README-CMake.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-The Utilities/cmcurl directory contains a reduced distribution
-of the curl source tree with only the library source code and
-CMake build system. It is not a submodule; the actual content is part
-of our source tree and changes can be made and committed directly.
-
-We update from upstream using Git's "subtree" merge strategy. A
-special branch contains commits of upstream curl snapshots and
-nothing else. No Git ref points explicitly to the head of this
-branch, but it is merged into our history.
-
-Update curl from upstream as follows. Create a local branch to
-explicitly reference the upstream snapshot branch head:
-
- git branch curl-upstream 70654261
-
-Use a temporary directory to checkout the branch:
-
- mkdir curl-tmp
- cd curl-tmp
- git init
- git pull .. curl-upstream
- rm -rf *
-
-Now place the (reduced) curl content in this directory. See
-instructions shown by
-
- git log 70654261
-
-for help extracting the content from the upstream repo. Then run
-the following commands to commit the new version. Substitute the
-appropriate date and version number:
-
- git add --all
-
- GIT_AUTHOR_NAME='Curl Upstream' \
- GIT_AUTHOR_EMAIL='curl-library@cool.haxx.se' \
- GIT_AUTHOR_DATE='Tue Aug 11 20:13:01 2015 +0200' \
- git commit -m 'curl 7.44.0 (reduced)' &&
- git commit --amend
-
-Edit the commit message to describe the procedure used to obtain the
-content. Then push the changes back up to the main local repository:
-
- git push .. HEAD:curl-upstream
- cd ..
- rm -rf curl-tmp
-
-Create a topic in the main repository on which to perform the update:
-
- git checkout -b update-curl master
-
-Merge the curl-upstream branch as a subtree:
-
- git merge -s recursive -X subtree=Utilities/cmcurl \
- curl-upstream
-
-If there are conflicts, resolve them and commit. Build and test the
-tree. Commit any additional changes needed to succeed.
-
-Finally, run
-
- git rev-parse --short=8 curl-upstream
-
-to get the commit from which the curl-upstream branch must be started
-on the next update. Edit the "git branch curl-upstream" line above to
-record it, and commit this file.