Clean up the hphp/system folder

I noticed that directorty structure of hphp/system was a bit scattered, so
I consolidated things to reduce the total number of folders and to put
related things together with each other.

This diff moves the contents of "hphp/system/classes_hhvm" into
"hphp/system", it moves the contents of "hphp/system/lib" into
"hphp/system", moves "hphp/idl" to "hphp/system/idl", and moves the
contents of "hphp/system/globals" into "hphp/system/idl".

hphp/compiler/analysis/emitter.cpp

@@ -91,7 +91,7 @@
 #include "hphp/runtime/base/file_repository.h"
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #include "folly/ScopeGuard.h"
 

hphp/compiler/builtin_symbols.cpp

@@ -321,7 +321,7 @@ bool BuiltinSymbols::Load(AnalysisResultPtr ar) {
   if (g_context.isNull()) init_thread_locals();
   ClassInfo::Load();
 
-  // load extension functions first, so system/classes may call them
+  // load extension functions first, so system/php may call them
   ImportExtFunctions(ar, s_functions, ClassInfo::GetSystem());
   AnalysisResultPtr ar2 = AnalysisResultPtr(new AnalysisResult());
   s_variables = VariableTablePtr(new VariableTable(*ar2.get()));
@@ -360,7 +360,7 @@ bool BuiltinSymbols::Load(AnalysisResultPtr ar) {
   s_constants->setDynamic(ar, "SID", true);
   s_constants->setDynamic(ar, "PHP_SAPI", true);
 
-  // parse all PHP files under system/classes
+  // parse all PHP files under system/php
   s_systemAr = ar = AnalysisResultPtr(new AnalysisResult());
   ar->loadBuiltins();
   string slib = get_systemlib();

hphp/compiler/compiler.cpp

@@ -39,7 +39,7 @@
 #include "hphp/runtime/base/externals.h"
 #include "hphp/runtime/base/thread_init_fini.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/util/repo_schema.h"
 
 #include "hphp/hhvm/process_init.h"

hphp/hhvm/process_init.cpp

@@ -28,7 +28,7 @@
 #include "hphp/runtime/vm/jit/fixup.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/file_repository.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/util/logger.h"
 
 #include <libgen.h> // For dirname(3).

hphp/runtime/base/builtin_functions.cpp

@@ -39,7 +39,7 @@
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/event_hook.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #include <limits>
 

hphp/runtime/base/object_data.h

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/base/macros.h"
 #include "hphp/runtime/base/runtime_error.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/int.hpp>

hphp/runtime/base/resource_data.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/variable_serializer.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/base/server/xbox_server.cpp

@@ -24,7 +24,7 @@
 #include "hphp/util/job_queue.h"
 #include "hphp/util/lock.h"
 #include "hphp/util/logger.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/base/tv_helpers.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/type_conversions.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/base/type_object.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/strings.h"
 #include "hphp/runtime/ext/ext_collections.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 

hphp/runtime/base/type_variant.cpp

@@ -28,7 +28,7 @@
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/vm/instance.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/runtime/ext/ext_collections.h"
 #include "hphp/util/util.h"
 #include "hphp/util/logger.h"

hphp/runtime/ext/JSON_parser.cpp

@@ -34,7 +34,7 @@ SOFTWARE.
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/zend/utf8_decode.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #define MAX_LENGTH_OF_LONG 20
 static const char long_min_digits[] = "9223372036854775808";

hphp/runtime/ext/asio/asio_context.cpp

@@ -18,7 +18,7 @@
 
 #include "hphp/runtime/ext/ext_asio.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/asio_session.cpp

@@ -17,7 +17,7 @@
 
 #include "hphp/runtime/ext/asio/asio_session.h"
 #include "hphp/runtime/ext/ext_asio.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/blockable_wait_handle.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/base/memory/smart_containers.h"
 #include "hphp/runtime/ext/ext_asio.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/continuation_wait_handle.cpp

@@ -20,7 +20,7 @@
 #include "hphp/runtime/ext/ext_continuation.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/external_thread_event_wait_handle.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/ext/ext_asio.h"
 #include "hphp/runtime/ext/asio/asio_external_thread_event.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/gen_array_wait_handle.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/ext/ext_closure.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/gen_vector_wait_handle.cpp

@@ -20,7 +20,7 @@
 #include "hphp/runtime/ext/ext_closure.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/reschedule_wait_handle.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/ext/ext_asio.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/set_result_to_ref_wait_handle.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/ext/ext_closure.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/static_exception_wait_handle.cpp

@@ -16,7 +16,7 @@
 */
 
 #include "hphp/runtime/ext/ext_asio.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/static_result_wait_handle.cpp

@@ -16,7 +16,7 @@
 */
 
 #include "hphp/runtime/ext/ext_asio.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/asio/waitable_wait_handle.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/ext/ext_asio.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_asio.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/ext/ext_closure.h"
 #include "hphp/runtime/ext/asio/asio_context.h"
 #include "hphp/runtime/ext/asio/asio_session.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_collections.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/ext/ext_math.h"
 #include "hphp/runtime/ext/ext_intl.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_collections.h

@@ -19,7 +19,7 @@
 #define incl_HPHP_EXT_COLLECTION_H_
 
 #include "hphp/runtime/base/base_includes.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_continuation.h

@@ -20,7 +20,7 @@
 
 
 #include "hphp/runtime/base/base_includes.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_datetime.cpp

@@ -17,7 +17,7 @@
 
 #include "hphp/runtime/ext/ext_datetime.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(date);

hphp/runtime/ext/ext_debugger.cpp

@@ -24,7 +24,7 @@
 #include "hphp/runtime/vm/unwind.h"
 #include "tbb/concurrent_hash_map.h"
 #include "hphp/util/logger.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_domdocument.cpp

@@ -23,7 +23,7 @@
 #include "hphp/runtime/ext/ext_simplexml.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #define DOM_XMLNS_NAMESPACE                             \
   (const xmlChar *) "http://www.w3.org/2000/xmlns/"

hphp/runtime/ext/ext_file.cpp

@@ -29,7 +29,7 @@
 #include "hphp/runtime/base/server/static_content_cache.h"
 #include "hphp/runtime/base/zend/zend_scanf.h"
 #include "hphp/runtime/base/file/pipe.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/util.h"
 #include "hphp/util/process.h"

hphp/runtime/ext/ext_icu_ucsdet.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/ext/ext_icu_ucsdet.h"
 #include "unicode/unistr.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_icu_uspoof.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/ext/ext_icu_uspoof.h"
 #include "hphp/runtime/base/util/exceptions.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(icu_uspoof);

hphp/runtime/ext/ext_imagesprite.cpp

@@ -25,7 +25,7 @@
 #include <vector>
 #include <queue>
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_imap.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/base/zend/zend_string.h"
 #include "hphp/util/logger.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #include <c-client.h> /* includes mail.h and rfc822.h */
 #define namespace namespace_

hphp/runtime/ext/ext_intl.cpp

@@ -29,7 +29,7 @@
 #include "unicode/utypes.h"
 #include "unicode/unorm.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #ifdef UIDNA_INFO_INITIALIZER
 #define HAVE_46_API 1 /* has UTS#46 API (introduced in ICU 4.6) */

hphp/runtime/ext/ext_memcache.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/base/util/request_local.h"
 #include "hphp/runtime/base/ini_setting.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #define MMC_SERIALIZED 1
 #define MMC_COMPRESSED 2

hphp/runtime/ext/ext_memcached.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/ext/ext_json.h"
 #include <zlib.h>
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_mysql.cpp

@@ -31,7 +31,7 @@
 #include "netinet/in.h"
 #include <netdb.h>
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_pdo.cpp

@@ -27,7 +27,7 @@
 #include "hphp/runtime/base/util/request_local.h"
 #include "hphp/runtime/base/macros.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #define PDO_HANDLE_DBH_ERR(dbh)                         \
   if (strcmp(dbh->error_code, PDO_ERR_NONE)) {          \

hphp/runtime/ext/ext_reflection.cpp

@@ -25,7 +25,7 @@
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/util/parser/parser.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 

hphp/runtime/ext/ext_simplexml.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/ext/ext_domdocument.h"
 #include "hphp/runtime/base/class_info.h"
 #include "hphp/runtime/base/util/request_local.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 #ifndef LIBXML2_NEW_BUFFER
 # define xmlOutputBufferGetSize(buf)    ((buf)->buffer->use)

hphp/runtime/ext/ext_soap.cpp

@@ -30,7 +30,7 @@
 #include "hphp/runtime/ext/ext_output.h"
 #include "hphp/runtime/ext/ext_stream.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 

hphp/runtime/ext/ext_spl.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/ext/ext_math.h"
 #include "hphp/runtime/ext/ext_class.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_sqlite3.cpp

@@ -20,7 +20,7 @@
 #include "hphp/runtime/ext/ext_function.h"
 #include "hphp/runtime/base/util/exceptions.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(sqlite3);

hphp/runtime/ext/ext_xmlreader.cpp

@@ -17,7 +17,7 @@
 
 #include "hphp/runtime/ext/ext_xmlreader.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(xmlreader);

hphp/runtime/ext/ext_xmlwriter.cpp

@@ -17,7 +17,7 @@
 
 #include "hphp/runtime/ext/ext_xmlwriter.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(xmlwriter);

hphp/runtime/ext/soap/packet.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/ext/ext_soap.h"
 #include "hphp/runtime/ext/soap/packet.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext_hhvm/CMakeLists.txt

@@ -47,7 +47,7 @@ foreach (header ${CXX_HEADERS})
 	file(APPEND ${INFOTABS_HEADER} "#include \"${header}\"\n")
 endforeach()
 
-auto_sources(HPHP_IDLS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/idl")
+auto_sources(HPHP_IDLS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/system/idl")
 add_custom_command(OUTPUT ${INFOTABS_SOURCE}
                    DEPENDS ${CXX_HEADERS} gen-infotabs
                    COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-infotabs"

hphp/runtime/vm/as.cpp

@@ -92,7 +92,7 @@
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 TRACE_SET_MOD(hhas);
 

hphp/runtime/vm/bytecode.cpp

@@ -60,7 +60,7 @@
 #include "hphp/runtime/base/server/source_root_info.h"
 #include "hphp/runtime/base/util/extended_logger.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/runtime/ext/ext_collections.h"
 
 #include "hphp/runtime/vm/name_value_table_wrapper.h"

hphp/runtime/vm/class.cpp

@@ -30,7 +30,7 @@
 #include "hphp/runtime/vm/name_value_table.h"
 #include "hphp/runtime/vm/name_value_table_wrapper.h"
 #include "hphp/runtime/vm/request_arena.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/parser/parser.h"
 

hphp/runtime/vm/func.cpp

@@ -31,7 +31,7 @@
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/blob_helper.h"
 #include "hphp/runtime/vm/func_inline.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/runtime/vm/bytecode.h"
 
 namespace HPHP {

hphp/runtime/vm/funcdict.cpp

@@ -25,7 +25,7 @@
 #include "hphp/runtime/vm/jit/targetcache.h"
 #include "hphp/runtime/vm/unit.h"
 
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 

hphp/runtime/vm/instance.cpp

@@ -24,7 +24,7 @@
 #include "hphp/runtime/vm/object_allocator_sizes.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/ext/ext_collections.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace HPHP {
 

hphp/runtime/vm/jit/collector.cpp

@@ -27,7 +27,7 @@
 #include "hphp/util/trace.h"
 #include "hphp/util/debug.h"
 #include "hphp/runtime/base/file_repository.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/runtime/vm/treadmill.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"

hphp/runtime/vm/jit/test/type.cpp

@@ -19,7 +19,7 @@
 #include "hphp/util/base.h"
 #include "hphp/runtime/vm/jit/ir.h"
 // for specialized object tests to get some real VM::Class
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 
 namespace std { namespace tr1 {
   template<> struct hash<HPHP::JIT::Type> {

hphp/runtime/vm/member_operations.h

@@ -19,7 +19,7 @@
 
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/base/strings.h"
-#include "hphp/system/lib/systemlib.h"
+#include "hphp/system/systemlib.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/vm/core_types.h"
 #include "hphp/runtime/vm/runtime.h"

hphp/system/CMakeLists.txt

@@ -1,17 +1,15 @@
-auto_sources(IDL_SRCS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/idl")
-string(REPLACE ";" " " IDL_SRCS_STR "${IDL_SRCS}")
-
-set(CONSTDEF "${CMAKE_CURRENT_SOURCE_DIR}/globals/constdef.json")
+auto_sources(IDL_SRCS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/system/idl")
 
 add_custom_command(OUTPUT "class_map.cpp" "constants.h"
-                   DEPENDS ${CONSTDEF} ${IDL_SRCS} gen-class-map
-                   COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-class-map.sh"
-                   ARGS "${CMAKE_CURRENT_SOURCE_DIR}/class_map.cpp"
+                   DEPENDS ${IDL_SRCS} gen-class-map
+                   COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-class-map"
+                   ARGS "--system"
+                        "${CMAKE_CURRENT_SOURCE_DIR}/class_map.cpp"
                         "${CMAKE_CURRENT_SOURCE_DIR}/constants.h"
-                        ${CONSTDEF} ${IDL_SRCS_STR}
+                        ${IDL_SRCS}
                    COMMENT "Generating class_map.cpp and constants.h")
 
-set(CXX_SOURCES "class_map.cpp" "lib/systemlib.cpp")
+set(CXX_SOURCES "class_map.cpp" "systemlib.cpp")
 
 add_library(hphp_system STATIC ${CXX_SOURCES})
 
@@ -19,7 +17,7 @@ add_library(hphp_system STATIC ${CXX_SOURCES})
 add_dependencies(hphp_runtime_static hphp_system)
 add_dependencies(hphp_analysis hphp_system)
 
-FILE(STRINGS "classes.txt" SYSTEMLIB_CLASSES)
+FILE(STRINGS "php.txt" SYSTEMLIB_CLASSES)
 set(SYSTEMLIB_SRCS)
 set(SYSTEMLIB_SRCS_STR)
 foreach(cls ${SYSTEMLIB_CLASSES})
@@ -31,7 +29,7 @@ foreach(cls ${SYSTEMLIB_CLASSES})
 endforeach()
 
 add_custom_target(systemlib
-                  DEPENDS "classes.txt" ${SYSTEMLIB_SRCS}
+                  DEPENDS "php.txt" ${SYSTEMLIB_SRCS}
                   COMMAND "INSTALL_DIR=${HPHP_HOME}/bin"
                           "FBCODE_DIR=${HPHP_HOME}"
                           "${HPHP_HOME}/hphp/runtime/ext_hhvm/make_systemlib.sh"

hphp/system/classes.txt

@@ -1,55 +0,0 @@
-# Files to include in systemlib.php
-
-# Order matters here. Put parent classes in this list before child classes
-hphp/system/classes/lang/Traversable.php
-hphp/system/classes/lang/Iterator.php
-hphp/system/classes/lang/IteratorAggregate.php
-hphp/system/classes/lang/KeyedIterator.php
-hphp/system/classes/lang/KeyedIterable.php
-hphp/system/classes/lang/Exception.php
-hphp/system/classes/spl/exceptions/exceptions.php
-hphp/system/classes/spl/interfaces/Countable.php
-hphp/system/classes/spl/interfaces/RecursiveIterator.php
-
-hphp/system/classes/spl/datastructures/SplHeap.php
-
-hphp/system/classes/spl/file_handling/SplFileInfo.php
-hphp/system/classes/spl/interfaces/SeekableIterator.php
-hphp/system/classes/spl/iterators/DirectoryIterator.php
-hphp/system/classes/spl/iterators/FilesystemIterator.php
-hphp/system/classes/spl/iterators/RecursiveDirectoryIterator.php
-hphp/system/classes/spl/file_handling/SplFileObject.php
-
-hphp/system/classes/spl/interfaces/OuterIterator.php
-hphp/system/classes/spl/iterators/IteratorIterator.php
-hphp/system/classes/spl/iterators/FilterIterator.php
-hphp/system/classes/spl/iterators/RecursiveFilterIterator.php
-
-# If you have no inheritance relationship, go here in alphabetical order
-hphp/system/classes/DebuggerCommand.php
-hphp/system/classes/XhprofFrame.php
-hphp/system/classes/array_filter.hhas
-hphp/system/classes/array_map.hhas
-hphp/system/classes/asio/Awaitable.php
-hphp/system/classes/asio/InvalidOperationException.php
-hphp/system/classes/collections/collections.php
-hphp/system/classes/dom/DOMException.php
-hphp/system/classes/file_system/Directory.php
-hphp/system/classes/json/JsonSerializable.php
-hphp/system/classes/lang/ArrayAccess.php
-hphp/system/classes/lang/ErrorException.php
-hphp/system/classes/lang/Serializeable.php
-hphp/system/classes/lang/stdClass.php
-hphp/system/classes/pdo/PDOException.php
-hphp/system/classes/reflection/reflection.php
-hphp/system/classes/soap/SoapFault.php
-hphp/system/classes/spl/datastructures/SplObjectStorage.php
-hphp/system/classes/spl/datastructures/SplPriorityQueue.php
-hphp/system/classes/spl/iterators/AppendIterator.php
-hphp/system/classes/spl/iterators/ArrayIterator.php
-hphp/system/classes/spl/iterators/RecursiveIteratorIterator.php
-hphp/system/classes/spl/miscellaneous/ArrayObject.php
-
-hphp/system/classes_hhvm/pinitSentinel.php
-hphp/system/classes_hhvm/resource.php
-

hphp/system/globals/Makefile

@@ -1,3 +0,0 @@
-
-all:
-	php ../../../bin/gen_constants.php php53.constants.php > constants.php

hphp/system/idl/constants.idl.json

@@ -1785,7 +1785,7 @@
         },
         {
             "name": "HPHP_VERSION",
-            "value": "2.1.0-dev"
+            "value": "1.0.0"
         },
         {
             "name": "HTML_ENTITIES",

hphp/system/idl/idl_list.php

@@ -46,9 +46,14 @@ foreach ($files as $file) {
   $name = $matches[2];
   $ucname = $prefix ? camelCase($name) : ucfirst($name);
 
+  if ($name === 'constants') {
+    // Ignore 'cosntants.idl.json'
+    continue;
+  }
+
   switch ($format) {
   case 'test_ext':
-    $path = $prefix ? "hphp/$prefix" : "hphp/test/";
+    $path = $prefix ? "hphp/$prefix" : "hphp/test/ext/";
     fwrite($f, "#include \"${path}test_ext_$name.h\"\n");
     break;
   case 'test_suites':