summaryrefslogtreecommitdiff
path: root/pear
diff options
context:
space:
mode:
authorStig Bakken <ssb@php.net>2001-01-10 01:01:59 +0000
committerStig Bakken <ssb@php.net>2001-01-10 01:01:59 +0000
commit6792978aed5a5aaa0a3548a41b2ba8f14a5a1aba (patch)
tree4f0f28925de00334431fc73955c3e5db8a5444ef /pear
parentc172daa6d1059abfd6454e53a88a4797183bc97d (diff)
downloadphp-git-6792978aed5a5aaa0a3548a41b2ba8f14a5a1aba.tar.gz
* updated copyrights (thanks Colin)
* moved scripts to own directory (bug #7635)
Diffstat (limited to 'pear')
-rw-r--r--pear/DB.php2
-rw-r--r--pear/HTTP.php2
-rw-r--r--pear/Mail.php2
-rw-r--r--pear/Makefile.in19
-rw-r--r--pear/PEAR.php.in2
-rw-r--r--pear/PEAR/Installer.php2
-rw-r--r--pear/package.dtd44
-rwxr-xr-xpear/run-tests.in85
-rw-r--r--pear/scripts/pear.in (renamed from pear/pear.in)0
-rw-r--r--pear/scripts/php-config.in (renamed from pear/php-config.in)0
-rwxr-xr-xpear/scripts/phpextdist (renamed from pear/phpextdist)0
-rw-r--r--pear/scripts/phpize.in (renamed from pear/phpize.in)0
12 files changed, 23 insertions, 135 deletions
diff --git a/pear/DB.php b/pear/DB.php
index d8a60ac801..788aed02fc 100644
--- a/pear/DB.php
+++ b/pear/DB.php
@@ -3,7 +3,7 @@
// +----------------------------------------------------------------------+
// | PHP version 4.0 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group |
+// | Copyright (c) 1997-2001 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 |
diff --git a/pear/HTTP.php b/pear/HTTP.php
index b66554925b..c1cc877c8d 100644
--- a/pear/HTTP.php
+++ b/pear/HTTP.php
@@ -3,7 +3,7 @@
// +----------------------------------------------------------------------+
// | PHP version 4.0 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group |
+// | Copyright (c) 1997-2001 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 |
diff --git a/pear/Mail.php b/pear/Mail.php
index 0240d449c0..369f21529f 100644
--- a/pear/Mail.php
+++ b/pear/Mail.php
@@ -3,7 +3,7 @@
// +----------------------------------------------------------------------+
// | PHP version 4.0 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group |
+// | Copyright (c) 1997-2001 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 |
diff --git a/pear/Makefile.in b/pear/Makefile.in
index b529a7b107..6808a5f2c5 100644
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -106,16 +106,15 @@ BUILD_FILES = \
dynlib.m4 \
acinclude.m4
-bin_PROGRAMS = phpize php-config pear
+bin_SCRIPTS = phpize php-config pear phpextdist
install-build:
$(mkinstalldirs) $(phpbuilddir) $(bindir) && \
(cd $(top_srcdir) && cp $(BUILD_FILES) $(phpbuilddir))
install-programs:
- $(INSTALL) -m 755 $(srcdir)/phpextdist $(bindir)/phpextdist
- for prog in $(bin_PROGRAMS); do \
- $(INSTALL) -m 755 $$prog $(bindir)/$$prog; \
+ for prog in $(bin_SCRIPTS); do \
+ $(INSTALL) -m 755 scripts/$$prog $(bindir)/$$prog; \
done
HEADER_DIRS = \
@@ -143,14 +142,14 @@ install-headers:
Makefile: Makefile.in $(top_builddir)/config.status
(cd ..;CONFIG_FILES=pear/Makefile CONFIG_HEADERS= $(top_builddir)/config.status)
-pear: pear.in $(top_builddir)/config.status
- (cd ..;CONFIG_FILES=pear/pear CONFIG_HEADERS= $(top_builddir)/config.status)
+scripts/pear: scripts/pear.in $(top_builddir)/config.status
+ (cd ..;CONFIG_FILES=pear/scripts/pear CONFIG_HEADERS= $(top_builddir)/config.status)
-phpize: phpize.in $(top_builddir)/config.status
- (cd ..;CONFIG_FILES=pear/phpize CONFIG_HEADERS= $(top_builddir)/config.status)
+scripts/phpize: scripts/phpize.in $(top_builddir)/config.status
+ (cd ..;CONFIG_FILES=pear/scripts/phpize CONFIG_HEADERS= $(top_builddir)/config.status)
-php-config: php-config.in $(top_builddir)/config.status
- (cd ..;CONFIG_FILES=pear/php-config CONFIG_HEADERS= $(top_builddir)/config.status)
+scripts/php-config: scripts/php-config.in $(top_builddir)/config.status
+ (cd ..;CONFIG_FILES=pear/scripts/php-config CONFIG_HEADERS= $(top_builddir)/config.status)
PEAR.php: PEAR.php.in $(top_builddir)/config.status
(cd ..;CONFIG_FILES=pear/PEAR.php CONFIG_HEADERS= $(top_builddir)/config.status)
diff --git a/pear/PEAR.php.in b/pear/PEAR.php.in
index 06138fec7e..88d3ca474c 100644
--- a/pear/PEAR.php.in
+++ b/pear/PEAR.php.in
@@ -3,7 +3,7 @@
// +----------------------------------------------------------------------+
// | PHP version 4.0 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group |
+// | Copyright (c) 1997-2001 The PHP Group |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license, |
// | that is bundled with this package in the file LICENSE, and is |
diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
index 4d1f724ec6..e5f1faec4a 100644
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -3,7 +3,7 @@
// +----------------------------------------------------------------------+
// | PHP version 4.0 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group |
+// | Copyright (c) 1997-2001 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 |
diff --git a/pear/package.dtd b/pear/package.dtd
index cb1f7b0dea..c4ecbed5ce 100644
--- a/pear/package.dtd
+++ b/pear/package.dtd
@@ -1,17 +1,12 @@
<!--
- $Id: package.dtd,v 1.1 2000-07-25 00:55:36 ssb Exp $
+ $Id: package.dtd,v 1.2 2001-01-10 01:01:52 ssb Exp $
This is the PEAR package description, version 1.0.
It should be used with the informal public identifier:
"-//PHP Group//DTD PEAR Package 1.0//EN//XML"
- Using XML namespaces is optional, but the namespace that should
- be used for this DTD is:
-
- "http://xmlns.php.net/pear/package".
-
- Copyright (c) 1997, 1998, 1999, 2000 The PHP Group
+ Copyright (c) 1997-2001 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
@@ -30,9 +25,10 @@
<!ENTITY % global.atts "id ID #IMPLIED">
<!--============== attributes common to several elements ===================-->
+<!ENTITY % role.atts "Role (php|ext|test|doc) 'php'">
<!ENTITY % extension.atts "Debug (on|off) 'off'
ThreadSafe (on|off) 'off'">
-<!ENTITY % format.atts "Format CDATA #REQUIRED">
+<!ENTITY % format.atts "Format CDATA #IMPLIED">
<!--=============== ELEMENT: Package =======================================-->
<!ELEMENT Package (Name,Summary,Maintainer,Release,FileList)>
@@ -76,38 +72,16 @@
<!ATTLIST Notes %global.atts;>
<!--=============== ELEMENT: FileList ======================================-->
-<!ELEMENT FileList (DestDir |
- Dir | File |
- ExtDir | ExtFile |
- DocDir | DocFile)*>
+<!ELEMENT FileList (Dir | File)*>
<!ATTLIST FileList %global.atts;>
-<!--=============== ELEMENT: DestDir =======================================-->
-<!ELEMENT DestDir (#PCDATA)>
-<!ATTLIST DestDir %global.atts;>
-
<!--=============== ELEMENT: Dir ===========================================-->
<!ELEMENT Dir (#PCDATA)>
<!ATTLIST Dir %global.atts;>
<!--=============== ELEMENT: File ==========================================-->
<!ELEMENT File (#PCDATA)>
-<!ATTLIST File %global.atts;>
-
-<!--=============== ELEMENT: ExtDir ========================================-->
-<!ELEMENT ExtDir (#PCDATA)>
-<!ATTLIST ExtDir %global.atts;>
-
-<!--=============== ELEMENT: ExtFile =======================================-->
-<!ELEMENT ExtFile (#PCDATA)>
-<!ATTLIST ExtFile %global.atts;
- %extension.atts;>
-
-<!--=============== ELEMENT: DocDir ========================================-->
-<!ELEMENT DocDir (#PCDATA)>
-<!ATTLIST DocDir %global.atts;>
-
-<!--=============== ELEMENT: DocFile =======================================-->
-<!ELEMENT DocFile (#PCDATA)>
-<!ATTLIST DocFile %global.atts;
- %format.atts;>
+<!ATTLIST File %global.atts;
+ %role.atts;
+ %extension.atts;
+ %format.atts;>
diff --git a/pear/run-tests.in b/pear/run-tests.in
deleted file mode 100755
index 2ebf1a56bc..0000000000
--- a/pear/run-tests.in
+++ /dev/null
@@ -1,85 +0,0 @@
-#!@prefix@/bin/php -f
-<?php // -*- C++ -*-
-
-$prefix = "@prefix@";
-$bindir = "@prefix@/bin";
-$php = "$bindir/php";
-$installdir = '@PEAR_INSTALLDIR@';
-$extdir = '@EXTENSION_DIR@';
-$abs_srcdir = '@abs_srcdir@/pear';
-
-$incpath = ".:$abs_srcdir/pear/tests:$abs_srcdir/pear/tests";
-
-$start = "*";
-if ($argc > 1) {
- $start = implode(" ", $argv);
-}
-$fp = popen("find $start -name tests -type d -print", "r");
-if (!$fp) {
- die("Could not run find!\n");
-}
-
-$failed = 0;
-$passed = 0;
-$tests = 0;
-
-while ($dir = trim(fgets($fp, 1024))) {
-// print "DIRECTORY : $dir\n";
- //print "dir=$dir\n";
- $dp = opendir($dir);
- while ($ent = readdir($dp)) {
- if (substr($ent, 0, 1) == "." || substr($ent, -2) != ".t") {
- continue;
- }
- $res = substr($ent, 0, -1) . 'r';
- $out = substr($ent, 0, -1) . 'o';
- $cmd = ("cd $dir; $php -d include_path=$incpath ".
- "-d auto_prepend_file=none ".
- "-d html_errors=no ".
- "-f $ent 2>/dev/null | ".
- "tee $out 2>/dev/null | cmp -s $res -");
- //print "cmd=$cmd\n";
- $err = 0;
- system($cmd, &$err);
- if ($err) {
- print "FAILED : ";
- $failed++;
- } else {
- unlink("$dir/$out");
- print "PASSED : ";
- $passed++;
- }
- $tests++;
- print "$dir/$ent";
- if ($err) {
- print " (see $dir/$out)";
- }
- print "\n";
- }
- closedir($dp);
-}
-pclose($fp);
-
-$percent = $failed ? ($passed * 100) / $tests : 100;
-$percentstr = sprintf($percent < 10.0 ? "%.1f%%" : "%.0f%%", $percent);
-print "\n----------- SUMMARY -----------\n";
-printf("Tests performed: %d\n".
- "Tests passed: %d\n".
- "Tests failed: %d\n".
- "Success rate: %s\n",
- $tests, $passed, $failed, $percentstr);
-if ($failed) {
- die("
-One or more tests failed. The file where you can find the output
-from the test (.o file) should be listed after the FAILED message. The
-expected output can be found in the corresponding .r file, the source code
-for the test can be found in the .t file.
-
-Please compare the actual output with the expected output and see if
-it is a local configuration problem or an actual bug. If it is a bug,
-please report it at http://bugs.php.net/.
-
-");
-}
-
-?>
diff --git a/pear/pear.in b/pear/scripts/pear.in
index 7025befba1..7025befba1 100644
--- a/pear/pear.in
+++ b/pear/scripts/pear.in
diff --git a/pear/php-config.in b/pear/scripts/php-config.in
index 62acb5ac68..62acb5ac68 100644
--- a/pear/php-config.in
+++ b/pear/scripts/php-config.in
diff --git a/pear/phpextdist b/pear/scripts/phpextdist
index 97df70020d..97df70020d 100755
--- a/pear/phpextdist
+++ b/pear/scripts/phpextdist
diff --git a/pear/phpize.in b/pear/scripts/phpize.in
index 33b5ad2cfb..33b5ad2cfb 100644
--- a/pear/phpize.in
+++ b/pear/scripts/phpize.in
View Lorry Controller Status