Combine hphp and hhvm into one executable
commit308ddf6806dc021bfe831fcf17ab29d00e7d1795
authorSara Golemon <sgolemon@fb.com>
Tue, 29 Jan 2013 18:53:06 +0000 (29 10:53 -0800)
committerSara Golemon <sgolemon@fb.com>
Wed, 30 Jan 2013 04:31:06 +0000 (29 20:31 -0800)
tree3a11eb5726ec77d4d7deee6180ff48b954cd0f6a
parent33157853a7d130e913b232dc088af4bff93a5b77
Combine hphp and hhvm into one executable

Move hphp/main.cpp to compiler/compiler.cpp, and rename
a few things to make it possible to link with hhvm.

Modify hhvm startup to run as hphp if
the first argument is --hphp.
14 files changed:
.gitignore
src/CMakeLists.txt
src/compiler/compiler.cpp [moved from src/hphp/main.cpp with 94% similarity]
src/compiler/compiler.h [copied from src/hhvm/main.cpp with 62% similarity]
src/hhvm/CMakeLists.txt
src/hhvm/externals_stubs.cpp
src/hhvm/link_hphp.sh [new file with mode: 0755]
src/hhvm/main.cpp
src/hphp [new symlink]
src/hphp/CMakeLists.txt [deleted file]
src/hphp/externals.cpp [deleted file]
src/hphp/makefile_mono [deleted file]
src/runtime/base/program_functions.cpp
src/test/main.cpp