summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bindings/python/README.txt5
-rw-r--r--bindings/python/clang/cindex.py6
-rw-r--r--tools/CMakeLists.txt2
-rw-r--r--tools/Makefile4
-rw-r--r--tools/c-index-test/CMakeLists.txt2
-rw-r--r--tools/c-index-test/Makefile2
-rw-r--r--tools/libclang/CIndex.cpp (renamed from tools/CIndex/CIndex.cpp)0
-rw-r--r--tools/libclang/CIndexCodeCompletion.cpp (renamed from tools/CIndex/CIndexCodeCompletion.cpp)0
-rw-r--r--tools/libclang/CIndexDiagnostic.cpp (renamed from tools/CIndex/CIndexDiagnostic.cpp)0
-rw-r--r--tools/libclang/CIndexDiagnostic.h (renamed from tools/CIndex/CIndexDiagnostic.h)0
-rw-r--r--tools/libclang/CIndexInclusionStack.cpp (renamed from tools/CIndex/CIndexInclusionStack.cpp)0
-rw-r--r--tools/libclang/CIndexUSRs.cpp (renamed from tools/CIndex/CIndexUSRs.cpp)0
-rw-r--r--tools/libclang/CIndexer.cpp (renamed from tools/CIndex/CIndexer.cpp)0
-rw-r--r--tools/libclang/CIndexer.h (renamed from tools/CIndex/CIndexer.h)0
-rw-r--r--tools/libclang/CMakeLists.txt (renamed from tools/CIndex/CMakeLists.txt)11
-rw-r--r--tools/libclang/CXCursor.cpp (renamed from tools/CIndex/CXCursor.cpp)0
-rw-r--r--tools/libclang/CXCursor.h (renamed from tools/CIndex/CXCursor.h)0
-rw-r--r--tools/libclang/CXSourceLocation.h (renamed from tools/CIndex/CXSourceLocation.h)0
-rw-r--r--tools/libclang/Makefile (renamed from tools/CIndex/Makefile)6
-rw-r--r--tools/libclang/libclang.darwin.exports (renamed from tools/CIndex/CIndex.darwin.exports)0
-rw-r--r--tools/libclang/libclang.exports (renamed from tools/CIndex/CIndex.exports)0
21 files changed, 19 insertions, 19 deletions
diff --git a/bindings/python/README.txt b/bindings/python/README.txt
index ccc2619ccf..742cf8fbb8 100644
--- a/bindings/python/README.txt
+++ b/bindings/python/README.txt
@@ -2,10 +2,9 @@
// Clang Python Bindings
//===----------------------------------------------------------------------===//
-This directory implements Python bindings for Clang. Currently, only bindings
-for the CIndex C API exist.
+This directory implements Python bindings for Clang.
-You may need to alter LD_LIBRARY_PATH so that the CIndex library can be
+You may need to alter LD_LIBRARY_PATH so that the Clang library can be
found. The unit tests are designed to be run with 'nosetests'. For example:
--
$ env PYTHONPATH=$(echo ~/llvm/tools/clang/bindings/python/) \
diff --git a/bindings/python/clang/cindex.py b/bindings/python/clang/cindex.py
index f4409aec33..f0f81b5d69 100644
--- a/bindings/python/clang/cindex.py
+++ b/bindings/python/clang/cindex.py
@@ -71,11 +71,11 @@ def get_cindex_library():
import platform
name = platform.system()
if name == 'Darwin':
- return cdll.LoadLibrary('libCIndex.dylib')
+ return cdll.LoadLibrary('libclang.dylib')
elif name == 'Windows':
- return cdll.LoadLibrary('libCIndex.dll')
+ return cdll.LoadLibrary('libclang.dll')
else:
- return cdll.LoadLibrary('libCIndex.so')
+ return cdll.LoadLibrary('libclang.so')
# ctypes doesn't implicitly convert c_void_p to the appropriate wrapper
# object. This is a problem, because it means that from_parameter will see an
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 64c3a213cd..ae33b782d4 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_subdirectory(CIndex)
+add_subdirectory(libclang)
add_subdirectory(c-index-test)
add_subdirectory(driver)
diff --git a/tools/Makefile b/tools/Makefile
index bfd5ad12f9..8407dfdedd 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,12 +8,12 @@
##===----------------------------------------------------------------------===##
LEVEL := ../../..
-DIRS := driver CIndex c-index-test
+DIRS := driver libclang c-index-test
include $(LEVEL)/Makefile.config
ifeq ($(OS), $(filter $(OS), Cygwin MingW))
-DIRS := $(filter-out CIndex c-index-test, $(DIRS))
+DIRS := $(filter-out libclang c-index-test, $(DIRS))
endif
include $(LEVEL)/Makefile.common
diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index f0a34a5798..d965fd2b51 100644
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -1,7 +1,7 @@
set(LLVM_NO_RTTI 1)
set( LLVM_USED_LIBS
- CIndex
+ libclang
clangIndex
clangFrontend
clangDriver
diff --git a/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index 1412563617..24fed16006 100644
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -17,7 +17,7 @@ TOOL_NO_EXPORTS = 1
include $(LEVEL)/Makefile.config
LINK_COMPONENTS := bitreader mc core
-USEDLIBS = CIndex.a clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
+USEDLIBS = clang.a clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
include $(LLVM_SRC_ROOT)/Makefile.rules
diff --git a/tools/CIndex/CIndex.cpp b/tools/libclang/CIndex.cpp
index f9f735113f..f9f735113f 100644
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
diff --git a/tools/CIndex/CIndexCodeCompletion.cpp b/tools/libclang/CIndexCodeCompletion.cpp
index a21614c747..a21614c747 100644
--- a/tools/CIndex/CIndexCodeCompletion.cpp
+++ b/tools/libclang/CIndexCodeCompletion.cpp
diff --git a/tools/CIndex/CIndexDiagnostic.cpp b/tools/libclang/CIndexDiagnostic.cpp
index 3db37b97da..3db37b97da 100644
--- a/tools/CIndex/CIndexDiagnostic.cpp
+++ b/tools/libclang/CIndexDiagnostic.cpp
diff --git a/tools/CIndex/CIndexDiagnostic.h b/tools/libclang/CIndexDiagnostic.h
index 919c21cfdb..919c21cfdb 100644
--- a/tools/CIndex/CIndexDiagnostic.h
+++ b/tools/libclang/CIndexDiagnostic.h
diff --git a/tools/CIndex/CIndexInclusionStack.cpp b/tools/libclang/CIndexInclusionStack.cpp
index e86323956f..e86323956f 100644
--- a/tools/CIndex/CIndexInclusionStack.cpp
+++ b/tools/libclang/CIndexInclusionStack.cpp
diff --git a/tools/CIndex/CIndexUSRs.cpp b/tools/libclang/CIndexUSRs.cpp
index f3c74e8531..f3c74e8531 100644
--- a/tools/CIndex/CIndexUSRs.cpp
+++ b/tools/libclang/CIndexUSRs.cpp
diff --git a/tools/CIndex/CIndexer.cpp b/tools/libclang/CIndexer.cpp
index d5131ff6d8..d5131ff6d8 100644
--- a/tools/CIndex/CIndexer.cpp
+++ b/tools/libclang/CIndexer.cpp
diff --git a/tools/CIndex/CIndexer.h b/tools/libclang/CIndexer.h
index 31bf779ea4..31bf779ea4 100644
--- a/tools/CIndex/CIndexer.h
+++ b/tools/libclang/CIndexer.h
diff --git a/tools/CIndex/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index 609719e627..df4884be61 100644
--- a/tools/CIndex/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -18,7 +18,7 @@ set( LLVM_LINK_COMPONENTS
core
)
-add_clang_library(CIndex
+add_clang_library(libclang
CIndex.cpp
CIndexCodeCompletion.cpp
CIndexDiagnostic.cpp
@@ -28,6 +28,7 @@ add_clang_library(CIndex
CXCursor.cpp
../../include/clang-c/Index.h
)
+set_target_properties(libclang PROPERTIES OUTPUT_NAME clang)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# FIXME: Deal with LLVM_SUBMIT_VERSION?
@@ -36,9 +37,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# get underscore-prefixed names. It would be better to have build rules
# which know how to produce a darwin-suitable exports file from the
# regular exports file.
- set_target_properties(CIndex
+ set_target_properties(libclang
PROPERTIES
- LINK_FLAGS "-avoid-version -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_SOURCE_DIR}/CIndex.darwin.exports -Wl,-dead_strip -Wl,-seg1addr -Wl,0xE0000000"
+ LINK_FLAGS "-avoid-version -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_SOURCE_DIR}/libclang.darwin.exports -Wl,-dead_strip -Wl,-seg1addr -Wl,0xE0000000"
INSTALL_NAME_DIR "@executable_path/../lib"
)
endif()
@@ -47,10 +48,10 @@ if(MSVC)
# windows.h doesn't compile with /Za
get_target_property(NON_ANSI_COMPILE_FLAGS CIndex COMPILE_FLAGS)
string(REPLACE /Za "" NON_ANSI_COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
- set_target_properties(CIndex PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
+ set_target_properties(libclang PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
endif(MSVC)
-set_target_properties(CIndex
+set_target_properties(libclang
PROPERTIES
LINKER_LANGUAGE CXX
DEFINE_SYMBOL _CINDEX_LIB_)
diff --git a/tools/CIndex/CXCursor.cpp b/tools/libclang/CXCursor.cpp
index c8eb482377..c8eb482377 100644
--- a/tools/CIndex/CXCursor.cpp
+++ b/tools/libclang/CXCursor.cpp
diff --git a/tools/CIndex/CXCursor.h b/tools/libclang/CXCursor.h
index 1664f5a9ce..1664f5a9ce 100644
--- a/tools/CIndex/CXCursor.h
+++ b/tools/libclang/CXCursor.h
diff --git a/tools/CIndex/CXSourceLocation.h b/tools/libclang/CXSourceLocation.h
index 66566c1268..66566c1268 100644
--- a/tools/CIndex/CXSourceLocation.h
+++ b/tools/libclang/CXSourceLocation.h
diff --git a/tools/CIndex/Makefile b/tools/libclang/Makefile
index 391746d4d4..a7877bf8e1 100644
--- a/tools/CIndex/Makefile
+++ b/tools/libclang/Makefile
@@ -1,4 +1,4 @@
-##===- tools/CIndex/Makefile -------------------------------*- Makefile -*-===##
+##===- tools/libclang/Makefile -----------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
@@ -8,9 +8,9 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../../..
-LIBRARYNAME = CIndex
+LIBRARYNAME = clang
-EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/CIndex.exports
+EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libclang.exports
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
diff --git a/tools/CIndex/CIndex.darwin.exports b/tools/libclang/libclang.darwin.exports
index b361168053..b361168053 100644
--- a/tools/CIndex/CIndex.darwin.exports
+++ b/tools/libclang/libclang.darwin.exports
diff --git a/tools/CIndex/CIndex.exports b/tools/libclang/libclang.exports
index 991bb067f7..991bb067f7 100644
--- a/tools/CIndex/CIndex.exports
+++ b/tools/libclang/libclang.exports
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 13:45:25 +0000