Remove unused files and set master branch to declare HPHP_VERSION==2.1.0-dev

hphp/runtime/ext_hhvm/xconstants.php

@@ -1,22 +0,0 @@
-<?php
-// @generated by gen_constants. Do NOT edit.
-
-if (!defined('CLOCK_MONOTONIC')) {define('CLOCK_MONOTONIC', 1);}
-if (!defined('CLOCK_PROCESS_CPUTIME_ID')) {define('CLOCK_PROCESS_CPUTIME_ID', 2);}
-if (!defined('CLOCK_REALTIME')) {define('CLOCK_REALTIME', 0);}
-if (!defined('CLOCK_THREAD_CPUTIME_ID')) {define('CLOCK_THREAD_CPUTIME_ID', 3);}
-if (!defined('GLOBAL_STATE_IGNORE')) {define('GLOBAL_STATE_IGNORE', 0);}
-if (!defined('GLOBAL_STATE_OVERWRITE')) {define('GLOBAL_STATE_OVERWRITE', 1);}
-if (!defined('GLOBAL_STATE_SKIP')) {define('GLOBAL_STATE_SKIP', 2);}
-if (!defined('GLOBAL_SYMBOL_CLASS_STATIC')) {define('GLOBAL_SYMBOL_CLASS_STATIC', 2);}
-if (!defined('GLOBAL_SYMBOL_DYNAMIC_CONSTANT')) {define('GLOBAL_SYMBOL_DYNAMIC_CONSTANT', 3);}
-if (!defined('GLOBAL_SYMBOL_FILE_INCLUDE')) {define('GLOBAL_SYMBOL_FILE_INCLUDE', 4);}
-if (!defined('GLOBAL_SYMBOL_GLOBAL_VARIABLE')) {define('GLOBAL_SYMBOL_GLOBAL_VARIABLE', 0);}
-if (!defined('GLOBAL_SYMBOL_REDECLARED_CLASS')) {define('GLOBAL_SYMBOL_REDECLARED_CLASS', 6);}
-if (!defined('GLOBAL_SYMBOL_REDECLARED_FUNCTION')) {define('GLOBAL_SYMBOL_REDECLARED_FUNCTION', 5);}
-if (!defined('GLOBAL_SYMBOL_STATIC_VARIABLE')) {define('GLOBAL_SYMBOL_STATIC_VARIABLE', 1);}
-if (!defined('HPHP_TRIM_CHARLIST')) {define('HPHP_TRIM_CHARLIST', ' \n\r\t\v' . "\0" . '');}
-if (!defined('HPHP_VERSION')) {define('HPHP_VERSION', '1.0.0');}
-if (!defined('INI_SCANNER_NORMAL')) {define('INI_SCANNER_NORMAL', 0);}
-if (!defined('INI_SCANNER_RAW')) {define('INI_SCANNER_RAW', 1);}
-if (!defined('PHP_VERSION')) {define('PHP_VERSION', '5.3.3.hiphop');}

hphp/system/class_map.cpp

@@ -457,7 +457,7 @@ const int64_t k_GRAPHEME_EXTR_MAXBYTES = 1;
 const int64_t k_GRAPHEME_EXTR_MAXCHARS = 2;
 const int64_t k_HASH_HMAC = 1;
 extern const StaticString k_HPHP_TRIM_CHARLIST("\n\r\t\v\000 ",6);
-extern const StaticString k_HPHP_VERSION("1.0.0",5);
+extern const StaticString k_HPHP_VERSION("2.1.0-dev",9);
 const int64_t k_HTML_ENTITIES = 1;
 const int64_t k_HTML_SPECIALCHARS = 0;
 extern const StaticString k_ICONV_IMPL("glibc",5);
@@ -17955,7 +17955,7 @@ const char *g_class_map[] = {
   "GRAPHEME_EXTR_MAXCHARS", (const char*)4, "i:2;",
   "HASH_HMAC", (const char*)4, "i:1;",
   "HPHP_TRIM_CHARLIST", (const char*)13, "s:6:\"\n\r\t\v\000 \";",
-  "HPHP_VERSION", (const char*)12, "s:5:\"1.0.0\";",
+  "HPHP_VERSION", (const char*)16, "s:9:\"2.1.0-dev\";",
   "HTML_ENTITIES", (const char*)4, "i:1;",
   "HTML_SPECIALCHARS", (const char*)4, "i:0;",
   "ICONV_IMPL", (const char*)12, "s:5:\"glibc\";",

hphp/system/globals/constdef.php

@@ -2670,7 +2670,7 @@ DefineConstant(
 DefineConstant(
   array(
     'name'   => "HPHP_VERSION",
-    'value'  => "1.0.0",
+    'value'  => "2.1.0-dev",
   ));
 
 DefineConstant(

hphp/version

@@ -1 +1 @@
-HPHP_VERSION(1.000)
+HPHP_VERSION(2.1.0-dev)