Remove support for buildling HPHPc

To get the non-hphpc portions of buliding for HPHPc, perform an HHVM build and execute it with the --hphp flag To checkout the commit immediately prior to this: git checkout use-hphpc
facebook · Feb 19, 2013 · fc5b951 · fc5b951
1 parent 9cb2d7a
commit fc5b951
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 1,183 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,5 +30,5 @@ if ("$ENV{USE_HHVM}" STREQUAL "1")
 	message("Building for HHVM")
 endif()
 if ("$ENV{USE_HPHPC}" STREQUAL "1")
-	message("Building for HPHPc")
+	message(FATAL_ERROR "Building HPHPc is no longer supported")
 endif()
diff --git a/hphp/CMakeLists.txt b/hphp/CMakeLists.txt
@@ -17,24 +17,10 @@
 
 include(HPHPSetup)
 
-if ("$ENV{USE_HHVM}" STREQUAL "1")
-	# HHVM Build
-	SET(USE_HHVM TRUE)
-	SET(ENV{HHVM} 1)
-	ADD_DEFINITIONS("-DHHVM -DHHVM_BINARY=1 -DHHVM_PATH=\\\"${HPHP_HOME}/hphp/hhvm/hhvm\\\"")
-
-	if ("$ENV{USE_HPHPC}" STREQUAL "1")
-		message(FATAL_ERROR "Both USE_HHVM and USE_HPHPC are set, you may only select one")
-	endif()
-else()
-	# HPHPc Build
-	SET(USE_HHVM FALSE)
-	ADD_DEFINITIONS("-DHHVM_PATH=\"\"")
-
-	if (NOT "$ENV{USE_HPHPC}" STREQUAL "1")
-		message(FATAL_ERROR "You must select which version of HipHop to build by setting either USE_HHVM=1 or USE_HPHPC=1 in your environment")
-	endif()
-endif()
+# HHVM Build
+SET(USE_HHVM TRUE)
+SET(ENV{HHVM} 1)
+ADD_DEFINITIONS("-DHHVM -DHHVM_BINARY=1 -DHHVM_PATH=\\\"${HPHP_HOME}/hphp/hhvm/hhvm\\\"")
 
 set(RECURSIVE_SOURCE_SUBDIRS runtime/base runtime/eval runtime/ext runtime/vm system/gen system/lib util)
 foreach (dir ${RECURSIVE_SOURCE_SUBDIRS})
@@ -70,13 +56,11 @@ foreach (file ${CXX_SOURCES})
 endforeach(file ${CXX_SOURCES})
 
 # remove ext/sep for hhvm
-if (USE_HHVM)
-	foreach (file ${CXX_SOURCES})
-		if (${file} MATCHES "ext/sep")
-			list(REMOVE_ITEM CXX_SOURCES ${file})
-		endif()
-	endforeach(file ${CXX_SOURCES})
-endif(USE_HHVM)
+foreach (file ${CXX_SOURCES})
+	if (${file} MATCHES "ext/sep")
+		list(REMOVE_ITEM CXX_SOURCES ${file})
+	endif()
+endforeach(file ${CXX_SOURCES})
 
 
 if (EXISTS "${hphp_SOURCE_DIR}/HPHP_EXCLUDE_FILES.txt")
@@ -184,11 +168,7 @@ SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
 hphp_link(hphp_runtime_static)
 
 add_subdirectory(compiler)
-
-if (USE_HHVM)
-	add_subdirectory(runtime/ext_hhvm)
-endif()
-
+add_subdirectory(runtime/ext_hhvm)
 add_subdirectory(hhvm)
 
 if (NOT "$ENV{HPHP_NOTEST}" STREQUAL "1")

diff --git a/hphp/dirs.mk b/hphp/dirs.mk
diff --git a/hphp/hhvm/CMakeLists.txt b/hphp/hhvm/CMakeLists.txt
@@ -1,17 +1,6 @@
-
-if (USE_HHVM)
-	set(HIPHOP_TARGET hhvm)
-else()
-	set(HIPHOP_TARGET hphp)
-endif()
-
 set(CXX_SOURCES)
 auto_sources(files "*.cpp" "")
 list(APPEND CXX_SOURCES ${files})
 
-add_executable(${HIPHOP_TARGET} ${CXX_SOURCES})
-target_link_libraries(${HIPHOP_TARGET} hphp_analysis hphp_runtime_static)
-
-if (USE_HHVM)
-	target_link_libraries(hhvm ext_hhvm_static)
-endif()
+add_executable(hhvm ${CXX_SOURCES})
+target_link_libraries(hhvm hphp_analysis hphp_runtime_static ext_hhvm_static)
diff --git a/hphp/hphp b/hphp/hphp