From 0cb305a4f873adf7893fae58b4c3b999853a301f Mon Sep 17 00:00:00 2001 From: SVN Migration Date: Tue, 28 Jan 2003 10:59:13 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'PHP_4_3'. --- build/config-stubs | 8 +++ scripts/Makefile.frag | 65 ++++++++++++++++++++ scripts/dev/conv_proto | 30 ++++++++++ scripts/dev/conv_z_macros | 61 +++++++++++++++++++ scripts/dev/credits | 26 ++++++++ scripts/php-config.in | 32 ++++++++++ scripts/phpextdist | 27 +++++++++ scripts/phpize.in | 56 +++++++++++++++++ scripts/phpize.m4 | 123 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 428 insertions(+) create mode 100755 build/config-stubs create mode 100644 scripts/Makefile.frag create mode 100755 scripts/dev/conv_proto create mode 100755 scripts/dev/conv_z_macros create mode 100755 scripts/dev/credits create mode 100644 scripts/php-config.in create mode 100755 scripts/phpextdist create mode 100644 scripts/phpize.in create mode 100644 scripts/phpize.m4 diff --git a/build/config-stubs b/build/config-stubs new file mode 100755 index 0000000000..28208085a7 --- /dev/null +++ b/build/config-stubs @@ -0,0 +1,8 @@ +#!/bin/sh +# +# $Id$ + +dir=$1; shift +for stubfile in $dir/*/config0.m4 $dir/*/config.m4 $dir/*/config9.m4; do + echo "sinclude($stubfile)" +done diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag new file mode 100644 index 0000000000..7dc699d951 --- /dev/null +++ b/scripts/Makefile.frag @@ -0,0 +1,65 @@ + +# +# Build environment install +# + +phpincludedir = $(includedir)/php +phpbuilddir = $(prefix)/lib/php/build + +BUILD_FILES = \ + scripts/phpize.m4 \ + build/mkdep.awk \ + build/shtool \ + Makefile.global \ + scan_makefile_in.awk \ + acinclude.m4 + +bin_SCRIPTS = phpize php-config +bin_src_SCRIPTS = phpextdist + +install-build: + @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \ + (cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir)) + +HEADER_DIRS = \ + / \ + Zend \ + TSRM \ + ext/standard \ + ext/session \ + ext/xml \ + ext/xml/expat \ + main \ + ext/mbstring \ + ext/pgsql \ + regex + +install-headers: + -@for i in $(HEADER_DIRS); do \ + paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \ + done; \ + $(mkinstalldirs) $$paths && \ + echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \ + for i in $(HEADER_DIRS); do \ + (cd $(top_srcdir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + cd $(top_builddir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \ + done; \ + cd $(top_srcdir)/sapi/embed && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/main + +install-programs: + @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/" + @for prog in $(bin_SCRIPTS); do \ + echo " program: $$prog"; \ + $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + done + @for prog in $(bin_src_SCRIPTS); do \ + echo " program: $$prog"; \ + $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + done + +$(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status + (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) + +$(builddir)/php-config: $(srcdir)/php-config.in $(top_builddir)/config.status + (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) diff --git a/scripts/dev/conv_proto b/scripts/dev/conv_proto new file mode 100755 index 0000000000..fad9cfaa83 --- /dev/null +++ b/scripts/dev/conv_proto @@ -0,0 +1,30 @@ +#! /bin/sh +# +# do some automatic conversion of prototypes +# + +if test "$1" = "" ; then + echo "usage: $0 list-of-files" + exit 1 +fi + +tmpfile=`mktemp -q /tmp/asd.XXXXXX` + +if test "$?" != "0" ; then + echo "$0: cannot create temporary file" + exit 1 +fi + +for file in ${1+"$@"} ; do + echo "working on $file" + cat $file | \ + sed -e \ + 's/void php3_\(.*\)(INTERNAL_FUNCTION_PARAMETERS)/PHP_FUNCTION(\1)/' \ + -e 's/^extern void /void /' \ + -e 's/^extern PHP_FUNCTION/PHP_FUNCTION/' > $tmpfile + cp $tmpfile $file +done + +rm -f $tmpfile + +exit 0 diff --git a/scripts/dev/conv_z_macros b/scripts/dev/conv_z_macros new file mode 100755 index 0000000000..7d15c71202 --- /dev/null +++ b/scripts/dev/conv_z_macros @@ -0,0 +1,61 @@ +#! /bin/sh +# +# +----------------------------------------------------------------------+ +# | PHP Version 4 | +# +----------------------------------------------------------------------+ +# | Copyright (c) 1997-2002 The PHP Group | +# +----------------------------------------------------------------------+ +# | This source file is subject to version 2.02 of the PHP license, | +# | that is bundled with this package in the file LICENSE, and is | +# | available at through the world-wide-web at | +# | http://www.php.net/license/2_02.txt. | +# | If you did not receive a copy of the PHP license and are unable to | +# | obtain it through the world-wide-web, please send a note to | +# | license@php.net so we can mail you a copy immediately. | +# +----------------------------------------------------------------------+ +# | Author: Sascha Schumann | +# +----------------------------------------------------------------------+ +# +# $Id$ + +for i in $@; do + echo -n "Processing $i... " + sed \ + -e 's/(\*\([^()]\+\))->type/Z_TYPE_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->type/Z_TYPE_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.type/Z_TYPE(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.dval/Z_DVAL_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.dval/Z_DVAL_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.dval/Z_DVAL(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.lval/Z_LVAL_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.lval/Z_LVAL_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.lval/Z_LVAL(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.ht/Z_ARRVAL_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.ht/Z_ARRVAL_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.ht/Z_ARRVAL(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.str\.val/Z_STRVAL_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.str\.val/Z_STRVAL_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.str\.val/Z_STRVAL(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.str\.len/Z_STRLEN_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.str\.len/Z_STRLEN_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.str\.len/Z_STRLEN(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.obj\.properties/Z_OBJPROP_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj\.properties/Z_OBJPROP_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj\.properties/Z_OBJPROP(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.obj\.ce/Z_OBJCE_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj\.ce/Z_OBJCE_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj\.ce/Z_OBJCE(\1)/g' \ + -e 's/(\*\([^()]\+\))->value\.obj/Z_OBJ_PP(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj/Z_OBJ_P(\1)/g' \ + -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj/Z_OBJ(\1)/g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)->Z_\([A-Z_]\+\)(/Z_\2(\1->/g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)->Z_\([A-Z_]\+\)(/Z_\2(\1->/g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)->Z_\([A-Z_]\+\)(/Z_\2(\1->/g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)\.Z_\([A-Z_]\+\)(/Z_\2(\1./g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)\.Z_\([A-Z_]\+\)(/Z_\2(\1./g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)\.Z_\([A-Z_]\+\)(/Z_\2(\1./g' \ + < $i > tmp && cp tmp $i + echo "DONE" +done + +rm -f tmp diff --git a/scripts/dev/credits b/scripts/dev/credits new file mode 100755 index 0000000000..b76fb311df --- /dev/null +++ b/scripts/dev/credits @@ -0,0 +1,26 @@ +#!/bin/sh +awkprog=' +BEGIN { FS = "\n"; RS = "" } +{ print "CREDIT_LINE(\""$1"\", \""$2"\");" }' + +for what in ext sapi +do + file=ext/standard/credits_$what.h + cat >$file <> $file +done diff --git a/scripts/php-config.in b/scripts/php-config.in new file mode 100644 index 0000000000..abdab2ce0e --- /dev/null +++ b/scripts/php-config.in @@ -0,0 +1,32 @@ +#! /bin/sh + +prefix="@prefix@" +version="@PHP_VERSION@" +includedir="@includedir@/php" +includes="-I$includedir -I$includedir/main -I$includedir/Zend" +ldflags="@PHP_LDFLAGS@" +libs="@EXTRA_LIBS@" +if test '@TSRM_DIR@' != ''; then + includes="$includes -I$includedir/TSRM" +fi +extension_dir='@EXTENSION_DIR@' + +case "$1" in +--prefix) + echo $prefix;; +--includes) + echo $includes;; +--ldflags) + echo $ldflags;; +--libs) + echo $libs;; +--extension-dir) + echo $extension_dir;; +--version) + echo $version;; +*) + echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--version]" + exit 1;; +esac + +exit 0 diff --git a/scripts/phpextdist b/scripts/phpextdist new file mode 100755 index 0000000000..97df70020d --- /dev/null +++ b/scripts/phpextdist @@ -0,0 +1,27 @@ +#! /bin/sh +if test $# -lt 2; then + echo "usage: phpextdist "; + exit 1 +fi + +phpize=`php-config --prefix`/bin/phpize +distname="$1-$2" + +if test ! -f Makefile.in || test ! -f config.m4; then + echo "Did not find required files in current directory" + exit 1 +fi + +rm -rf modules *.lo *.o *.la config.status config.cache \ +config.log libtool php_config.h config_vars.mk Makefile + +myname=`basename \`pwd\`` +cd .. +cp -rp $myname $distname +cd $distname +$phpize +cd .. +tar cf $distname.tar $distname +rm -rf $distname $distname.tar.* +gzip --best $distname.tar +mv $distname.tar.gz $myname diff --git a/scripts/phpize.in b/scripts/phpize.in new file mode 100644 index 0000000000..66ba42068a --- /dev/null +++ b/scripts/phpize.in @@ -0,0 +1,56 @@ +#! /bin/sh + +prefix='@prefix@' +phpdir="$prefix/lib/php/build" +includedir="$prefix/include/php" +builddir="`pwd`" + +FILES_BUILD="mkdep.awk shtool" +FILES="acinclude.m4 Makefile.global scan_makefile_in.awk" +CLEAN_FILES="$FILES *.lo *.la *.o .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 \ + config.log config.status Makefile Makefile.fragments Makefile.objects" + +if test ! -r config.m4; then + echo "Cannot find config.m4. " + echo "Make sure that you run $0 in the top level source directory of the module" + exit 1 +fi + +# Cleanup +if test "$1" = "--clean"; then + echo "Cleaning.." + for i in $CLEAN_FILES; do + test -e && rm -rf $i + done + exit 0 +fi + +test -d build || mkdir build + +(cd $phpdir && cp $FILES_BUILD "$builddir"/build) +(cd $phpdir && cp $FILES "$builddir") + +sed \ +-e "s#@prefix@#$prefix#" \ +< $phpdir/phpize.m4 > configure.in + +touch install-sh mkinstalldirs missing + +aclocal +autoconf +autoheader +libtoolize -f -c + +# dumping API NOs: +PHP_API_VERSION=`grep -E '#define PHP_API_VERSION' $includedir/main/php.h|sed 's/#define PHP_API_VERSION//'` +ZEND_MODULE_API_NO=`grep -E '#define ZEND_MODULE_API_NO' $includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'` +ZEND_EXTENSION_API_NO=`grep -E '#define ZEND_EXTENSION_API_NO' $includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'` + +echo "Configuring for:" +echo " PHP Api Version: "$PHP_API_VERSION +echo " Zend Module Api No: "$ZEND_MODULE_API_NO +echo " Zend Extension Api No: "$ZEND_EXTENSION_API_NO + +exit 0 diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 new file mode 100644 index 0000000000..9f1371716e --- /dev/null +++ b/scripts/phpize.m4 @@ -0,0 +1,123 @@ +dnl This file becomes configure.in for self-contained extensions. + +AC_INIT(config.m4) + +PHP_INIT_BUILD_SYSTEM + +AC_DEFUN(PHP_WITH_PHP_CONFIG,[ + AC_ARG_WITH(php-config, +[ --with-php-config=PATH],[ + PHP_CONFIG=$withval +],[ + PHP_CONFIG=php-config +]) + + prefix=`$PHP_CONFIG --prefix 2>/dev/null` + INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` + EXTENSION_DIR=`$PHP_CONFIG --extension-dir` + + if test -z "$prefix"; then + AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH) + fi + AC_MSG_CHECKING(for PHP prefix) + AC_MSG_RESULT($prefix) + AC_MSG_CHECKING(for PHP includes) + AC_MSG_RESULT($INCLUDES) + AC_MSG_CHECKING(for PHP extension directory) + AC_MSG_RESULT($EXTENSION_DIR) +]) +dnl +AC_DEFUN(PHP_EXT_BUILDDIR,[.])dnl +AC_DEFUN(PHP_EXT_DIR,[""])dnl +AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir])dnl +AC_DEFUN(PHP_ALWAYS_SHARED,[ + ext_output="yes, shared" + ext_shared=yes + test "[$]$1" = "no" && $1=yes +])dnl +dnl +abs_srcdir=`(cd $srcdir && pwd)` +abs_builddir=`pwd` + +PHP_CONFIG_NICE(config.nice) + +AC_PROG_CC +AC_PROG_CC_C_O + +PHP_RUNPATH_SWITCH +PHP_SHLIB_SUFFIX_NAME +PHP_WITH_PHP_CONFIG + +PHP_BUILD_SHARED + +AC_PREFIX_DEFAULT() + +AC_ARG_WITH(openssl, +[ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.5) ], +[ + if test "$withval" != "no"; then + PHP_WITH_SHARED + PHP_OPENSSL=$withval + ext_openssl_shared=yes + ext_shared=yes + PHP_SETUP_OPENSSL + fi +]) + +sinclude(config.m4) + +enable_static=no +enable_shared=yes + +AC_PROG_LIBTOOL +AC_PROG_AWK + +all_targets='$(PHP_MODULES)' +install_targets=install-modules +phplibdir="`pwd`/modules" +CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H" +CFLAGS_CLEAN=$CFLAGS + +test "$prefix" = "NONE" && prefix="/usr/local" +test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)' + +PHP_SUBST(PHP_MODULES) +PHP_SUBST(all_targets) +PHP_SUBST(install_targets) + +PHP_SUBST(prefix) +PHP_SUBST(exec_prefix) +PHP_SUBST(libdir) +PHP_SUBST(prefix) +PHP_SUBST(phplibdir) + +PHP_SUBST(PHP_COMPILE) +PHP_SUBST(CC) +PHP_SUBST(CFLAGS) +PHP_SUBST(CFLAGS_CLEAN) +PHP_SUBST(CPP) +PHP_SUBST(CPPFLAGS) +PHP_SUBST(CXX) +PHP_SUBST(DEFS) +PHP_SUBST(EXTENSION_DIR) +PHP_SUBST(EXTRA_LDFLAGS) +PHP_SUBST(EXTRA_LIBS) +PHP_SUBST(INCLUDES) +PHP_SUBST(LEX) +PHP_SUBST(LEX_OUTPUT_ROOT) +PHP_SUBST(LFLAGS) +PHP_SUBST(LDFLAGS) +PHP_SUBST(SHARED_LIBTOOL) +PHP_SUBST(LIBTOOL) +PHP_SUBST(SHELL) +PHP_SUBST(AWK) + +PHP_GEN_BUILD_DIRS +PHP_GEN_GLOBAL_MAKEFILE + +test -d modules || mkdir modules +touch .deps + +AC_CONFIG_HEADER(config.h) + +AC_OUTPUT() -- 2.40.0