Rename hphp/tools/gen-ext-hhvm to hphp/tools/bootstrap
gen-ext-hhvm actually contains three different bootstrapping utilities: * gen-ext-hhvm * gen-infotabs * gen-class-map This move is just to give it a more contextually appropriate name.
Esse commit está contido em:
@@ -91,7 +91,7 @@ SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
|
||||
|
||||
hphp_link(hphp_runtime_static)
|
||||
|
||||
add_subdirectory("tools/gen-ext-hhvm")
|
||||
add_subdirectory("tools/bootstrap")
|
||||
|
||||
add_subdirectory(compiler)
|
||||
add_subdirectory(runtime/ext_hhvm)
|
||||
|
||||
@@ -16,10 +16,10 @@ macro(EXT_HHVM_FILE SOURCES HEADERS REL EHHVM_ARCH)
|
||||
list(APPEND ${HEADERS} "${f_SRC}.ext_hhvm.h")
|
||||
add_custom_command(OUTPUT "${f_SRC}.ext_hhvm.cpp" "${f_SRC}.ext_hhvm.h"
|
||||
DEPENDS ${f_SRC} gen-ext-hhvm
|
||||
COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-ext-hhvm.sh"
|
||||
COMMAND "${HPHP_HOME}/hphp/tools/bootstrap/gen-ext-hhvm.sh"
|
||||
ARGS ${EHHVM_ARCH} ${f_OBJ}
|
||||
"${f_SRC}.ext_hhvm.cpp" "${f_SRC}.ext_hhvm.h"
|
||||
WORKING_DIRECTORY "${HPHP_HOME}/hphp/tools/gen-ext-hhvm"
|
||||
WORKING_DIRECTORY "${HPHP_HOME}/hphp/tools/bootstrap"
|
||||
COMMENT "Generating ext_hhvm wrapper for ${REL}")
|
||||
endmacro()
|
||||
|
||||
@@ -50,7 +50,7 @@ endforeach()
|
||||
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"
|
||||
COMMAND "${HPHP_HOME}/hphp/tools/bootstrap/gen-infotabs"
|
||||
ARGS ${INFOTABS_SOURCE} ${HPHP_IDLS})
|
||||
list(APPEND CXX_SOURCES ${INFOTABS_SOURCE})
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ auto_sources(IDL_SRCS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/system/idl")
|
||||
|
||||
add_custom_command(OUTPUT "class_map.cpp" "constants.h"
|
||||
DEPENDS ${IDL_SRCS} gen-class-map
|
||||
COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-class-map"
|
||||
COMMAND "${HPHP_HOME}/hphp/tools/bootstrap/gen-class-map"
|
||||
ARGS "--system"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/class_map.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/constants.h"
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@
|
||||
+----------------------------------------------------------------------+
|
||||
| HipHop for PHP |
|
||||
+----------------------------------------------------------------------+
|
||||
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
||||
| Copyright (c) 2010- Facebook, Inc. (http://www.facebook.com) |
|
||||
+----------------------------------------------------------------------+
|
||||
| This source file is subject to version 3.01 of the PHP license, |
|
||||
| that is bundled with this package in the file LICENSE, and is |
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "folly/FBString.h"
|
||||
#include "folly/FBVector.h"
|
||||
|
||||
#include "hphp/tools/gen-ext-hhvm/idl.h"
|
||||
#include "hphp/tools/bootstrap/idl.h"
|
||||
|
||||
using folly::fbstring;
|
||||
using folly::fbvector;
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "folly/Format.h"
|
||||
#include "folly/ScopeGuard.h"
|
||||
|
||||
#include "hphp/tools/gen-ext-hhvm/idl.h"
|
||||
#include "hphp/tools/bootstrap/idl.h"
|
||||
|
||||
using folly::fbstring;
|
||||
using namespace HPHP::IDL;
|
||||
@@ -6,6 +6,6 @@
|
||||
# $4 ext_hhvm.h header to generate
|
||||
readelf -s -W $2 | grep 'FUNC.*GLOBAL' | \
|
||||
sed -e 's/^.*DEFAULT[0-9 ]*//' | \
|
||||
$HPHP_HOME/hphp/tools/gen-ext-hhvm/gen-ext-hhvm \
|
||||
$HPHP_HOME/hphp/tools/bootstrap/gen-ext-hhvm \
|
||||
$1 $4 $3 $HPHP_HOME/hphp/system/idl/*.idl.json
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "folly/FBString.h"
|
||||
#include "folly/FBVector.h"
|
||||
|
||||
#include "hphp/tools/gen-ext-hhvm/idl.h"
|
||||
#include "hphp/tools/bootstrap/idl.h"
|
||||
|
||||
using folly::fbstring;
|
||||
using folly::fbvector;
|
||||
@@ -14,7 +14,7 @@
|
||||
+----------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
#include "hphp/tools/gen-ext-hhvm/idl.h"
|
||||
#include "hphp/tools/bootstrap/idl.h"
|
||||
|
||||
#include <fstream>
|
||||
#include <unordered_map>
|
||||
Referência em uma Nova Issue
Bloquear um usuário