diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 891bf842db9efe288980282a5a52328d1a0d949f..dba676a1f75619639ac4b8d463ad6626e7034242 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -5,6 +5,8 @@ add_clang_subdirectory(driver)
add_clang_subdirectory(clang-format)
add_clang_subdirectory(clang-format-vs)
add_clang_subdirectory(clang-fuzzer)
+add_clang_subdirectory(scan-build)
+add_clang_subdirectory(scan-view)
add_clang_subdirectory(c-index-test)
add_clang_subdirectory(libclang)
diff --git a/tools/Makefile b/tools/Makefile
index 2ee12992f23ff2d4b9499d45af6cbb199bb5dadf..5c362bfc9aade98521c64588b6351838bf88382d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,7 +15,7 @@ DIRS :=
PARALLEL_DIRS := clang-format driver diagtool
ifeq ($(ENABLE_CLANG_STATIC_ANALYZER), 1)
- PARALLEL_DIRS += clang-check
+ PARALLEL_DIRS += clang-check scan-build scan-view
endif
ifeq ($(ENABLE_CLANG_ARCMT), 1)
diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0f7753d861f6dd95faf46bb14d57ca43549938d0
--- /dev/null
+++ b/tools/scan-build/CMakeLists.txt
@@ -0,0 +1,71 @@
+add_custom_target(scan-build ALL)
+
+option(CLANG_INSTALL_SCANBUILD "Install the scan-build tool" ON)
+
+if (WIN32 AND NOT CYGWIN)
+ set(BinFiles
+ scan-build.bat)
+ set(LibexecFiles
+ ccc-analyzer.bat
+ c++-analyzer.bat)
+else()
+ set(BinFiles
+ scan-build)
+ set(LibexecFiles
+ ccc-analyzer
+ c++-analyzer)
+ if (APPLE)
+ set(BinFiles ${BinFiles}
+ set-xcode-analyzer)
+ endif()
+endif()
+
+set(ManPages
+ scan-build.1)
+
+set(ResourceFiles
+ scanview.css
+ sorttable.js)
+
+
+if(CLANG_INSTALL_SCANBUILD)
+ foreach(BinFile ${BinFiles})
+ add_custom_command(TARGET scan-build PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${CMAKE_BINARY_DIR}/bin
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile}
+ ${CMAKE_BINARY_DIR}/bin/)
+ install(PROGRAMS ${BinFile} DESTINATION bin)
+ endforeach()
+
+ foreach(LibexecFile ${LibexecFiles})
+ add_custom_command(TARGET scan-build PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${CMAKE_BINARY_DIR}/libexec
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/${LibexecFile}
+ ${CMAKE_BINARY_DIR}/libexec/)
+ install(PROGRAMS ${LibexecFile} DESTINATION libexec)
+ endforeach()
+
+ foreach(ManPage ${ManPages})
+ add_custom_command(TARGET scan-build PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${CMAKE_BINARY_DIR}/share/man/man1
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/${ManPage}
+ ${CMAKE_BINARY_DIR}/share/man/man1/)
+ install(PROGRAMS scan-build.1 DESTINATION share/man/man1)
+ endforeach()
+
+ foreach(ResourceFile ${ResourceFiles})
+ add_custom_command(TARGET scan-build PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${CMAKE_BINARY_DIR}/bin
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile}
+ ${CMAKE_BINARY_DIR}/bin/)
+ install(FILES ${ResourceFile} DESTINATION bin)
+ endforeach()
+endif()
diff --git a/tools/scan-build/Makefile b/tools/scan-build/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a6a2c10ce08099a6c9ca28ede431174bbe46d6dd
--- /dev/null
+++ b/tools/scan-build/Makefile
@@ -0,0 +1,53 @@
+##===- tools/scan-build/Makefile ---------------------------*- Makefile -*-===##
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ../..
+
+include $(CLANG_LEVEL)/../../Makefile.config
+include $(CLANG_LEVEL)/Makefile
+
+ifeq ($(HOST_OS),MingW)
+ Suffix := .bat
+endif
+
+CLANG_INSTALL_SCANBUILD ?= 1
+
+ifeq ($(CLANG_INSTALL_SCANBUILD), 1)
+ InstallTargets := $(ToolDir)/scan-build$(Suffix) \
+ $(LibexecDir)/c++-analyzer$(Suffix) \
+ $(LibexecDir)/ccc-analyzer$(Suffix) \
+ $(ShareDir)/scan-build/scanview.css \
+ $(ShareDir)/scan-build/sorttable.js \
+ $(ShareDir)/man/man1/scan-build.1
+
+ ifeq ($(HOST_OS),Darwin)
+ InstallTargets := $(InstallTargets) $(ToolDir)/set-xcode-analyzer
+ endif
+endif
+
+all:: $(InstallTargets)
+
+$(ToolDir)/%: % Makefile $(ToolDir)/.dir
+ $(Echo) "Copying $(notdir $<) to the 'bin' directory..."
+ $(Verb)cp $< $@
+ $(Verb)chmod +x $@
+
+$(LibexecDir)/%: % Makefile $(LibexecDir)/.dir
+ $(Echo) "Copying $(notdir $<) to the 'libexec' directory..."
+ $(Verb)cp $< $@
+ $(Verb)chmod +x $@
+
+$(ShareDir)/man/man1/%: % Makefile $(ShareDir)/man/man1/.dir
+ $(Echo) "Copying $(notdir $<) to the 'share' directory..."
+ $(Verb)cp $< $@
+
+$(ShareDir)/scan-build/%: % Makefile $(ShareDir)/scan-build/.dir
+ $(Echo) "Copying $(notdir $<) to the 'share' directory..."
+ $(Verb)cp $< $@
+
diff --git a/tools/scan-build/scan-build b/tools/scan-build/scan-build
index 24796c7ae28fdb278dcfecdab26242535c608a08..65dc4fe1fa33784c64bd587f4bf3f7ae0eba1c45 100755
--- a/tools/scan-build/scan-build
+++ b/tools/scan-build/scan-build
@@ -1737,8 +1737,8 @@ $Options{OutputDir} = GetHTMLRunDir($Options{OutputDir});
# Determine the location of ccc-analyzer.
my $AbsRealBin = Cwd::realpath($RealBin);
-my $Cmd = "$AbsRealBin/libexec/ccc-analyzer";
-my $CmdCXX = "$AbsRealBin/libexec/c++-analyzer";
+my $Cmd = "$AbsRealBin/../libexec/ccc-analyzer";
+my $CmdCXX = "$AbsRealBin/../libexec/c++-analyzer";
# Portability: use less strict but portable check -e (file exists) instead of
# non-portable -x (file is executable). On some windows ports -x just checks
diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bfff39d11fc4f45cd88aec686411dbeeaf770abf
--- /dev/null
+++ b/tools/scan-view/CMakeLists.txt
@@ -0,0 +1,33 @@
+add_custom_target(scan-view ALL)
+
+option(CLANG_INSTALL_SCANVIEW "Install the scan-view tool" ON)
+
+set(BinFiles
+ Reporter.py
+ ScanView.py
+ scan-view
+ startfile.py)
+
+file(GLOB ResourceFiles Resources/*)
+
+if(CLANG_INSTALL_SCANVIEW)
+ foreach(BinFile ${BinFiles})
+ add_custom_command(TARGET scan-view PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${CMAKE_BINARY_DIR}/bin
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile}
+ ${CMAKE_BINARY_DIR}/bin/)
+ install(PROGRAMS ${BinFile} DESTINATION bin)
+ endforeach()
+
+ foreach(ResourceFile ${ResourceFiles})
+ add_custom_command(TARGET scan-view PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${CMAKE_BINARY_DIR}/share/scan-view
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${ResourceFile}
+ ${CMAKE_BINARY_DIR}/share/scan-view/)
+ install(FILES ${ResourceFile} DESTINATION share/scan-view)
+ endforeach()
+endif()
diff --git a/tools/scan-view/Makefile b/tools/scan-view/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..c2ca453cc98b1bd6792a6e2127cc26958195219a
--- /dev/null
+++ b/tools/scan-view/Makefile
@@ -0,0 +1,37 @@
+##===- tools/scan-view/Makefile ----------------------------*- Makefile -*-===##
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ../..
+
+include $(CLANG_LEVEL)/../../Makefile.config
+include $(CLANG_LEVEL)/Makefile
+
+CLANG_INSTALL_SCANVIEW ?= 1
+
+ifeq ($(CLANG_INSTALL_SCANVIEW), 1)
+ InstallTargets := $(ToolDir)/Reporter.py \
+ $(ToolDir)/ScanView.py \
+ $(ToolDir)/scan-view \
+ $(ToolDir)/startfile.py \
+ $(ShareDir)/scan-view/FileRadar.scpt \
+ $(ShareDir)/scan-view/GetRadarVersion.scpt \
+ $(ShareDir)/scan-view/bugcatcher.ico
+endif
+
+all:: $(InstallTargets)
+
+$(ToolDir)/%: % Makefile $(ToolDir)/.dir
+ $(Echo) "Copying $(notdir $<) to the 'bin' directory..."
+ $(Verb)cp $< $@
+ $(Verb)chmod +x $@
+
+$(ShareDir)/scan-view/%: Resources/% Makefile $(ShareDir)/scan-view/.dir
+ $(Echo) "Copying $(notdir $<) to the 'share' directory..."
+ $(Verb)cp $< $@
+
diff --git a/tools/scan-view/Reporter.py b/tools/scan-view/Reporter.py
index 9560fc1aabbb3d87d7c7471154b0ca3ed620113f..294e05b44c251672a40ab7f02cf5fc2b130abd25 100644
--- a/tools/scan-view/Reporter.py
+++ b/tools/scan-view/Reporter.py
@@ -175,7 +175,7 @@ class RadarReporter:
@staticmethod
def isAvailable():
# FIXME: Find this .scpt better
- path = os.path.join(os.path.dirname(__file__),'Resources/GetRadarVersion.scpt')
+ path = os.path.join(os.path.dirname(__file__),'../share/scan-view/GetRadarVersion.scpt')
try:
p = subprocess.Popen(['osascript',path],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -206,7 +206,7 @@ class RadarReporter:
if not componentVersion.strip():
componentVersion = 'X'
- script = os.path.join(os.path.dirname(__file__),'Resources/FileRadar.scpt')
+ script = os.path.join(os.path.dirname(__file__),'../share/scan-view/FileRadar.scpt')
args = ['osascript', script, component, componentVersion, classification, personID, report.title,
report.description, diagnosis, config] + map(os.path.abspath, report.files)
# print >>sys.stderr, args
diff --git a/tools/scan-view/ScanView.py b/tools/scan-view/ScanView.py
index ee08baa8bad058e5c196bb66ead3d71b121c3d48..2336b090d96216b4684b91ccb5efa646b4c84432 100644
--- a/tools/scan-view/ScanView.py
+++ b/tools/scan-view/ScanView.py
@@ -73,7 +73,7 @@ kReportReplacements.append((re.compile('<!-- REPORTSUMMARYEXTRA -->'),
###
# Other simple parameters
-kResources = posixpath.join(posixpath.dirname(__file__), 'Resources')
+kResources = posixpath.join(posixpath.dirname(__file__), '../share/scan-view')
kConfigPath = os.path.expanduser('~/.scanview.cfg')
###
diff --git a/www/analyzer/installation.html b/www/analyzer/installation.html
index 44c3784eaf152c647a334321510c020628d84901..6a855999c5fff7c68e2412a8359b165e0c21d012 100644
--- a/www/analyzer/installation.html
+++ b/www/analyzer/installation.html
@@ -100,11 +100,8 @@ binaries to the installation directory of your choice (specified when you run
<li>The locations of the <tt>scan-build</tt> and <tt>scan-view</tt>
programs.
-<p>Currently these are not installed using <tt>make install</tt>, and
-are located in <tt>$(SRCDIR)/tools/clang/tools/scan-build</tt> and
-<tt>$(SRCDIR)/tools/clang/tools/scan-view</tt> respectively (where
-<tt>$(SRCDIR)</tt> is the root LLVM source directory). These locations
-are subject to change.</p></li>
+<p>These are installed via <tt>make install</tt> into the bin directory
+when clang is built.</p></li>
</ul>
</div>