Merge pull request #137 from haberman/updatetp

Updated third_party submodules.

Author: haberman

Diff for: CMakeLists.txt

@@ -1,5 +1,6 @@
-cmake_minimum_required (VERSION 2.6)
-project (Bloaty)
+cmake_minimum_required (VERSION 3.0)
+cmake_policy(SET CMP0048 NEW)
+project (Bloaty VERSION 1.0)
 
 # Options we define for users.
 option(BLOATY_ENABLE_ASAN "Enable address sanitizer." OFF)
@@ -94,6 +95,9 @@ add_library(libbloaty
     third_party/abseil-cpp/absl/base/internal/raw_logging.cc # Grrrr...
     third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
     third_party/abseil-cpp/absl/strings/ascii.cc
+    third_party/abseil-cpp/absl/strings/charconv.cc
+    third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc
+    third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
     third_party/abseil-cpp/absl/strings/escaping.cc
     third_party/abseil-cpp/absl/strings/internal/memutil.cc
     third_party/abseil-cpp/absl/strings/internal/utf8.cc
@@ -136,34 +140,36 @@ else()
     RUNTIME DESTINATION bin
   )
 
-  enable_testing()
+  if (IS_DIRECTORY "${PROJECT_SOURCE_DIR}/tests")
+    enable_testing()
 
-  if(BUILD_TESTING)
-    add_subdirectory(third_party/googletest)
-    include_directories(third_party/googletest/googletest/include)
-    include_directories(third_party/googletest/googlemock/include)
+    if(BUILD_TESTING)
+      add_subdirectory(third_party/googletest)
+      include_directories(third_party/googletest/googletest/include)
+      include_directories(third_party/googletest/googlemock/include)
 
-    set(TEST_TARGETS
-        bloaty_test
-        bloaty_misc_test
-        range_map_test
-        )
+      set(TEST_TARGETS
+          bloaty_test
+          bloaty_misc_test
+          range_map_test
+          )
 
-    foreach(target ${TEST_TARGETS})
-      add_executable(${target} tests/${target}.cc)
-      target_link_libraries(${target} "${LIBBLOATY_LIBS}" gtest_main gmock "${CMAKE_THREAD_LIBS_INIT}")
-    endforeach(target)
+      foreach(target ${TEST_TARGETS})
+        add_executable(${target} tests/${target}.cc)
+        target_link_libraries(${target} "${LIBBLOATY_LIBS}" gtest_main gmock "${CMAKE_THREAD_LIBS_INIT}")
+      endforeach(target)
 
-    add_executable(fuzz_test tests/fuzz_target.cc tests/fuzz_driver.cc)
-    target_link_libraries(fuzz_test "${LIBBLOATY_LIBS}" "${CMAKE_THREAD_LIBS_INIT}")
+      add_executable(fuzz_test tests/fuzz_target.cc tests/fuzz_driver.cc)
+      target_link_libraries(fuzz_test "${LIBBLOATY_LIBS}" "${CMAKE_THREAD_LIBS_INIT}")
 
-    file(GLOB fuzz_corpus tests/testdata/fuzz_corpus/*)
+      file(GLOB fuzz_corpus tests/testdata/fuzz_corpus/*)
 
-    add_test(NAME range_map_test COMMAND range_map_test)
-    add_test(NAME bloaty_test_x86-64 COMMAND bloaty_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/linux-x86_64)
-    add_test(NAME bloaty_test_x86 COMMAND bloaty_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/linux-x86)
-    add_test(NAME bloaty_misc_test COMMAND bloaty_misc_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/misc)
-    add_test(NAME fuzz_test COMMAND fuzz_test ${fuzz_corpus} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/fuzz_corpus)
+      add_test(NAME range_map_test COMMAND range_map_test)
+      add_test(NAME bloaty_test_x86-64 COMMAND bloaty_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/linux-x86_64)
+      add_test(NAME bloaty_test_x86 COMMAND bloaty_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/linux-x86)
+      add_test(NAME bloaty_misc_test COMMAND bloaty_misc_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/misc)
+      add_test(NAME fuzz_test COMMAND fuzz_test ${fuzz_corpus} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata/fuzz_corpus)
+    endif()
   endif()
 
   install(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME} DESTINATION lib/${PROJECT_NAME})

Diff for: make-release-tarball.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+# Makes a release tarball.  We include our dependencies/submodules,
+# but we heavily prune their file lists to avoid including lots of
+# extraneous baggage.  We also leave out Bloaty's tests, especially
+# because some of the test data is large.
+
+set -e
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: make-release.tarball.sh VERSION"
+  exit 1
+fi
+
+VERSION=$1
+
+FILES=$(git ls-files --exclude-standard --recurse-submodules |
+          grep -v googletest |
+          grep -v ^tests |
+          grep -v third_party/protobuf |
+          grep -v 'third_party/capstone/\(suite\|bindings\|xcode\|msvc\|contrib\)' |
+          grep -v ^.git)
+FILES="$FILES $(git ls-files --exclude-standard --recurse-submodules |
+          grep 'third_party/protobuf/\(src\|cmake\|configure.ac\)')"
+
+# Unfortunately tar on Mac doesn't support --transform, so we have to
+# actually move our files to a different directory to get the prefix.
+DIR=/tmp/bloaty-$VERSION
+rm -rf $DIR
+mkdir $DIR
+rsync -R $FILES $DIR
+
+BASE=$PWD
+cd /tmp
+OUT=bloaty-$VERSION.tar.bz2
+tar cjf $BASE/$OUT bloaty-$VERSION
+
+echo "Created $OUT"
+

Diff for: src/bloaty.cc

@@ -1884,6 +1884,9 @@ bool DoParseOptions(bool skip_unknown, int* argc, char** argv[],
     } else if (args.TryParseFlag("--help")) {
       fputs(usage, stderr);
       return false;
+    } else if (args.TryParseFlag("--version")) {
+      printf("Bloaty McBloatface 1.0\n");
+      exit(0);
     } else if (absl::StartsWith(args.Arg(), "-")) {
       if (skip_unknown) {
         args.ConsumeAndSaveArg();

Diff for: src/bloaty.h

@@ -32,7 +32,7 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-#include "capstone.h"
+#include "capstone/capstone.h"
 #include "re2/re2.h"
 
 #include "bloaty.pb.h"

Diff for: src/disassemble.cc

@@ -20,7 +20,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
-#include "capstone.h"
+#include "capstone/capstone.h"
 
 static void Throw(const char *str, int line) {
   throw bloaty::Error(str, __FILE__, line);