Permalink
Browse files

reformat docs, extend .gitignore

Summary: * configure: clean spaces, tab's
* .gitignore: ignore the subfolder "build", build/binary files
* README.md: [related link](denji/hhvm@9fa7fcb?short_path=04c6e90#diff-04c6e90faac2675aa89e2176d2eec7d8)
Closes #3060

Reviewed By: @ptarjan

Differential Revision: D1427535

Pulled By: @fredemmott
  • Loading branch information...
1 parent 82a5e7d commit b6154097fbe6fa878f66671957d0374eee63ca33 @denji denji committed with facebook-github-bot Jul 10, 2014
Showing with 24 additions and 24 deletions.
  1. +17 −20 .gitignore
  2. +6 −3 README.md
  3. +1 −1 configure
View
@@ -1,7 +1,9 @@
*.[oad]
*.hhbc
.mkdir
+.DS_Store
hphp.log
+/build
/hphp/test/test
/hphp/test/test_fast.inc
@@ -41,32 +43,19 @@ hphp.log
/hphp/ffi/java/classes
/hphp/ffi/java/hphp_ffi_java.h
-CMakeFiles
-CMakeCache.txt
-cmake_install.cmake
-install_manifest.txt
-
+/bin
/output_gd/
+# tags files
/hphp/TAGS
+tags
+TAGS
# old directories with makefiles
/hphp/submodules
/hphp/third_party
-
/third-party/libzip/libzip.dylib
-# Generated makefiles
-/hphp/runtime/ext_hhvm/Makefile
-/hphp/test/Makefile
-/hphp/hack/Makefile
-/hphp/hphp/Makefile
-/hphp/hhvm/Makefile
-/hphp/compiler/Makefile
-/hphp/Makefile
-/Makefile
-/bin
-
# eclipse files
.project
.cproject
@@ -79,6 +68,14 @@ install_manifest.txt
.syntastic_cpp_config
*~
-# tags files
-tags
-TAGS
+# CMake
+CMakeCache.txt
+CMakeFiles
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
+# Ninja
+.ninja_deps
+.ninja_log
+*.ninja
View
@@ -1,12 +1,15 @@
# HHVM
+[HHVM page](http://hhvm.com) |
+[Hacklang page](http://hacklang.org) |
+[General group](https://www.facebook.com/groups/hhvm.general/) |
+[Dev group](https://www.facebook.com/groups/hhvm.dev/?ref=br_tf) |
+[Twitter](http://twitter.com/HipHopVM)
+
HHVM (aka the HipHop Virtual Machine) is an open-source virtual machine designed for executing programs written in [Hack](http://hacklang.org) and PHP. HHVM uses a just-in-time compilation approach to achieve superior performance while maintaining the flexibility that PHP developers are accustomed to. To date, HHVM (and its predecessor HPHPc before it) has realized over a 9x increase in web request throughput and over a 5x reduction in memory consumption for Facebook compared with the PHP 5.2 engine + APC.
HHVM should be used together with a FastCGI-based webserver like [nginx](https://github.com/facebook/hhvm/wiki/FastCGI#making-it-work-with-nginx) or [apache](https://github.com/facebook/hhvm/wiki/FastCGI#making-it-work-with-apache).
-* HHVM page: http://hhvm.com
-* Hack page: http://hacklang.org
-
## FAQ
View
@@ -5,7 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ "$1" = '--help' ] || [ "$1" = '-h' ]; then
echo "usage: $0 -Dvariable=argument ...\n"
echo 'Variables: '
- options=`cat $DIR/CMake/Options.cmake | grep option |
+ options=`cat $DIR/CMake/Options.cmake | grep option | sed -e 's/^[ \t]*//' |
sed 's/\s*option(/ -D/; s/ "/=ON|OFF : /;
s/" / : Default: /; s/)$//' | sort`
options=" -DCMAKE_BUILD_TYPE=Debug|Release|RelWithDebInfo|MinSizeRel : Sets build type \

0 comments on commit b615409

Please sign in to comment.