Author: teemperor Date: Tue Jul 16 02:27:02 2019 New Revision: 366196 URL: http://llvm.org/viewvc/llvm-project?rev=366196&view=rev Log: [lldb] Rename Options.inc to CommandOptions.inc [NFC]
It seems having two Options.inc files in the same project is giving our custom Xcode project a hard time. This patch renames the new Options.inc to CommandOptions.inc to prevent this conflict. Modified: lldb/trunk/source/Commands/CMakeLists.txt lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp lldb/trunk/source/Commands/CommandObjectHelp.cpp lldb/trunk/source/Commands/CommandObjectSettings.cpp lldb/trunk/source/Commands/CommandObjectTarget.cpp Modified: lldb/trunk/source/Commands/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CMakeLists.txt?rev=366196&r1=366195&r2=366196&view=diff ============================================================================== --- lldb/trunk/source/Commands/CMakeLists.txt (original) +++ lldb/trunk/source/Commands/CMakeLists.txt Tue Jul 16 02:27:02 2019 @@ -1,4 +1,4 @@ -lldb_tablegen(Options.inc -gen-lldb-option-defs +lldb_tablegen(CommandOptions.inc -gen-lldb-option-defs SOURCE Options.td TARGET LLDBOptionsGen) Modified: lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp?rev=366196&r1=366195&r2=366196&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp Tue Jul 16 02:27:02 2019 @@ -1249,7 +1249,7 @@ static constexpr OptionDefinition g_brea // FIXME: We need to add an "internal" command, and then add this sort of // thing to it. But I need to see it for now, and don't want to wait. #define LLDB_OPTIONS_breakpoint_list -#include "Options.inc" +#include "CommandOptions.inc" }; #pragma mark List Modified: lldb/trunk/source/Commands/CommandObjectHelp.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectHelp.cpp?rev=366196&r1=366195&r2=366196&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectHelp.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectHelp.cpp Tue Jul 16 02:27:02 2019 @@ -67,7 +67,7 @@ CommandObjectHelp::~CommandObjectHelp() static constexpr OptionDefinition g_help_options[] = { #define LLDB_OPTIONS_help -#include "Options.inc" +#include "CommandOptions.inc" }; llvm::ArrayRef<OptionDefinition> Modified: lldb/trunk/source/Commands/CommandObjectSettings.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSettings.cpp?rev=366196&r1=366195&r2=366196&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectSettings.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectSettings.cpp Tue Jul 16 02:27:02 2019 @@ -23,7 +23,7 @@ using namespace lldb_private; static constexpr OptionDefinition g_settings_set_options[] = { #define LLDB_OPTIONS_settings_set -#include "Options.inc" +#include "CommandOptions.inc" }; class CommandObjectSettingsSet : public CommandObjectRaw { @@ -312,7 +312,7 @@ protected: static constexpr OptionDefinition g_settings_write_options[] = { #define LLDB_OPTIONS_settings_write -#include "Options.inc" +#include "CommandOptions.inc" }; class CommandObjectSettingsWrite : public CommandObjectParsed { @@ -435,7 +435,7 @@ private: static constexpr OptionDefinition g_settings_read_options[] = { #define LLDB_OPTIONS_settings_read -#include "Options.inc" +#include "CommandOptions.inc" }; class CommandObjectSettingsRead : public CommandObjectParsed { Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=366196&r1=366195&r2=366196&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Tue Jul 16 02:27:02 2019 @@ -1968,7 +1968,7 @@ static constexpr OptionEnumValueElement static constexpr OptionDefinition g_target_modules_dump_symtab_options[] = { #define LLDB_OPTIONS_target_modules_dump_symtab -#include "Options.inc" +#include "CommandOptions.inc" }; class CommandObjectTargetModulesDumpSymtab _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits