Re: cvs: php-src / Makefile.global configure.in /scripts Makefile.frag php-config.in phpize.in phpize.m4 /scripts/man1 php-config.1.in
| From: | Marcus Boerger | Date: | Mon, 08 Aug 2005 18:07:05 +0000 |
| Subject: | Re: cvs: php-src / Makefile.global configure.in /scripts Makefile.frag php-config.in phpize.in phpize.m4 /scripts/man1 php-config.1.in | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-33221@lists.php.net to get a copy of this message | ||
Hello Jani,
what about server-tests.php?
marcus
Monday, August 8, 2005, 6:06:51 PM, you wrote:
> sniper Mon Aug 8 12:06:51 2005 EDT
> Modified files:
> /php-src Makefile.global configure.in
> /php-src/scripts Makefile.frag php-config.in phpize.in phpize.m4
> /php-src/scripts/man1 php-config.1.in
> Log:
> - Made it possible to do "make test" for phpized extensions
>
> http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.55&r2=1.56&ty=u
> Index: php-src/Makefile.global
> diff -u php-src/Makefile.global:1.55 php-src/Makefile.global:1.56
> --- php-src/Makefile.global:1.55 Thu Jun 16 14:58:04 2005
> +++ php-src/Makefile.global Mon Aug 8 12:06:47 2005
> @@ -45,15 +45,15 @@
> @rm -f modules/*.la >/dev/null 2>&1
> @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
> -install-tester:
> - @echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
> - @$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
> - @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
> -
> -install-su: install-pear install-tester
> +install-su: install-pear
> test:
> - -@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
> + -@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \
> + TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
> + TEST_PHP_SRCDIR=$(top_srcdir) \
> + CC="$(CC)" \
> + $(PHP_EXECUTABLE) -d 'extension_dir=modules/'
> -d 'extension='
basename $(PHP_MODULES)
> .la'.so' -d 'open_basedir=' -d
> 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
> $(top_srcdir)/run-tests.php tests/; \
> + elif test ! -z $(SAPI_CLI_PATH) && test -x $(SAPI_CLI_PATH); then \
> TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
> TEST_PHP_SRCDIR=$(top_srcdir) \
> CC="$(CC)" \
>
> http://cvs.php.net/diff.php/php-src/configure.in?r1=1.578&r2=1.579&ty=u
> Index: php-src/configure.in
> diff -u php-src/configure.in:1.578 php-src/configure.in:1.579
> --- php-src/configure.in:1.578 Sun Aug 7 16:47:29 2005
> +++ php-src/configure.in Mon Aug 8 12:06:47 2005
> @@ -1,4 +1,4 @@
> - ## $Id: configure.in,v 1.578 2005/08/07 20:47:29 hholzgra Exp $ -*- autoconf -*-
> + ## $Id: configure.in,v 1.579 2005/08/08 16:06:47 sniper Exp $ -*- autoconf -*-
> dnl ## Process this file with autoconf to produce a configure script.
> divert(1)
> @@ -1082,8 +1082,8 @@
> PHP_SUBST(bindir)
> PHP_SUBST(exec_prefix)
> -PHP_SUBST(program_prefix)
> -PHP_SUBST(program_suffix)
> +PHP_SUBST_OLD(program_prefix)
> +PHP_SUBST_OLD(program_suffix)
> PHP_SUBST(includedir)
> PHP_SUBST(libdir)
> PHP_SUBST(mandir)
> @@ -1183,7 +1183,7 @@
> CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
> all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
> -install_targets="$install_modules $install_pear install-build
> install-headers install-programs install-tester"
> +install_targets="$install_modules $install_pear install-build install-headers
> install-programs"
> case $PHP_SAPI in
> cgi)
>
> http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.23&r2=1.24&ty=u
> Index: php-src/scripts/Makefile.frag
> diff -u php-src/scripts/Makefile.frag:1.23 php-src/scripts/Makefile.frag:1.24
> --- php-src/scripts/Makefile.frag:1.23 Tue Jun 7 17:56:09 2005
> +++ php-src/scripts/Makefile.frag Mon Aug 8 12:06:48 2005
> @@ -13,7 +13,9 @@
> build/libtool.m4 \
> Makefile.global \
> acinclude.m4 \
> - ltmain.sh
> + ltmain.sh \
> + run-tests.php \
> + run-tests-config.php
> BUILD_FILES_EXEC = \
> build/shtool \
>
> http://cvs.php.net/diff.php/php-src/scripts/php-config.in?r1=1.2&r2=1.3&ty=u
> Index: php-src/scripts/php-config.in
> diff -u php-src/scripts/php-config.in:1.2 php-src/scripts/php-config.in:1.3
> --- php-src/scripts/php-config.in:1.2 Wed Mar 16 01:36:44 2005
> +++ php-src/scripts/php-config.in Mon Aug 8 12:06:49 2005
> @@ -1,12 +1,17 @@
> #! /bin/sh
> prefix="@prefix@"
> +exec_prefix="@exec_prefix@"
> version="@PHP_VERSION@"
> includedir="@includedir@/php"
> includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
> ldflags="@PHP_LDFLAGS@"
> libs="@EXTRA_LIBS@"
> extension_dir='@EXTENSION_DIR@'
> +program_prefix="@program_prefix@"
> +program_suffix="@program_suffix@"
> +exe_extension="@EXEEXT@"
> +php_binary="@bindir@/${program_prefix}php${program_suffix}${exe_extension}"
> case "$1" in
> --prefix)
> @@ -19,10 +24,12 @@
> echo $libs;;
> --extension-dir)
> echo $extension_dir;;
> +--php-binary)
> + echo $php_binary;;
> --version)
> echo $version;;
> *)
> - echo "Usage: $0
> [--prefix|--includes|--ldflags|--libs|--extension-dir|--version]"
> + echo "Usage: $0
> [--prefix|--includes|--ldflags|--libs|--extension-dir|--php-binary|--version]"
> exit 1;;
> esac
> t§’mD¦lÓ´
> ¼Žœ‡http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.26&r2=1.27&ty=u
> Index: php-src/scripts/phpize.in
> diff -u php-src/scripts/phpize.in:1.26 php-src/scripts/phpize.in:1.27
> --- php-src/scripts/phpize.in:1.26 Thu Aug 4 12:57:15 2005
> +++ php-src/scripts/phpize.in Mon Aug 8 12:06:49 2005
> @@ -8,11 +8,12 @@
> builddir="pwd"
> FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
> -FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh"
> +FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh
> run-tests*.php"
> CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
> mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
> aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache
> autom4te.cache/ \
> - config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h"
> + config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
> + run-tests*.php"
> # function declaration
> phpize_usage()
>
> http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.16&r2=1.17&ty=u
> Index: php-src/scripts/phpize.m4
> diff -u php-src/scripts/phpize.m4:1.16 php-src/scripts/phpize.m4:1.17
> --- php-src/scripts/phpize.m4:1.16 Sun Jun 5 08:58:59 2005
> +++ php-src/scripts/phpize.m4 Mon Aug 8 12:06:49 2005
> @@ -18,6 +18,7 @@
> prefix=$PHP_CONFIG --prefix 2>/dev/null
> INCLUDES=$PHP_CONFIG --includes 2>/dev/null
> EXTENSION_DIR=$PHP_CONFIG --extension-dir
> + PHP_EXECUTABLE=$PHP_CONFIG --php-binary
> if test -z "$prefix"; then
> AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH)
> @@ -99,6 +100,7 @@
> PHP_SUBST(CXX)
> PHP_SUBST(CXXFLAGS)
> PHP_SUBST(EXTENSION_DIR)
> +PHP_SUBST(PHP_EXECUTABLE)
> PHP_SUBST(EXTRA_LDFLAGS)
> PHP_SUBST(EXTRA_LIBS)
> PHP_SUBST(INCLUDES)
>
> http://cvs.php.net/diff.php/php-src/scripts/man1/php-config.1.in?r1=1.2&r2=1.3&ty=u
> Index: php-src/scripts/man1/php-config.1.in
> diff -u php-src/scripts/man1/php-config.1.in:1.2
> php-src/scripts/man1/php-config.1.in:1.3
> --- php-src/scripts/man1/php-config.1.in:1.2 Wed Aug 3 10:08:56 2005
> +++ php-src/scripts/man1/php-config.1.in Mon Aug 8 12:06:49 2005
> @@ -14,7 +14,7 @@
> ./" | Author: Jakub Vrana <vrana@php.net>
> ./"
> +----------------------------------------------------------------------+
> ./"
> -./" $Id: php-config.1.in,v 1.2 2005/08/03 14:08:56 sniper Exp $
> +./" $Id: php-config.1.in,v 1.3 2005/08/08 16:06:49 sniper Exp $
> ./"
> .TH php\-config 1 "Apr 2005" "The PHP Group" "Scripting
> Language"
> .SH NAME
> @@ -51,6 +51,10 @@
> Directory where extensions are searched by default
> .TP
> .PD 0
> +.B \-\-php-binary
> +Full path to php CLI/CGI binary
> +.TP
> +.PD 0
> .B \-\-version
> PHP version
> .TP
Best regards,
Marcus