Remove DNBConfig.h

[brucem]

Summary

This was no longer needed and hasn't been needed since r143244
in 2011. This removes everything associated with generating
or using it.

[clayborg]

Looks good.

tools/debugserver/CMakeLists.txt

 project(C CXX ASM-ATT)
-add_subdirectory(scripts)
 add_subdirectory(source)

tools/debugserver/Makefile

 ##===- tools/debugserver/Makefile --------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #
 ##===----------------------------------------------------------------------===##
 LLDB_LEVEL := ../..
 
-DIRS := scripts source
+DIRS := source
 
-include $(LLDB_LEVEL)/Makefile
+include $(LLDB_LEVEL)/Makefile
 

tools/debugserver/debugserver.xcodeproj/project.pbxproj

/* Begin PBXFileReference section */
     26A68FAF0D1054DA00665A9E /* RNBSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNBSocket.h; sourceTree = "<group>"; };
     26A68FB00D1054DA00665A9E /* RNBSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RNBSocket.cpp; sourceTree = "<group>"; };
     26A68FD50D10574500665A9E /* RNBRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNBRemote.h; sourceTree = "<group>"; };
     26A68FD60D10574500665A9E /* RNBRemote.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RNBRemote.cpp; sourceTree = "<group>"; };
     26A8FE1E0D11A77B00203048 /* DNBTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNBTimer.h; sourceTree = "<group>"; };
     26ACA3340D3E956300A2120B /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
     26B67DE00EE9BC30006C8BC0 /* MachTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachTask.h; sourceTree = "<group>"; };
     26B67DE10EE9BC30006C8BC0 /* MachTask.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MachTask.mm; sourceTree = "<group>"; };
-    26C636AD0C71303A0024798E /* dbgnub-config.pl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; path = "dbgnub-config.pl"; sourceTree = "<group>"; };
     26C637D60C71334A0024798E /* DNB.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DNB.cpp; sourceTree = "<group>"; };
     26C637D70C71334A0024798E /* DNB.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNB.h; sourceTree = "<group>"; };
     26C637D80C71334A0024798E /* DNBArch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNBArch.h; sourceTree = "<group>"; };
     26C637D90C71334A0024798E /* DNBBreakpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DNBBreakpoint.cpp; sourceTree = "<group>"; };
     26C637DA0C71334A0024798E /* DNBBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNBBreakpoint.h; sourceTree = "<group>"; };
     26C637DB0C71334A0024798E /* DNBDataRef.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DNBDataRef.cpp; sourceTree = "<group>"; };
     26C637DC0C71334A0024798E /* DNBDataRef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNBDataRef.h; sourceTree = "<group>"; };
     26C637DD0C71334A0024798E /* DNBDefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = DNBDefs.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };

 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
     08FB7794FE84155DC02AAC07 /* dbgnub */ = {
       isa = PBXGroup;
       children = (
         26ACA3330D3E94F200A2120B /* Framework */,
         26C637D50C71334A0024798E /* source */,
-        26C636AC0C71303A0024798E /* scripts */,
         1AB674ADFE9D54B511CA2CBB /* Products */,
       );
       name = dbgnub;
       sourceTree = "<group>";
     };
     1AB674ADFE9D54B511CA2CBB /* Products */ = {
       isa = PBXGroup;
       children = (
26ACA3330D3E94F200A2120B /* Framework */ = {
       children = (
         ED128B7918E1F163003F6A7B /* libpmenergy.dylib */,
         ED128B7A18E1F163003F6A7B /* libpmsample.dylib */,
         26ACA3340D3E956300A2120B /* CoreFoundation.framework */,
       );
       name = Framework;
       sourceTree = "<group>";
     };
-    26C636AC0C71303A0024798E /* scripts */ = {
-      isa = PBXGroup;
-      children = (
-        26C636AD0C71303A0024798E /* dbgnub-config.pl */,
-      );
-      path = scripts;
-      sourceTree = "<group>";
-    };
     26C637D50C71334A0024798E /* source */ = {
       isa = PBXGroup;
       children = (
         26593A060D4931CC001C9FE3 /* ChangeLog */,
         26DEFD6C0D104C23008A5A07 /* debugserver */,
         26A028FF114AB6BB0029C479 /* libdebugnub */,
       );
       indentWidth = 4;
/* Begin PBXGroup section */
     };
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
     26CE0593115C31C20022F371 /* debugserver */ = {
       isa = PBXNativeTarget;
       buildConfigurationList = 26CE05A4115C31ED0022F371 /* Build configuration list for PBXNativeTarget "debugserver" */;
       buildPhases = (
-        26CE05C7115C36870022F371 /* ShellScript */,
         26CE0591115C31C20022F371 /* Sources */,
         26CE0592115C31C20022F371 /* Frameworks */,
         4C3326CB18B2A2F600EB5DD7 /* ShellScript */,
       );
       buildRules = (
       );
       dependencies = (
       );
08FB7793FE84155DC02AAC07 /* Project object */ = {
       projectRoot = "";
       targets = (
         26CE0593115C31C20022F371 /* debugserver */,
       );
     };
 /* End PBXProject section */
 
 /* Begin PBXShellScriptBuildPhase section */
-    26CE05C7115C36870022F371 /* ShellScript */ = {
-      isa = PBXShellScriptBuildPhase;
-      buildActionMask = 2147483647;
-      files = (
-      );
-      inputPaths = (
-        "$(SRCROOT)/scripts/dbgnub-config.pl",
-      );
-      outputPaths = (
-        "$(DERIVED_FILE_DIR)/DNBConfig.h",
-      );
-      runOnlyForDeploymentPostprocessing = 0;
-      shellPath = /bin/sh;
-      shellScript = "perl -x scripts/dbgnub-config.pl\n";
-    };
     4C3326CB18B2A2F600EB5DD7 /* ShellScript */ = {
       isa = PBXShellScriptBuildPhase;
       buildActionMask = 2147483647;
       files = (
       );
       inputPaths = (
       );
       outputPaths = (

tools/debugserver/scripts/CMakeLists.txt

-set(LLVM_NO_RTTI 1)
-
-set(dnbconfig_builder ${CMAKE_CURRENT_SOURCE_DIR}/dbgnub-config.pl)
-set(dnbconfig_header ${LLDB_BINARY_DIR}/tools/debugserver/DNBConfig.h)
-set_source_files_properties(${dnbconfig_header} PROPERTIES GENERATED 1)
-
-add_custom_command(OUTPUT ${dnbconfig_header}
-  COMMAND SCRIPT_OUTPUT_FILE_0=${dnbconfig_header} perl ${dnbconfig_builder}
-  DEPENDS ${dnbconfig_builder}
-  )
-add_custom_target(generate_dnbconfig
-  DEPENDS ${dnbconfig_header}
-  )
-

tools/debugserver/scripts/Makefile

-##===- tools/debugserver/scripts/Makefile ------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LLDB_LEVEL := ../../..
-
-include $(LLDB_LEVEL)/Makefile
-
-DBCONFIG_FILE = "$(PROJ_OBJ_DIR)/../DNBConfig.h"
-
-$(DBCONFIG_FILE):
-  SCRIPT_OUTPUT_FILE_0=$(DBCONFIG_FILE) perl $(PROJ_SRC_DIR)/dbgnub-config.pl
-
-all:: $(DBCONFIG_FILE)
-
-.PHONY: all
 

tools/debugserver/scripts/dbgnub-config.pl

-#!/usr/bin/perl
-
-use strict;
-my $config_file = "$ENV{SCRIPT_OUTPUT_FILE_0}";
-
-# Define the tests we need to run during this configuration
-my @config_tests = (
-  {
-    NAME => "HAVE_64_BIT_MACH_EXCEPTIONS",
-    TEST => "-e '$ENV{SDKROOT}/usr/include/mach/mach_exc.defs'",
-    COMMENT => "// Defined if we can use 64 bit mach exceptions",
-    FAIL => "#undef HAVE_64_BIT_MACH_EXCEPTIONS\
-#define mach_exception_data_t exception_data_t\
-#define mach_exception_data_type_t exception_data_type_t\
-#define mach_exc_server exc_server\
-#define MACH_EXCEPTION_CODES 0\n",
-    SUCCESS => "#define HAVE_64_BIT_MACH_EXCEPTIONS 1\n",
-  }
-);
-
-#----------------------------------------------------------------------
-# Open the config file
-#----------------------------------------------------------------------
-open(CONFIG, "> $config_file") || die "Couldn't open '$config_file' for writing: $!\n";
-print CONFIG "//" . "-" x 72 . "\n";
-print CONFIG "// This file is auto generated by a dbgnub-config.pl, do not edit by hand!\n";
-print CONFIG "//" . "-" x 72 . "\n";
-print CONFIG "// COMMAND LINE\n";
-print CONFIG "//  " . join(' ', @ARGV) . "\n";
-print CONFIG "//" . "-" x 72 . "\n";
-print CONFIG "// ENVIRONMENT\n";
-my $key;
-my $val;
-while (($key, $val) = each %ENV) 
-{
-  $val =~ s/\n/\n\/\/ /g;
-  printf CONFIG "//  %s = %s\n", $key, $val;
-}
-print CONFIG "//" . "-" x 72 . "\n";
-print CONFIG "// SETTINGS\n";
-print CONFIG "// config_file: '$config_file'\n";
-print CONFIG "//" . "-" x 72 . "\n";
-print CONFIG "\n\n";
-print CONFIG "#ifndef __DBGNUB_CONFIG__\n";
-print CONFIG "#define __DBGNUB_CONFIG__\n";
-
-
-#----------------------------------------------------------------------
-# Run the tests
-#----------------------------------------------------------------------
-foreach my $test_href (@config_tests)
-{
-  if (exists $test_href->{COMMENT}) {
-    print CONFIG "\n$test_href->{COMMENT}\n";
-  } else {
-    print CONFIG "\n// $test_href->{NAME}\n";
-  }
-  
-  my $test_result = eval "$test_href->{TEST}";
-  if ($test_result != 0)
-  {
-    print CONFIG "$test_href->{SUCCESS}\n";    
-  }
-  else
-  {
-    print CONFIG "$test_href->{FAIL}\n";   
-  }
-}
-
-print CONFIG "#endif // #ifndef __DBGNUB_CONFIG__\n";
-close(CONFIG);
-

tools/debugserver/source/CMakeLists.txt

 
 if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(
     -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}"
     )
 endif ()
 
 add_library(lldbDebugserverCommon
-  #${dnbconfig_header}
   debugserver.cpp
   DNBArch.cpp
   DNBBreakpoint.cpp
   DNB.cpp
   DNBDataRef.cpp
   DNBError.cpp
   DNBLog.cpp
   DNBRegisterInfo.cpp
   DNBThreadResumeActions.cpp
   libdebugserver.cpp
   PseudoTerminal.cpp
   PThreadEvent.cpp
   PThreadMutex.cpp
   RNBContext.cpp
   RNBRemote.cpp
   RNBServices.cpp
   RNBSocket.cpp
   SysSignal.cpp
   TTYState.cpp
   )
 
-add_dependencies(lldbDebugserverCommon generate_dnbconfig)
-
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
   find_library(COCOA_LIBRARY Cocoa)
   target_link_libraries(lldbDebugserverCommon ${COCOA_LIBRARY})
   add_subdirectory(MacOSX)
 endif()
 

tools/debugserver/source/MacOSX/CMakeLists.txt

 set(LLVM_NO_RTTI 1)
 
 #add_subdirectory(arm64)
 #add_subdirectory(arm)
 add_subdirectory(i386)
 #add_subdirectory(ppc)
 add_subdirectory(x86_64)
 
 include_directories(..)
 
 set(generated_mach_interfaces
   ${CMAKE_CURRENT_BINARY_DIR}/mach_exc.h
   ${CMAKE_CURRENT_BINARY_DIR}/mach_excServer.c
   ${CMAKE_CURRENT_BINARY_DIR}/mach_excUser.c
   )
 add_custom_command(OUTPUT ${generated_mach_interfaces}
-  COMMAND mig -I${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/dbgnub-mig.defs
-  DEPENDS ${dnbconfig_header}
+  COMMAND mig ${CMAKE_CURRENT_SOURCE_DIR}/dbgnub-mig.defs
   )
 
 set(DEBUGSERVER_VERS_GENERATED_FILE ${CMAKE_CURRENT_BINARY_DIR}/debugserver_vers.c)
 set_source_files_properties(${DEBUGSERVER_VERS_GENERATED_FILE} PROPERTIES GENERATED 1)
 
 add_custom_command(OUTPUT ${DEBUGSERVER_VERS_GENERATED_FILE}
   COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
           ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj debugserver
           > ${DEBUGSERVER_VERS_GENERATED_FILE})
 
 set(DEBUGSERVER_USED_LIBS
   lldbDebugserverCommon
   lldbUtility
   lldbDebugserverMacOSX_I386
   lldbDebugserverMacOSX_X86_64
   )
 
 add_lldb_executable(debugserver
-  ${dnbconfig_header}
   HasAVX.s
   CFBundle.cpp
   CFData.cpp
   CFString.cpp
   Genealogy.cpp
   MachException.cpp
   MachProcess.mm
   MachTask.mm
   MachThread.cpp
   MachThreadList.cpp
   MachVMMemory.cpp
   MachVMRegion.cpp
   ${generated_mach_interfaces}
   ${DEBUGSERVER_VERS_GENERATED_FILE}
   )
 
 set_source_files_properties(
   HasAVX.s
   # Necessary since compilation will fail with stand-alone assembler
   PROPERTIES LANGUAGE C COMPILE_FLAGS "-x assembler-with-cpp"
   )
 
-add_dependencies(debugserver generate_dnbconfig)
 target_link_libraries(debugserver ${DEBUGSERVER_USED_LIBS})
 
 # Sign the debugserver binary
 set (CODESIGN_IDENTITY lldb_codesign)
 execute_process(
   COMMAND xcrun -f codesign_allocate
   OUTPUT_STRIP_TRAILING_WHITESPACE
   OUTPUT_VARIABLE CODESIGN_ALLOCATE

tools/debugserver/source/MacOSX/MachException.h

 //===----------------------------------------------------------------------===//
 
 
 #ifndef __MachException_h__
 #define __MachException_h__
 
 #include <mach/mach.h>
 #include <vector>
-#include "DNBConfig.h"
 
 class MachProcess;
 class PThreadMutex;
 
 typedef union MachMessageTag
 {
     mach_msg_header_t hdr;
     char data[1024];

tools/debugserver/source/MacOSX/dbgnub-mig.defs

 /*
  * nub.defs
  */
  
-/*
- * DNBConfig.h is autogenerated by a perl script that is run as a build
- * script in XCode. XCode is responsible for calling the script and setting
- * the include paths correctly to locate it. The file will exist in the
- * derived sources directory in the build folder.
- *
- */
-
-#include "DNBConfig.h"
-
-
 #import <mach/mach_exc.defs>