Merge branch 'master' into att_syntax

.gitignore

@@ -68,9 +68,13 @@ callgrind.out.*
 cscope.*
 luftags
 tags
+*.VC.db
+*.VC.opendb
 *.sdf
 *.opensdf
 *.suo
+*.sln
+*.vcxproj
 *.vcxproj.user
 ipch/*
 *.swp

.travis.yml

@@ -2,27 +2,42 @@ language: cpp
 
 sudo: false
 
+env:
+    global:
+        - LLVM_VERSION=3.7.0
+        - LD_LIBRARY_PATH=$HOME/clang-$LLVM_VERSION/lib:$LD_LIBRARY_PATH
+
 addons:
     apt:
         sources:
             - kalakris-cmake
-            - llvm-toolchain-precise-3.7
             - ubuntu-toolchain-r-test
             - boost-latest
         packages:
             - binutils-dev
             - libboost-system1.55-dev
             - libboost-thread1.55-dev
-            - clang-3.7
             - cmake
             - libelf-dev
+            - g++-4.9
 
 compiler:
     - gcc
     - clang
 
+cache:
+    directories:
+        - $HOME/llvm-3.7.0
+
+before_install:
+    - if [ ! -d $HOME/llvm-$LLVM_VERSION/bin ]; then
+        wget -O llvm-$LLVM_VERSION.tar.xz http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz;
+        tar xf llvm-$LLVM_VERSION.tar.xz --strip 1 -C $HOME/llvm-$LLVM_VERSION;
+      fi
+
 script:
-    - if [ "$CC" == "clang" ]; then export CC=clang-3.7; export CXX=clang++-3.7; fi
+    - if [ "$CC" == "clang" ]; then export CC=$HOME/llvm-$LLVM_VERSION/bin/clang; export CXX=$HOME/llvm-$LLVM_VERSION/bin/clang++; fi
+    - if [ "$CC" == "gcc" ]; then export CC=gcc-4.9; export CXX=g++-4.9; fi
     - mkdir work
     - cd work
     - cmake ..

CMakeLists.txt

@@ -63,6 +63,7 @@ if(NOT ${PLATFORM} MATCHES nt)
   add_subdirectory (elf)
   add_subdirectory (dwarf)
   add_subdirectory (symlite)
+  add_subdirectory (parseThat)
 # DynC is not compatible with Windows when
 # we use bison on linux to generate source
 # TODO: generate with bison configured for
@@ -80,7 +81,6 @@ add_subdirectory (patchAPI)
 if(${SYMREADER} MATCHES symtabAPI)
   add_subdirectory (dyninstAPI)
 endif()
-add_subdirectory (parseThat)
 
 # Build the RT library as a seperate project so we can change compilers
 message(STATUS "Configuring DyninstAPI_RT")
@@ -120,19 +120,22 @@ if(BUILD_RTLIB)
     -G ${CMAKE_GENERATOR}
     ${RT_SOURCE_DIR})
 
-  add_custom_target(DyninstRT
-    ALL
-    #  COMMAND ${CMAKE_COMMAND} -E chdir ${RT_BINARY_DIR} ${ACTUAL_BUILD}
-    $(MAKE)
-    WORKING_DIRECTORY ${RT_BINARY_DIR}
-    COMMENT "Building DyninstRT")
+  if(MSVC)
+      include_external_msproject(DyninstAPI_RT dyninstAPI_RT/dyninstAPI_RT.vcxproj)
+  else()
+    add_custom_target(DyninstRT
+      ALL
+      $(MAKE)
+      WORKING_DIRECTORY ${RT_BINARY_DIR}
+      COMMENT "Building DyninstRT")
+    add_dependencies(dyninstAPI DyninstRT)
+    if(TARGET dyninstAPI-static)
+      add_dependencies(dyninstAPI-static DyninstRT)
+    endif()
+  endif()
 
   install(SCRIPT "${RT_BINARY_DIR}/cmake_install.cmake")
 
-  add_dependencies(dyninstAPI DyninstRT)
-  if(TARGET dyninstAPI-static)
-      add_dependencies(dyninstAPI-static DyninstRT)
-  endif()
 else()
   message(STATUS "Skipping DyninstAPI_RT. Be sure to build this library if you're using instrumentation.")
 endif()
@@ -154,14 +157,15 @@ if(BUILD_TARBALLS)
 endif()
 if(BUILD_DOCS)
   add_custom_target(doc)
-  set(LATEX_DOCS dynC_API instructionAPI parseAPI patchAPI symtabAPI stackwalk)
+  set(LATEX_DOCS dynC_API dataflowAPI instructionAPI parseAPI patchAPI symtabAPI stackwalk)
   set(WORD_DOCS proccontrol dyninstAPI)
   add_custom_target(proccontrol-doc
     DEPENDS ${CMAKE_SOURCE_DIR}/proccontrol/doc/proccontrol.pdf)
   add_custom_target(dyninstAPI-doc
     DEPENDS ${CMAKE_SOURCE_DIR}/dyninstAPI/doc/dyninstAPI.pdf)
   foreach(COMPONENT ${WORD_DOCS})
     add_dependencies(doc ${COMPONENT}-doc)
+    set_target_properties(${COMPONENT}-doc PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
     install(FILES ${CMAKE_SOURCE_DIR}/${COMPONENT}/doc/${COMPONENT}.pdf
       DESTINATION ${INSTALL_DOC_DIR}
       RENAME ${COMPONENT}-${VERSION_STRING}.pdf
@@ -204,6 +208,7 @@ if(BUILD_DOCS)
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${COMPONENT}/doc/${COMPONENT}.log
         )
       add_dependencies(doc ${COMPONENT}-doc)
+      set_target_properties(${COMPONENT}-doc PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
       #add_dependencies(${COMPONENT} ${COMPONENT}-doc)
       install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${COMPONENT}/doc/${COMPONENT}.pdf
         DESTINATION ${INSTALL_DOC_DIR}