This is an archive of the discontinued LLVM Phabricator instance.

Differential D14403

Create install targets for scan-build and scan-view
ClosedPublic

Authored by jroelofs on Nov 5 2015, 4:02 PM.

Details

Reviewers
dcoughlin
jroelofs
krememek
zaks.anna
beanz

Diff Detail

Event Timeline

jroelofs updated this revision to Diff 39433.Nov 5 2015, 4:02 PM
jroelofs retitled this revision from to Create install targets for scan-build and scan-view.
jroelofs updated this object.
jroelofs added reviewers: zaks.anna, beanz.
jroelofs added a subscriber: cfe-commits.
jroelofs added a parent revision: D14405: Create Makefile variables for 'share' and 'libexec' for D14403.Nov 5 2015, 4:07 PM
jroelofs updated this revision to Diff 39439.Nov 5 2015, 4:13 PM

Update www too.

jroelofs added inline comments.Nov 5 2015, 4:15 PM
www/analyzer/installation.html
103

@zaks.anna Do you know if there was a particular reason for this? It's kind of a shame to have to use them from the src dir.

zaks.anna added a reviewer: krememek.Nov 5 2015, 5:16 PM
zaks.anna added a reviewer: dcoughlin.Nov 5 2015, 5:18 PM
zaks.anna added inline comments.Nov 5 2015, 5:24 PM
www/analyzer/installation.html
103

I do not know. Ted might know.

jroelofs updated this revision to Diff 39529.Nov 6 2015, 7:25 AM

Forgot to svn add after rebasing the patch on top of upstream.

beanz edited edge metadata.Nov 6 2015, 12:59 PM

I would prefer if installing these were optional and could be toggled on/off.

Other than that this all looks fine to me.

bcraig added a subscriber: bcraig.Nov 6 2015, 1:04 PM

For what it's worth, our internal branch installs these by default, and I was unpleasantly surprised when I found that upstream didn't.

jroelofs added a comment.Nov 6 2015, 3:08 PM
In D14403#284054, @beanz wrote:

I would prefer if installing these were optional and could be toggled on/off.

I'll add flags for that.

jroelofs updated this revision to Diff 39693.Nov 9 2015, 8:13 AM
jroelofs edited edge metadata.

Add flags to turn the new targets off.

jroelofs accepted this revision.Nov 9 2015, 8:15 AM
jroelofs added a reviewer: jroelofs.

r252474

This revision is now accepted and ready to land.Nov 9 2015, 8:15 AM
jroelofs closed this revision.Nov 9 2015, 8:15 AM

Revision Contents

PathSize
tools/
2 lines
2 lines
scan-build/
71 lines
53 lines
4 lines
scan-view/
33 lines
37 lines
4 lines
2 lines
www/
analyzer/
7 lines

Diff 39693

tools/CMakeLists.txt

Context not available.
add_clang_subdirectory(clang-format) add_clang_subdirectory(clang-format)
add_clang_subdirectory(clang-format-vs) add_clang_subdirectory(clang-format-vs)
add_clang_subdirectory(clang-fuzzer) add_clang_subdirectory(clang-fuzzer)
add_clang_subdirectory(scan-build)
add_clang_subdirectory(scan-view)
add_clang_subdirectory(c-index-test) add_clang_subdirectory(c-index-test)
add_clang_subdirectory(libclang) add_clang_subdirectory(libclang)
Context not available.

tools/Makefile

Context not available.
PARALLEL_DIRS := clang-format driver diagtool PARALLEL_DIRS := clang-format driver diagtool
ifeq ($(ENABLE_CLANG_STATIC_ANALYZER), 1) ifeq ($(ENABLE_CLANG_STATIC_ANALYZER), 1)
PARALLEL_DIRS += clang-check PARALLEL_DIRS += clang-check scan-build scan-view
endif endif
ifeq ($(ENABLE_CLANG_ARCMT), 1) ifeq ($(ENABLE_CLANG_ARCMT), 1)
Context not available.

tools/scan-build/CMakeLists.txt

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()

tools/scan-build/Makefile

##===- 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 $< $@

tools/scan-build/scan-build

Context not available.
# Determine the location of ccc-analyzer. # Determine the location of ccc-analyzer.
my $AbsRealBin = Cwd::realpath($RealBin); my $AbsRealBin = Cwd::realpath($RealBin);
my $Cmd = "$AbsRealBin/libexec/ccc-analyzer"; my $Cmd = "$AbsRealBin/../libexec/ccc-analyzer";
my $CmdCXX = "$AbsRealBin/libexec/c++-analyzer"; my $CmdCXX = "$AbsRealBin/../libexec/c++-analyzer";
# Portability: use less strict but portable check -e (file exists) instead of # 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 # non-portable -x (file is executable). On some windows ports -x just checks
Context not available.

tools/scan-view/CMakeLists.txt

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()

tools/scan-view/Makefile

##===- 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 $< $@

tools/scan-view/Reporter.py

Context not available.
@staticmethod @staticmethod
def isAvailable(): def isAvailable():
# FIXME: Find this .scpt better # 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: try:
p = subprocess.Popen(['osascript',path], p = subprocess.Popen(['osascript',path],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
Context not available.
if not componentVersion.strip(): if not componentVersion.strip():
componentVersion = 'X' 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, args = ['osascript', script, component, componentVersion, classification, personID, report.title,
report.description, diagnosis, config] + map(os.path.abspath, report.files) report.description, diagnosis, config] + map(os.path.abspath, report.files)
# print >>sys.stderr, args # print >>sys.stderr, args
Context not available.

tools/scan-view/ScanView.py

Context not available.
### ###
# Other simple parameters # 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') kConfigPath = os.path.expanduser('~/.scanview.cfg')
### ###
Context not available.

www/analyzer/installation.html

Context not available.
<li>The locations of the <tt>scan-build</tt> and <tt>scan-view</tt> <li>The locations of the <tt>scan-build</tt> and <tt>scan-view</tt>
programs. programs.
<p>Currently these are not installed using <tt>make install</tt>, and <p>These are installed via <tt>make install</tt> into the bin directory
jroelofsAuthorUnsubmitted
Not Done
ReplyInline Actions

@zaks.anna Do you know if there was a particular reason for this? It's kind of a shame to have to use them from the src dir.

jroelofs: @zaks.anna Do you know if there was a particular reason for this? It's kind of a shame to have…
zaks.annaUnsubmitted
Not Done
ReplyInline Actions

I do not know. Ted might know.

zaks.anna: I do not know. Ted might know.
are located in <tt>$(SRCDIR)/tools/clang/tools/scan-build</tt> and when clang is built.</p></li>
<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>
</ul> </ul>
</div> </div>
Context not available.