back out Dune (#8391)

Summary:
Pull Request resolved: #8391

Our Linux builds have been broken since this landed.

Fixes #8386

This is basically `hg backout` of:
1. add dune
2. try to fix dune
3. add lwt

... then manually restoring the last

Reviewed By: kmeht

Differential Revision: D13236504

fbshipit-source-id: d02407e2a7ec4f8a71d7e17c64729d390c1fb9c9

hphp/.gitignore

@@ -44,6 +44,3 @@ TAGS
 # gdb
 .gdb_history
 tools/gdb/hhvm-gdb
-
-*.merlin
-*_build*

hphp/hack/CMakeLists.txt

@@ -15,6 +15,82 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}")
   set(HACK_ONLY_BUILD TRUE)
 endif()
 
+if (HACK_ONLY_BUILD)
+  # Woah - this is special. They're running cmake in the hack directory
+  # itself so we don't have our usual set up.
+  get_filename_component(HPHP_HOME "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+  set(TP_DIR "${HPHP_HOME}/third-party")
+  set(TP_BUILD_DIR ${TP_DIR})
+
+  if(NOT EXISTS "${TP_DIR}/CMakeLists.txt")
+    message(FATAL_ERROR
+      "${TP_DIR}/CMakeLists.txt missing. Try updating your submodule with:\n"
+      "    rm -r ${TP_DIR}\n"
+      "    git submodule update --init --recursive\n"
+      )
+  endif()
+endif()
+
+find_package(LZ4)
+find_package(LibElf)
+
+if (HACK_ONLY_BUILD AND NOT LZ4_FOUND)
+  add_subdirectory("${TP_DIR}/lz4" "${TP_DIR}/lz4" EXCLUDE_FROM_ALL)
+endif()
+
+if (HACK_ONLY_BUILD)
+  add_subdirectory("${TP_DIR}/ocaml" "${TP_DIR}/ocaml" EXCLUDE_FROM_ALL)
+endif()
+
+if (HACK_ONLY_BUILD AND NOT PC_SQLITE3_FOUND)
+  add_subdirectory(
+    "${TP_DIR}/libsqlite3"
+    "${TP_DIR}/libsqlite3"
+    EXCLUDE_FROM_ALL)
+endif()
+
+# This is totally the wrong way to do this, but I am tired of fighting with
+# build systems and don't really care to make this work the right way.
+# lz4 and sqlite3 are all we need right now anyways.
+unset(extra_include_paths)
+unset(extra_lib_paths)
+unset(extra_cc_flags)
+
+# Allows '#include "hphp/path/to/library/"' paths to start from hphp
+# project directory  which is consistent with fbmake's include paths.
+
+IF(HPHP_HOME)
+  list(APPEND extra_include_paths ${HPHP_HOME})
+ELSE()
+  list(APPEND extra_include_paths ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+ENDIF()
+
+list(APPEND extra_cc_flags -pthread)
+
+if(LZ4_FOUND)
+  list(APPEND extra_include_paths ${LZ4_INCLUDE_DIR})
+  get_filename_component(pth ${LZ4_LIBRARY} PATH)
+  list(APPEND extra_lib_paths ${pth})
+  list(APPEND extra_native_libraries "lz4")
+else()
+  list(APPEND extra_include_paths "${TP_DIR}/lz4/src/lib")
+  # If LZ4_FOUND is false either we didn't find lz4 or we found it but it's the
+  # wrong version.  We can't just add the new path and a native_lib because we
+  # can't control the order (and -l won't accept the raw path to the lib).  By
+  # doing it this way we specify the path explicitly.
+  list(APPEND extra_link_opts "$<TARGET_LINKER_FILE:lz4>")
+endif()
+
+if(PC_SQLITE3_FOUND)
+  list(APPEND extra_include_paths ${LIBSQLITE3_INCLUDE_DIR})
+  get_filename_component(pth ${LIBSQLITE3_LIBRARY} PATH)
+  list(APPEND extra_lib_paths ${pth})
+else()
+  list(APPEND extra_include_paths "${TP_DIR}/libsqlite3")
+  list(APPEND extra_lib_paths "${TP_BUILD_DIR}/libsqlite3")
+endif()
+list(APPEND extra_native_libraries "sqlite3")
+
 # Xcode/Ninja generators undefined MAKE
 if(NOT MAKE)
   set(MAKE make)
@@ -29,40 +105,39 @@ add_custom_target(
 )
 add_dependencies(opam.stamp ocaml)
 
-if (SKIP_OPAM)
-  set(OPAMROOT "~/.opam")
-else ()
-  set(OPAMROOT "${CMAKE_CURRENT_SOURCE_DIR}/src/_build/.opam")
-endif()
-
 add_custom_target(
   hack
   ALL
   COMMAND
-        export OPAMROOT=${OPAMROOT} &&
+        export OPAMROOT=${CMAKE_CURRENT_SOURCE_DIR}/src/_build/.opam &&
         export OCAMLFIND_COMMANDS="-ocamlc=${OCAMLC_EXECUTABLE} -ocamlopt=${OCAMLOPT_EXECUTABLE}" &&
         PATH="${TP_BUILD_DIR}/ocaml/build/bin:$(PATH)"
         opam config exec --
-        $(MAKE)
+        $(MAKE) EXTRA_INCLUDE_PATHS="${extra_include_paths}"
+        EXTRA_LIB_PATHS="${extra_lib_paths}"
+        EXTRA_LINK_OPTS="${extra_link_opts}"
+        EXTRA_CC_FLAGS="${extra_cc_flags}"
+        EXTRA_NATIVE_LIBRARIES="${extra_native_libraries}"
         BYTECODE="${EMIT_OCAML_BYTECODE}"
         OCAML="${OCAML_EXECUTABLE}"
         OCAMLC="${OCAMLC_EXECUTABLE}"
         OCAMLBUILD="${OCAMLBUILD_EXECUTABLE}"
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src"
 )
-add_dependencies(hack ocaml)
-if (NOT SKIP_OPAM)
-  add_dependencies(hack opam.stamp)
-endif()
+add_dependencies(hack ocaml opam.stamp)
 
 add_custom_target(
   hack_test
   COMMAND
-        export OPAMROOT=${OPAMROOT} &&
+        export OPAMROOT=${CMAKE_CURRENT_SOURCE_DIR}/src/_build/.opam &&
         export OCAMLFIND_COMMANDS="-ocamlc=${OCAMLC_EXECUTABLE} -ocamlopt=${OCAMLOPT_EXECUTABLE}" &&
         PATH="${TP_BUILD_DIR}/ocaml/build/bin:$(PATH)"
         opam config exec --
-        $(MAKE) test
+        $(MAKE) test EXTRA_INCLUDE_PATHS="${extra_include_paths}"
+        EXTRA_LIB_PATHS="${extra_lib_paths}"
+        EXTRA_LINK_OPTS="${extra_link_opts}"
+        EXTRA_CC_FLAGS="${extra_cc_flags}"
+        EXTRA_NATIVE_LIBRARIES="${extra_native_libraries}"
         BYTECODE="${EMIT_OCAML_BYTECODE}"
         OCAML="${OCAML_EXECUTABLE}"
         OCAMLC="${OCAMLC_EXECUTABLE}"
@@ -91,11 +166,6 @@ configure_file(
   ESCAPE_QUOTES
 )
 
-configure_file(
-  "src/fsnotify/dune.in"
-  "${CMAKE_CURRENT_SOURCE_DIR}/src/fsnotify/dune"
-)
-
 install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bin/hh_client
   DESTINATION bin
   COMPONENT dev)

hphp/hack/bin/README

@@ -0,0 +1 @@
+THE PLACE WHERE WE PUT THE BINARIES