[llvm-commits] [llvm] r110203 - in /llvm/trunk: docs/DeveloperPolicy.html utils/mkpatch

[Dan Gohman]

Author: djg
Date: Wed Aug  4 11:07:22 2010
New Revision: 110203

URL: http://llvm.org/viewvc/llvm-project?rev=110203&view=rev
Log:
Delete mkpatch. Everything it does is already done by svn diff by default.

Removed:
    llvm/trunk/utils/mkpatch
Modified:
    llvm/trunk/docs/DeveloperPolicy.html

Modified: llvm/trunk/docs/DeveloperPolicy.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/DeveloperPolicy.html?rev=110203&r1=110202&r2=110203&view=diff
==============================================================================
--- llvm/trunk/docs/DeveloperPolicy.html (original)
+++ llvm/trunk/docs/DeveloperPolicy.html Wed Aug  4 11:07:22 2010
@@ -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 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>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>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

Removed: llvm/trunk/utils/mkpatch
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/mkpatch?rev=110202&view=auto
==============================================================================
--- llvm/trunk/utils/mkpatch (original)
+++ llvm/trunk/utils/mkpatch (removed)
@@ -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"
-