Moved peach folder to fleece

dyninst · Jul 28, 2016 · d27642a · d27642a
1 parent 3b96831
commit d27642a
Show file tree

Hide file tree

Showing 65 changed files with 55 additions and 275 deletions.
diff --git a/peach/.gitignore → fleece/.gitignore b/peach/.gitignore → fleece/.gitignore
diff --git a/peach/CMakeLists.txt → fleece/CMakeLists.txt b/peach/CMakeLists.txt → fleece/CMakeLists.txt
@@ -1,18 +1,18 @@
 cmake_minimum_required (VERSION 2.6.4)
 
-project (Peach)
+project (Fleece)
 
 set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Default installation path" FORCE)
 set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type" FORCE)
 
-option(BUILD_SHARED "Build and link shared libraries?" OFF)
+option(BUILD_SHARED "Build and link shared libraries?" ON)
 option(BUILD_STATIC "Build and link static libraries?" OFF)
 
 
-# Which custom libraries should be linked against peach?
-set (PEACH_LIBRARIES peachutil peachdecoders peachreporting)
+# Which custom libraries should be linked against fleece?
+set (FLEECE_LIBRARIES fleeceutil fleecedecoders fleecereporting)
 set (OTHER_LIBRARIES z instructionAPI xed LLVM opcodes rt bfd iberty dl)
-set (ALL_LIBRARIES ${PEACH_LIBRARIES} ${OTHER_LIBRARIES})
+set (ALL_LIBRARIES ${FLEECE_LIBRARIES} ${OTHER_LIBRARIES})
 
 set (CMAKE_CXX_FLAGS "-std=c++11")
 set (CMAKE_C_FLAGS "")
@@ -23,6 +23,6 @@ add_subdirectory(decoders)
 add_subdirectory(reporting)
 add_subdirectory(util)
 
-add_executable(peach peach.C)
-target_link_libraries(peach LINK_PUBLIC ${ALL_LIBRARIES})
-target_include_directories(peach PUBLIC "h")
+add_executable(fleece fleece.C)
+target_link_libraries(fleece LINK_PUBLIC ${ALL_LIBRARIES})
+target_include_directories(fleece PUBLIC "h")
diff --git a/peach/COPYRIGHT → fleece/COPYRIGHT b/peach/COPYRIGHT → fleece/COPYRIGHT
diff --git a/peach/LICENSE → fleece/LICENSE b/peach/LICENSE → fleece/LICENSE
diff --git a/peach/README.md → fleece/README.md b/peach/README.md → fleece/README.md
diff --git a/fleece/decoders/CMakeLists.txt b/fleece/decoders/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Set the sources that should be compiled into the library
+set (FLEECE_DECODERS_SOURCE aarch64_common.C Decoder.C dyninst_aarch64.C dyninst_x86_64.C gnu_aarch64.C gnu_x86_64.C llvm_aarch64.C llvm_common.C llvm_x86_64.C Normalization.C null_decoders.C xed_x86_64.C)
+
+# When binaries link against this library, which headers should be included?
+include_directories ("${PROJECT_SOURCE_DIR}/h")
+
+if(BUILD_SHARED)
+    # Build these sources as libfleecedecoders (.so on Linux or .dll on Windows)
+    add_library(fleecedecoders SHARED ${FLEECE_DECODERS_SOURCE})
+endif(BUILD_SHARED)
+
+if(BUILD_STATIC)
+    # Build these sources as libfleecedecoders (.so on Linux or .dll on Windows)
+    add_library(fleecedecoders STATIC ${FLEECE_DECODERS_SOURCE})
+endif(BUILD_STATIC)
diff --git a/peach/decoders/Decoder.C → fleece/decoders/Decoder.C b/peach/decoders/Decoder.C → fleece/decoders/Decoder.C
diff --git a/peach/decoders/Normalization.C → fleece/decoders/Normalization.C b/peach/decoders/Normalization.C → fleece/decoders/Normalization.C
diff --git a/peach/decoders/aarch64_common.C → fleece/decoders/aarch64_common.C b/peach/decoders/aarch64_common.C → fleece/decoders/aarch64_common.C
diff --git a/peach/decoders/dyninst_aarch64.C → fleece/decoders/dyninst_aarch64.C b/peach/decoders/dyninst_aarch64.C → fleece/decoders/dyninst_aarch64.C
diff --git a/peach/decoders/dyninst_x86_64.C → fleece/decoders/dyninst_x86_64.C b/peach/decoders/dyninst_x86_64.C → fleece/decoders/dyninst_x86_64.C
diff --git a/peach/decoders/gnu_aarch64.C → fleece/decoders/gnu_aarch64.C b/peach/decoders/gnu_aarch64.C → fleece/decoders/gnu_aarch64.C
diff --git a/peach/decoders/gnu_x86_64.C → fleece/decoders/gnu_x86_64.C b/peach/decoders/gnu_x86_64.C → fleece/decoders/gnu_x86_64.C
diff --git a/peach/decoders/llvm_aarch64.C → fleece/decoders/llvm_aarch64.C b/peach/decoders/llvm_aarch64.C → fleece/decoders/llvm_aarch64.C
diff --git a/peach/decoders/llvm_common.C → fleece/decoders/llvm_common.C b/peach/decoders/llvm_common.C → fleece/decoders/llvm_common.C
diff --git a/peach/decoders/llvm_x86_64.C → fleece/decoders/llvm_x86_64.C b/peach/decoders/llvm_x86_64.C → fleece/decoders/llvm_x86_64.C
diff --git a/peach/decoders/null_decoders.C → fleece/decoders/null_decoders.C b/peach/decoders/null_decoders.C → fleece/decoders/null_decoders.C
diff --git a/peach/decoders/xed_x86_64.C → fleece/decoders/xed_x86_64.C b/peach/decoders/xed_x86_64.C → fleece/decoders/xed_x86_64.C
diff --git a/fleece/fleece b/fleece/fleece
diff --git a/peach/peach.C → fleece/fleece.C b/peach/peach.C → fleece/fleece.C
diff --git a/peach/h/Alias.h → fleece/h/Alias.h b/peach/h/Alias.h → fleece/h/Alias.h
diff --git a/peach/h/Architecture.h → fleece/h/Architecture.h b/peach/h/Architecture.h → fleece/h/Architecture.h
diff --git a/peach/h/BitTypeMap.h → fleece/h/BitTypeMap.h b/peach/h/BitTypeMap.h → fleece/h/BitTypeMap.h
diff --git a/peach/h/BitTypes.h → fleece/h/BitTypes.h b/peach/h/BitTypes.h → fleece/h/BitTypes.h
diff --git a/peach/h/Bitfield.h → fleece/h/Bitfield.h b/peach/h/Bitfield.h → fleece/h/Bitfield.h
diff --git a/peach/h/Decoder.h → fleece/h/Decoder.h b/peach/h/Decoder.h → fleece/h/Decoder.h
diff --git a/peach/h/Extent.h → fleece/h/Extent.h b/peach/h/Extent.h → fleece/h/Extent.h
diff --git a/peach/h/Hashcounter.h → fleece/h/Hashcounter.h b/peach/h/Hashcounter.h → fleece/h/Hashcounter.h
diff --git a/peach/h/Info.h → fleece/h/Info.h b/peach/h/Info.h → fleece/h/Info.h
diff --git a/peach/h/MapTable.h → fleece/h/MapTable.h b/peach/h/MapTable.h → fleece/h/MapTable.h
diff --git a/peach/h/MappedInst.h → fleece/h/MappedInst.h b/peach/h/MappedInst.h → fleece/h/MappedInst.h
diff --git a/peach/h/Mask.h → fleece/h/Mask.h b/peach/h/Mask.h → fleece/h/Mask.h
diff --git a/peach/h/MyString.h → fleece/h/MyString.h b/peach/h/MyString.h → fleece/h/MyString.h
diff --git a/peach/h/Mystring.h → fleece/h/Mystring.h b/peach/h/Mystring.h → fleece/h/Mystring.h
diff --git a/peach/h/Normalization.h → fleece/h/Normalization.h b/peach/h/Normalization.h → fleece/h/Normalization.h
diff --git a/peach/h/Options.h → fleece/h/Options.h b/peach/h/Options.h → fleece/h/Options.h
diff --git a/peach/h/RegisterSet.h → fleece/h/RegisterSet.h b/peach/h/RegisterSet.h → fleece/h/RegisterSet.h
diff --git a/peach/h/ReportingContext.h → fleece/h/ReportingContext.h b/peach/h/ReportingContext.h → fleece/h/ReportingContext.h
diff --git a/peach/h/aarch64_common.h → fleece/h/aarch64_common.h b/peach/h/aarch64_common.h → fleece/h/aarch64_common.h
diff --git a/peach/h/llvm_common.h → fleece/h/llvm_common.h b/peach/h/llvm_common.h → fleece/h/llvm_common.h
diff --git a/peach/misc/CombineReports.C → fleece/misc/CombineReports.C b/peach/misc/CombineReports.C → fleece/misc/CombineReports.C
diff --git a/peach/misc/Reassemble.C → fleece/misc/Reassemble.C b/peach/misc/Reassemble.C → fleece/misc/Reassemble.C
diff --git a/peach/misc/RemoveErrors.C → fleece/misc/RemoveErrors.C b/peach/misc/RemoveErrors.C → fleece/misc/RemoveErrors.C
diff --git a/peach/misc/smaker.C → fleece/misc/smaker.C b/peach/misc/smaker.C → fleece/misc/smaker.C
diff --git a/fleece/reporting/CMakeLists.txt b/fleece/reporting/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Set the sources that should be compiled into the library
+set (FLEECE_REPORTING_SOURCE ReportingContext.C)
+
+# When binaries link against this library, which headers should be included?
+include_directories (${PROJECT_SOURCE_DIR}/h})
+
+if(BUILD_SHARED)
+    # Build these sources as libfleecereporting (.so on Linux or .dll on Windows)
+    add_library(fleecereporting SHARED ${FLEECE_REPORTING_SOURCE})
+endif(BUILD_SHARED)
+
+if(BUILD_STATIC)
+    # Build these sources as libfleecereporting (.so on Linux or .dll on Windows)
+    add_library(fleecereporting STATIC ${FLEECE_REPORTING_SOURCE})
+endif(BUILD_STATIC)
+
diff --git a/peach/reporting/ReportingContext.C → fleece/reporting/ReportingContext.C b/peach/reporting/ReportingContext.C → fleece/reporting/ReportingContext.C
diff --git a/peach/util/Alias.C → fleece/util/Alias.C b/peach/util/Alias.C → fleece/util/Alias.C
diff --git a/peach/util/Architecture.C → fleece/util/Architecture.C b/peach/util/Architecture.C → fleece/util/Architecture.C
diff --git a/peach/util/BitTypeMap.C → fleece/util/BitTypeMap.C b/peach/util/BitTypeMap.C → fleece/util/BitTypeMap.C
diff --git a/peach/util/BitTypes.C → fleece/util/BitTypes.C b/peach/util/BitTypes.C → fleece/util/BitTypes.C
diff --git a/peach/util/Bitfield.C → fleece/util/Bitfield.C b/peach/util/Bitfield.C → fleece/util/Bitfield.C
diff --git a/fleece/util/CMakeLists.txt b/fleece/util/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Set the sources that should be compiled into the library
+set (FLEECE_UTIL_SOURCE Alias.C Architecture.C Bitfield.C BitTypeMap.C BitTypes.C Hashcounter.C Info.C MappedInst.C MapTable.C Mask.C Mystring.C Options.C RegisterSet.C)
+
+# When binaries link against this library, which headers should be included?
+include_directories (${PROJECT_SOURCE_DIR}/h})
+
+if(BUILD_SHARED)
+    # Build these sources as libfleeceutil (.so on Linux or .dll on Windows)
+    add_library(fleeceutil SHARED ${FLEECE_UTIL_SOURCE})
+endif(BUILD_SHARED)
+
+if(BUILD_STATIC)
+    # Build these sources as libfleeceutil (.so on Linux or .dll on Windows)
+    add_library(fleeceutil STATIC ${FLEECE_UTIL_SOURCE})
+endif(BUILD_STATIC)
+
diff --git a/peach/util/Hashcounter.C → fleece/util/Hashcounter.C b/peach/util/Hashcounter.C → fleece/util/Hashcounter.C
diff --git a/peach/util/Info.C → fleece/util/Info.C b/peach/util/Info.C → fleece/util/Info.C
diff --git a/peach/util/MapTable.C → fleece/util/MapTable.C b/peach/util/MapTable.C → fleece/util/MapTable.C
diff --git a/peach/util/MappedInst.C → fleece/util/MappedInst.C b/peach/util/MappedInst.C → fleece/util/MappedInst.C
diff --git a/peach/util/Mask.C → fleece/util/Mask.C b/peach/util/Mask.C → fleece/util/Mask.C
diff --git a/peach/util/Mystring.C → fleece/util/Mystring.C b/peach/util/Mystring.C → fleece/util/Mystring.C
diff --git a/peach/util/Options.C → fleece/util/Options.C b/peach/util/Options.C → fleece/util/Options.C
diff --git a/peach/util/RegisterSet.C → fleece/util/RegisterSet.C b/peach/util/RegisterSet.C → fleece/util/RegisterSet.C
diff --git a/peach/Makefile b/peach/Makefile
diff --git a/peach/decoders/.llvm_aarch64.C.swo b/peach/decoders/.llvm_aarch64.C.swo
diff --git a/peach/decoders/CMakeLists.txt b/peach/decoders/CMakeLists.txt
diff --git a/peach/reporting/CMakeLists.txt b/peach/reporting/CMakeLists.txt
diff --git a/peach/util/CMakeLists.txt b/peach/util/CMakeLists.txt