Skip to content

Commit

Permalink
Merged pull request #505
Browse files Browse the repository at this point in the history
  • Loading branch information
@derickr
derickr committed Oct 7, 2019
2 parents c272489 + c891f45 commit 4686302
Show file tree
Hide file tree
Showing 933 changed files with 4,104 additions and 3,781 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Expand Up @@ -6,6 +6,12 @@
/*.mk
/*.la
/.libs
src/*.lo
src/*.loT
src/.libs
src/*/*.lo
src/*/*.loT
src/*/.libs
/libs.mk
/ac*.m4
/build
Expand Down
14 changes: 13 additions & 1 deletion config.m4
View file
Expand Up @@ -77,7 +77,19 @@ if test "$PHP_XDEBUG" != "no"; then

PHP_XDEBUG_CFLAGS="$STD_CFLAGS $MAINTAINER_CFLAGS"

PHP_NEW_EXTENSION(xdebug, xdebug.c xdebug_branch_info.c xdebug_code_coverage.c xdebug_com.c xdebug_compat.c xdebug_gc_stats.c xdebug_filter.c xdebug_handler_dbgp.c xdebug_handlers.c xdebug_llist.c xdebug_monitor.c xdebug_hash.c xdebug_private.c xdebug_profiler.c xdebug_set.c xdebug_stack.c xdebug_str.c xdebug_superglobals.c xdebug_tracing.c xdebug_trace_textual.c xdebug_trace_computerized.c xdebug_trace_html.c xdebug_var.c xdebug_xml.c usefulstuff.c, $ext_shared,,$PHP_XDEBUG_CFLAGS,,yes)
XDEBUG_BASE_SOURCES="src/base/base.c src/base/filter.c src/base/monitor.c src/base/stack.c src/base/superglobals.c"
XDEBUG_LIB_SOURCES="src/lib/usefulstuff.c src/lib/compat.c src/lib/hash.c src/lib/llist.c src/lib/private.c src/lib/set.c src/lib/str.c src/lib/var.c src/lib/xml.c"

XDEBUG_COVERAGE_SOURCES="src/coverage/branch_info.c src/coverage/code_coverage.c"
XDEBUG_DEBUGGER_SOURCES="src/debugger/com.c src/debugger/handler_dbgp.c src/debugger/handlers.c"
XDEBUG_GCSTATS_SOURCES="src/gcstats/gc_stats.c"
XDEBUG_PROFILER_SOURCES="src/profiler/profiler.c"
XDEBUG_TRACING_SOURCES="src/tracing/trace_computerized.c src/tracing/trace_html.c src/tracing/trace_textual.c src/tracing/tracing.c"

PHP_NEW_EXTENSION(xdebug, xdebug.c $XDEBUG_BASE_SOURCES $XDEBUG_LIB_SOURCES $XDEBUG_COVERAGE_SOURCES $XDEBUG_DEBUGGER_SOURCES $XDEBUG_GCSTATS_SOURCES $XDEBUG_PROFILER_SOURCES $XDEBUG_TRACING_SOURCES, $ext_shared,,$PHP_XDEBUG_CFLAGS,,yes)
PHP_SUBST(XDEBUG_SHARED_LIBADD)
PHP_ADD_MAKEFILE_FRAGMENT

PHP_ADD_INCLUDE($ext_srcdir/src)
PHP_ADD_INCLUDE($ext_builddir/src)
fi
27 changes: 19 additions & 8 deletions config.w32
View file
Expand Up @@ -3,20 +3,31 @@
ARG_WITH("xdebug", "Xdebug support", "no");

if (PHP_XDEBUG != 'no') {
var files = 'xdebug.c xdebug_branch_info.c xdebug_code_coverage.c ' +
'xdebug_com.c xdebug_compat.c xdebug_filter.c xdebug_gc_stats.c ' +
'xdebug_handler_dbgp.c ' +
'xdebug_handlers.c xdebug_llist.c xdebug_monitor.c ' +
'xdebug_hash.c xdebug_private.c xdebug_profiler.c ' +
'xdebug_set.c xdebug_stack.c xdebug_str.c xdebug_superglobals.c ' +
'xdebug_tracing.c xdebug_trace_textual.c xdebug_trace_computerized.c ' +
'xdebug_trace_html.c xdebug_var.c xdebug_xml.c usefulstuff.c';
var XDEBUG_BASE_SOURCES="base.c filter.c monitor.c stack.c superglobals.c"
var XDEBUG_LIB_SOURCES="usefulstuff.c compat.c hash.c llist.c private.c set.c str.c var.c xml.c"

var XDEBUG_COVERAGE_SOURCES="branch_info.c code_coverage.c"
var XDEBUG_DEBUGGER_SOURCES="com.c handler_dbgp.c handlers.c"
var XDEBUG_GCSTATS_SOURCES="gc_stats.c"
var XDEBUG_PROFILER_SOURCES="profiler.c"
var XDEBUG_TRACING_SOURCES="trace_computerized.c trace_html.c trace_textual.c tracing.c"

var files = "xdebug.c";

if (typeof(ZEND_EXTENSION) == 'undefined') {
EXTENSION('xdebug', files);
} else {
ZEND_EXTENSION('xdebug', files);
}
ADD_FLAG("CFLAGS_XDEBUG", " /I " + configure_module_dirname + " ");
ADD_FLAG("CFLAGS_XDEBUG", " /I " + configure_module_dirname + "/src ");
ADD_SOURCES(configure_module_dirname + "/src/base", XDEBUG_BASE_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/lib", XDEBUG_LIB_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/coverage", XDEBUG_COVERAGE_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/debugger", XDEBUG_DEBUGGER_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/gcstats", XDEBUG_GCSTATS_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/profiler", XDEBUG_PROFILER_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/tracing", XDEBUG_TRACING_SOURCES, "xdebug");

AC_DEFINE("HAVE_XDEBUG", 1, "Xdebug support");
}
120 changes: 70 additions & 50 deletions package.xml
View file
Expand Up @@ -83,64 +83,84 @@ Thu, Jul 25, 2019 - xdebug 2.8.0beta1
<file name="usefulstuff.c" role="src" />
<file name="usefulstuff.h" role="src" />
</dir> <!-- /debugclient -->

<file name="config.m4" role="src" />
<file name="config.w32" role="src" />
<file name="CREDITS" role="doc" />
<file name="LICENSE" role="doc" />
<file name="xdebug.ini" role="doc" />
<file name="Makefile.frag" role="src" />
<file name="php_xdebug.h" role="src" />
<file name="README.rst" role="doc" />
<file name="usefulstuff.c" role="src" />
<file name="usefulstuff.h" role="src" />

<file name="xdebug.c" role="src" />
<file name="xdebug_branch_info.c" role="src" />
<file name="xdebug_branch_info.h" role="src" />
<file name="xdebug_code_coverage.c" role="src" />
<file name="xdebug_code_coverage.h" role="src" />
<file name="xdebug_com.c" role="src" />
<file name="xdebug_com.h" role="src" />
<file name="xdebug_compat.c" role="src" />
<file name="xdebug_compat.h" role="src" />
<file name="xdebug_filter.c" role="src" />
<file name="xdebug_filter.h" role="src" />
<file name="xdebug_gc_stats.c" role="src" />
<file name="xdebug_gc_stats.h" role="src" />
<file name="xdebug_handlers.c" role="src" />
<file name="xdebug_handlers.h" role="src" />
<file name="xdebug_handler_dbgp.c" role="src" />
<file name="xdebug_handler_dbgp.h" role="src" />
<file name="xdebug_hash.c" role="src" />
<file name="xdebug_hash.h" role="src" />
<file name="xdebug_llist.c" role="src" />
<file name="xdebug_llist.h" role="src" />
<file name="xdebug_mm.h" role="src" />
<file name="xdebug_monitor.c" role="src" />
<file name="xdebug_monitor.h" role="src" />
<file name="xdebug_private.c" role="src" />
<file name="xdebug_private.h" role="src" />
<file name="xdebug_profiler.c" role="src" />
<file name="xdebug_profiler.h" role="src" />
<file name="xdebug_set.c" role="src" />
<file name="xdebug_set.h" role="src" />
<file name="xdebug_stack.c" role="src" />
<file name="xdebug_stack.h" role="src" />
<file name="xdebug_str.c" role="src" />
<file name="xdebug_str.h" role="src" />
<file name="xdebug_superglobals.c" role="src" />
<file name="xdebug_superglobals.h" role="src" />
<file name="xdebug_tracing.c" role="src" />
<file name="xdebug_tracing.h" role="src" />
<file name="xdebug_trace_textual.c" role="src" />
<file name="xdebug_trace_textual.h" role="src" />
<file name="xdebug_trace_computerized.c" role="src" />
<file name="xdebug_trace_computerized.h" role="src" />
<file name="xdebug_trace_html.c" role="src" />
<file name="xdebug_trace_html.h" role="src" />
<file name="xdebug_var.c" role="src" />
<file name="xdebug_var.h" role="src" />
<file name="xdebug_xml.c" role="src" />
<file name="xdebug_xml.h" role="src" />
<dir name="src">
<file name="php_xdebug.h" role="src" />
<dir name="base">
<file name="base.c" role="src" />
<file name="base.h" role="src" />
<file name="filter.c" role="src" />
<file name="filter.h" role="src" />
<file name="monitor.c" role="src" />
<file name="monitor.h" role="src" />
<file name="stack.c" role="src" />
<file name="stack.h" role="src" />
<file name="superglobals.c" role="src" />
<file name="superglobals.h" role="src" />
</dir>
<dir name="lib">
<file name="usefulstuff.c" role="src" />
<file name="usefulstuff.h" role="src" />
<file name="compat.c" role="src" />
<file name="compat.h" role="src" />
<file name="hash.c" role="src" />
<file name="hash.h" role="src" />
<file name="llist.c" role="src" />
<file name="llist.h" role="src" />
<file name="mm.h" role="src" />
<file name="private.c" role="src" />
<file name="private.h" role="src" />
<file name="set.c" role="src" />
<file name="set.h" role="src" />
<file name="str.c" role="src" />
<file name="str.h" role="src" />
<file name="var.c" role="src" />
<file name="var.h" role="src" />
<file name="xml.c" role="src" />
<file name="xml.h" role="src" />
</dir>
<dir name="coverage">
<file name="branch_info.c" role="src" />
<file name="branch_info.h" role="src" />
<file name="code_coverage.c" role="src" />
<file name="code_coverage.h" role="src" />
</dir>
<dir name="debugger">
<file name="com.c" role="src" />
<file name="com.h" role="src" />
<file name="handlers.c" role="src" />
<file name="handlers.h" role="src" />
<file name="handler_dbgp.c" role="src" />
<file name="handler_dbgp.h" role="src" />
</dir>
<dir name="gcstats">
<file name="gc_stats.c" role="src" />
<file name="gc_stats.h" role="src" />
</dir>
<dir name="profiler">
<file name="profiler.c" role="src" />
<file name="profiler.h" role="src" />
</dir>
<dir name="tracing">
<file name="tracing.c" role="src" />
<file name="tracing.h" role="src" />
<file name="trace_textual.c" role="src" />
<file name="trace_textual.h" role="src" />
<file name="trace_computerized.c" role="src" />
<file name="trace_computerized.h" role="src" />
<file name="trace_html.c" role="src" />
<file name="trace_html.h" role="src" />
</dir>
</dir>
</dir> <!-- / -->
</contents>
<dependencies>
Expand Down

0 comments on commit 4686302

Please sign in to comment.