Skip to content

Commit 6a15cbe

Browse files
committed
Also update clang to r191429; gitignore must not ignore clang! Add more Win files.
1 parent a3cdba2 commit 6a15cbe

File tree

86 files changed

+23889
-6657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+23889
-6657
lines changed

.gitattributes

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
*.sln eol=crlf
66
*.dsp eol=crlf
77
*.dsw eol=crlf
8+
*.bat eol=crlf
9+
*.cs eol=crlf
10+
*.csproj eol=crlf
11+
*.vsct eol=crlf
12+
*.resx eol=crlf
13+
*.vsixmanifest eol=crlf
814

915
# Denote all files that are truly binary and should not be modified.
1016
*.png binary

interpreter/llvm/src/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ projects/*
3939
!projects/CMakeLists.txt
4040
!projects/Makefile
4141
# Clang, which is tracked independently.
42-
tools/clang
42+
# but not for ROOT!
43+
# tools/clang
4344
# LLDB, which is tracked independently.
4445
tools/lldb
4546
# lld, which is tracked independently.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BasedOnStyle: LLVM
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
if (DOXYGEN_FOUND)
3+
if (LLVM_ENABLE_DOXYGEN)
4+
set(abs_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
5+
set(abs_builddir ${CMAKE_CURRENT_BINARY_DIR})
6+
7+
if (HAVE_DOT)
8+
set(DOT ${LLVM_PATH_DOT})
9+
endif()
10+
11+
if (LLVM_DOXYGEN_EXTERNAL_SEARCH)
12+
set(enable_searchengine "YES")
13+
set(searchengine_url "${LLVM_DOXYGEN_SEARCHENGINE_URL}")
14+
set(enable_server_based_search "YES")
15+
set(enable_external_search "YES")
16+
set(extra_search_mappings "${LLVM_DOXYGEN_SEARCH_MAPPINGS}")
17+
else()
18+
set(enable_searchengine "NO")
19+
set(searchengine_url "")
20+
set(enable_server_based_search "NO")
21+
set(enable_external_search "NO")
22+
set(extra_search_mappings "")
23+
endif()
24+
25+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxygen.cfg.in
26+
${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg @ONLY)
27+
28+
set(abs_top_srcdir)
29+
set(abs_top_builddir)
30+
set(DOT)
31+
set(enable_searchengine)
32+
set(searchengine_url)
33+
set(enable_server_based_search)
34+
set(enable_external_search)
35+
set(extra_search_mappings)
36+
37+
add_custom_target(doxygen-clang
38+
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
39+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
40+
COMMENT "Generating clang doxygen documentation." VERBATIM)
41+
42+
if (LLVM_BUILD_DOCS)
43+
add_dependencies(doxygen doxygen-clang)
44+
endif()
45+
46+
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
47+
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html
48+
DESTINATION docs/html)
49+
endif()
50+
endif()
51+
endif()

0 commit comments

Comments
 (0)