diff options
author | Dan Gohman <gohman@apple.com> | 2010-08-04 16:07:22 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2010-08-04 16:07:22 +0000 |
commit | c1076ea611f21aa8b44d28bf2eac43a207c1922b (patch) | |
tree | 744c157b834906b68c5e453027288985e46fbe31 | |
parent | b0495100f5b8cfe77a13113ccbb25cfc62041aa3 (diff) | |
download | llvm-c1076ea611f21aa8b44d28bf2eac43a207c1922b.tar.gz llvm-c1076ea611f21aa8b44d28bf2eac43a207c1922b.tar.bz2 llvm-c1076ea611f21aa8b44d28bf2eac43a207c1922b.tar.xz |
Delete mkpatch. Everything it does is already done by svn diff by default.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110203 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | docs/DeveloperPolicy.html | 17 | ||||
-rwxr-xr-x | utils/mkpatch | 37 |
2 files changed, 6 insertions, 48 deletions
diff --git a/docs/DeveloperPolicy.html b/docs/DeveloperPolicy.html index 357c92956f..829860ccaa 100644 --- a/docs/DeveloperPolicy.html +++ b/docs/DeveloperPolicy.html @@ -107,18 +107,13 @@ patches may not apply correctly if the underlying code changes between the time the patch was created and the time it is applied.</li> - <li>Patches should be made with this command: -<div class="doc_code"> -<pre> -svn diff -</pre> -</div> - or with the utility <tt>utils/mkpatch</tt>, which makes it easy to read - the diff.</li> + <li>Patches should be made with <tt>svn diff</tt>, or similar. If you use + a different tool, make sure it uses the <tt>diff -u</tt> format and + that it doesn't contain clutter which makes it hard to read.</li> - <li>Patches should not include differences in generated code such as the code - generated by <tt>autoconf</tt> or <tt>tblgen</tt>. The - <tt>utils/mkpatch</tt> utility takes care of this for you.</li> + <li>If you are modifying generated files, such as the top-level + <tt>configure</tt> script, please separate out those changes into + a separate patch from the rest of your changes.</li> </ol> <p>When sending a patch to a mailing list, it is a good idea to send it as an diff --git a/utils/mkpatch b/utils/mkpatch deleted file mode 100755 index 2741563f04..0000000000 --- a/utils/mkpatch +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# This script makes a patch for LLVM ensuring the correct diff options and -# putting the files in a standard review order. - - -function error { - retcode="$?" - echo "mkpatch: error: $1 ($retcode)" - exit 1 -} - -if [ ! -e llvm.spec.in ] ; then - error "Please change directory to the LLVM top source directory" -fi -if [ "$#" -ne 1 ] ; then - error "usage: utils/mkpatch [PATCH_NAME]" -fi -NAME="$1" -echo "mkpatch: Generating differences on top level files" -svn diff -N -x -u > "$NAME".patch.raw 2>&1 -echo "mkpatch: Generating differences on all directories" -svn diff -x -u >> "$NAME".patch.raw 2>&1 \ - autoconf docs utils include lib/System lib/Support lib/VMCore lib/AsmParser \ - lib/Bitcode lib/Analysis lib/Transforms lib/CodeGen lib/Target \ - lib/ExecutionEngine lib/Linker lib/MC \ - tools test unittests runtime projects examples Xcode - -echo "mkpatch: Removing cruft from the patch file" -sed -e '/^[?] .*/d' -e '/^cvs diff: Diffing/d' "$NAME".patch.raw | awk '\ -BEGIN { deleting = 0; } \ -/^Index: .*[.]cvs$/ { deleting = 1; fname=substr($0,7); \ - print "Skipping: ", fname > "/dev/stderr"; } \ -/^Index:.*/ && !/^Index: .*[.]cvs$/ { deleting = 0; } \ -{ if (! deleting) { print; } } ' > "$NAME".patch || \ - error "sed/awk cleanup failed" - |