com php-src: Merge branch 'master' of https://github.com/oerdnj/phpdbg into master Rewritten author line and included instructions to make install the
man page: Makefile.frag phpdbg.1
| From: | Bob Weinand | Date: | Wed, 25 Jun 2014 11:31:24 +0000 |
| Subject: | com php-src: Merge branch 'master' of https://github.com/oerdnj/phpdbg into master Rewritten author line and included instructions to make install the man page: Makefile.frag phpdbg.1 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79065@lists.php.net to get a copy of this message | ||
Commit: 858b45d4ad86a9d1ec857e20cf8c8e33c15500c0
Author: Bob Weinand <bobwei9@hotmail.com> Wed, 25 Jun 2014 13:26:58 +0200
Parents: e9c2e7d6e630ae660b6b5dc7269af58d4bf7bf54 62b6cdbbd783040f43eb4479357a85491214cedd
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=858b45d4ad86a9d1ec857e20cf8c8e33c15500c0
Log:
Merge branch 'master' of https://github.com/oerdnj/phpdbg into master
Rewritten author line and included instructions to make install the man page
Changed paths:
MM Makefile.frag
AM phpdbg.1
Diff:
diff --cc Makefile.frag
index d787b0f,d787b0f..b276aaa
--- a/Makefile.frag
+++ b/Makefile.frag
@@@ -26,6 -26,6 +26,9 @@@ install-phpdbg: $(BUILD_BINARY
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
@$(INSTALL) -m 0755 $(BUILD_BINARY)
$(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
++ @echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/"
++ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
++ @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
clean-phpdbg:
@echo "Cleaning phpdbg object files ..."
diff --cc phpdbg.1
index 0000000,68568d0..5e4d144
mode 000000,100644..100644
--- a/phpdbg.1
+++ b/phpdbg.1
@@@ -1,0 -1,59 +1,59 @@@
+ .TH PHPDBG 1
+ .SH NAME
+ phpdbg \- The interactive PHP debugger
+ .SH SYNOPSIS
+ .B phpdbg
+ [OPTION]
+ [\fB\-e\fIFILE\fR]
+ .SH DESCRIPTION
+ .B phpdbg
+ a lightweight, powerful, easy to use debugging platform for PHP5.
+ .SH OPTIONS
+ The following switches are implemented (just like cli SAPI):
+ .TP
+ .BR \-n
+ No \fBphp.ini\fR file will be used
+ .TP
+ .BR \-c \fIpath\fB|\fIfile\fR
+ Look for \fBphp.ini\fR file in the directory \fIpath\fR or use the specified \fIfile\fR
+ .TP
+ .BR \-z \fIfile\fR
+ Load Zend extension \fIfile\fR
+ .TP
+ .BR \-d \fIfoo\fB[=\fIbar\fB]\fR
+ Define INI entry \fIfoo\fR with value \fIbar\fR
+ .PP The following switches change the default behaviour of phpdbg:
+ .TP
+ .BR \-v
+ Disables quietness
+ .TP
+ .BR \-s
+ Enabled stepping
+ .TP
+ .BR -e \fIfile\fR
+ Sets execution context
+ .TP
+ .BR \-b
+ Disables use of colour on the console
+ .TP
+ .BR \-I
+ Ignore .phpdbginit (default init file)
+ .TP
+ .BR \-i \fIpath\fB|\ffile\fR
+ Override .phpgdbinit location (implies -I)
+ .TP
+ .BR \-O \fIfile\fR
+ Set oplog output to \fIfile\fR
+ .TP
+ .BR \-q
+ Do not print banner on startup
+ .TP
+ .BR \-r
+ Jump straight to run
+ .TP
+ .BR \-E
+ Enable step through eval()
+ .SH NOTES
+ Passing -rr will cause phpdbg to quit after execution, rather than returning to the console
+ .SH AUTHOR
-Written by Ondřej Surý for Debian project.
++Written by Felipe Pena, Joe Watkins and Bob Weinand, formatted by Ondřej Surý for Debian
project.