Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-29 16:41:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Renamed module.map to module.modulemap (modularize).

Browse Source 
llvm-svn: 228693
This commit is contained in:
John Thompson 2015-02-10 14:45:30 +00:00
parent e0aa5fea15
commit 5d9862f071
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang-tools-extra/modularize/Modularize.cpp
View File

@ -90,16 +90,17 @@
//
// See PreprocessorTracker.cpp for additional details.
//
// Modularize also has an option ("-module-map-path=module.map") that will
// skip the checks, and instead act as a module.map generation assistant,
// Modularize also has an option ("-module-map-path=module.modulemap") that will
// skip the checks, and instead act as a module.modulemap generation assistant,
// generating a module map file based on the header list. An optional
// "-root-module=(rootName)" argument can specify a root module to be
// created in the generated module.map file. Note that you will likely
// created in the generated module.modulemap file. Note that you will likely
// need to edit this file to suit the needs of your headers.
//
// An example command line for generating a module.map file:
// An example command line for generating a module.modulemap file:
//
// modularize -module-map-path=module.map -root-module=myroot headerlist.txt
// modularize -module-map-path=module.modulemap -root-module=myroot \
// headerlist.txt
//
// Note that if the headers in the header list have partial paths, sub-modules
// will be created for the subdirectires involved, assuming that the
@ -679,7 +680,7 @@ int main(int Argc, const char **Argv) {
// Save program name for error messages.
Argv0 = Argv[0];
// Save program arguments for use in module.map comment.
// Save program arguments for use in module.modulemap comment.
CommandLine = sys::path::stem(sys::path::filename(Argv0));
for (int ArgIndex = 1; ArgIndex < Argc; ArgIndex++) {
CommandLine.append(" ");

4
clang-tools-extra/modularize/ModuleAssistant.cpp
View File

@ -129,7 +129,7 @@ Module *Module::findSubModule(llvm::StringRef SubName) {
// Implementation functions:
// Reserved keywords in module.map syntax.
// Reserved keywords in module.modulemap syntax.
// Keep in sync with keywords in module map parser in Lex/ModuleMap.cpp,
// such as in ModuleMapParser::consumeToken().
static const char *ReservedNames[] = {
@ -175,7 +175,7 @@ static bool addModuleDescription(Module *RootModule,
if (Count != 0) {
llvm::errs() << "warning: " << FilePath
<< " depends on other headers being included first,"
" meaning the module.map won't compile."
" meaning the module.modulemap won't compile."
" This header will be omitted from the module map.\n";
return true;
}