Ticket #40615: macports_clang-format-v2.patch

dports/lang/llvm-3.4/Portfile

@@ -43 +43 @@
                         library to parse C/C++ code.
 
     depends_lib         port:llvm-${llvm_version} port:libffi
-    depends_run         port:clang_select port:ld64
+    depends_run         port:clang_select port:ld64 port:python27
     depends_extract     bin:svn:subversion
     depends_skip_archcheck-append ld64 subversion
 
@@ -102 +102 @@
 patch.pre_args  -p1
 
 if {${subport} == "clang-${llvm_version}"} {
-    patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
-                         0001-Comment-out-SL-cctools-workaround.patch
-
+    patchfiles-append   tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
+                        0001-Comment-out-SL-cctools-workaround.patch \
+                        install_clang-format.patch clang-format_executable_bbedit.patch \
+                        clang-format_executable_diff.patch clang-format_executable_el.patch \
+                        clang-format_executable_py.patch clang-format_executable_sublime.patch
     build.target        clang-only
     destroot.target     install-clang
 }
@@ -313 +315 @@
        default_variants-append +arm_runtime
     }
 
-    set pythonver ""
-    set pythonverdot ""
-
-    if {![variant_isset python25] && ![variant_isset python26]} {
-        default_variants-append +python27
-    }
-
-    variant python25 conflicts python26 python27 description {Use python 2.5} {
-        set pythonver 25
-        set pythonverdot 2.5
-        configure.args-append --with-python=${prefix}/bin/python2.5
-    }
-
-    variant python26 conflicts python25 python27 description {Use python 2.6} {
-        set pythonver 26
-        set pythonverdot 2.6
-        configure.args-append --with-python=${prefix}/bin/python2.6
-    }
-
-    variant python27 conflicts python25 python26 description {Use python 2.7} {
-        set pythonver 27
-        set pythonverdot 2.7
-        configure.args-append --with-python=${prefix}/bin/python2.7
-    }
-
     variant analyzer description {Install clang static analyzer} {
-        if {[string equal "${pythonver}" ""]} {
-            ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"
-            error "Invalid variant combination"
-        }
 
-        depends_run-append port:perl5 port:python${pythonver}
+        depends_run-append port:perl5
 
         post-patch {
             reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
                 ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
                 ${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
                 ${worksrcpath}/tools/clang/tools/scan-build/scan-build
-            reinplace "s|/usr/bin/env python|${prefix}/bin/python${pythonverdot}|g" \
+            reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
                 ${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
                 ${worksrcpath}/tools/clang/tools/scan-view/scan-view
         }
@@ -376 +349 @@
             reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/scan-view-${suffix}"
         }
     }
+
+
+    post-patch {
+        reinplace "s|@CLANG_FORMAT_PATH@|${prefix}/bin/clang-format-${suffix}|g" \
+            ${worksrcpath}/tools/clang/tools/clang-format/clang-format-bbedit.applescript \
+            ${worksrcpath}/tools/clang/tools/clang-format/clang-format-diff.py            \
+            ${worksrcpath}/tools/clang/tools/clang-format/clang-format-sublime.py         \
+            ${worksrcpath}/tools/clang/tools/clang-format/clang-format.el                 \
+            ${worksrcpath}/tools/clang/tools/clang-format/clang-format.py
+    }
+
+    post-destroot {
+        file mkdir ${destroot}${sub_prefix}/libexec
+        file copy ${worksrcpath}/tools/clang/tools/clang-format ${destroot}${sub_prefix}/libexec/clang-format
+
+        file delete -force ${destroot}${sub_prefix}/libexec/clang-format/.svn
+        file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Makefile
+        file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Release+Debug+Asserts
+        file delete -force ${destroot}${sub_prefix}/libexec/clang-format/CMakeLists.txt
+        file delete -force ${destroot}${sub_prefix}/libexec/clang-format/ClangFormat.cpp
+    }
 }
 
 livecheck.type          none

new file dports/lang/llvm-3.4/files/clang-format_executable_bbedit.patch

@@ +1 @@
+--- a/tools/clang/tools/clang-format/clang-format-bbedit.applescript    2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-bbedit.applescript    2012-04-20 10:09:40.000000000 -0700
+@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
+ end tell
+ 
+ set filePath to urlToPOSIXPath(fileURL)
+-set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
++set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
+ 
+ tell application "BBEdit"
+        -- "set contents of text document 1 to newContents" scrolls to the bottom while

new file dports/lang/llvm-3.4/files/clang-format_executable_diff.patch

@@ +1 @@
+--- a/tools/clang/tools/clang-format/clang-format-diff.py       2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-diff.py       2012-04-20 10:09:40.000000000 -0700
+@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
+ 
+ 
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+ 
+ 
+ def main():
+ 

new file dports/lang/llvm-3.4/files/clang-format_executable_el.patch

@@ +1 @@
+--- a/tools/clang/tools/clang-format/clang-format.el    2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format.el    2012-04-20 10:09:40.000000000 -0700
+@@ -13,7 +13,7 @@ ifeq ($(HOST_OS),Darwin)
+ 
+ ;; *Location of the clang-format binary. If it is on your PATH, a full path name
+ ;; need not be specified.
+-(defvar clang-format-binary "clang-format")
++(defvar clang-format-binary "@CLANG_FORMAT_PATH@")
+ 
+ (defun clang-format-region ()
+   "Use clang-format to format the currently active region."

new file dports/lang/llvm-3.4/files/clang-format_executable_py.patch

@@ +1 @@
+--- a/tools/clang/tools/clang-format/clang-format.py    2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format.py    2012-04-20 10:09:40.000000000 -0700
+@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),Darwin)
+ import vim
+ 
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+ 
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
+ 

new file dports/lang/llvm-3.4/files/clang-format_executable_sublime.patch

@@ +1 @@
+--- a/tools/clang/tools/clang-format/clang-format-sublime.py2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-sublime.py    2012-04-20 10:09:40.000000000 -0700
+@@ -18,7 +18,7 @@ ifeq ($(HOST_OS),Darwin)
+ import subprocess
+ 
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+ 
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for

new file dports/lang/llvm-3.4/files/install_clang-format.patch

@@ +1 @@
+--- a/Makefile  2013-10-02 08:42:23.000000000 -0700
++++ b/Makefile  2013-10-24 10:57:33.000000000 -0700
+@@ -70,8 +70,9 @@ ifeq ($(MAKECMDGOALS),install-clang)
+   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
+           tools/clang/tools/libclang \
+           tools/clang/tools/c-index-test \
+           tools/clang/runtime tools/clang/docs \
+-          tools/clang/include tools/clang/lib
++          tools/clang/include tools/clang/lib \
++          tools/clang/tools/clang-format
+   OPTIONAL_DIRS :=
+   NO_INSTALL = 1
+ endif