gwynne Wed Jul 25 21:59:55 2007 UTC
Modified files:
/phd README build.php convert.php index.php makestatic.php
/phd/schema phd.xsd
/phd/setup CLI.class.php Configurator.class.php HTTP.class.php
Option_Metadata.inc.php SAPI.interface.php
Template_File.class.php setup.messages.php setup.php
Log:
- Added revision to README
- Removed unnecessary shebang lines from PHP files
- Updated the schema's internal subset to conform to validating WXS
specifications
- Added documentation annotations to the schema, including revision.
- Fixed typo in schema.
- Updated all PHP files to give revision without breaking formatting
http://cvs.php.net/viewvc.cgi/phd/README?r1=1.1&r2=1.2&diff_format=u
Index: phd/README
diff -u phd/README:1.1 phd/README:1.2
--- phd/README:1.1 Wed Jul 25 05:04:37 2007
+++ phd/README Wed Jul 25 21:59:54 2007
@@ -2,6 +2,7 @@
Copyright(c) 2007 Gwynne Raskind and Hannes Magnusson
All Rights Reserved.
<[EMAIL PROTECTED]>
+$Id: README,v 1.2 2007/07/25 21:59:54 gwynne Exp $
At this time, all code and ideas here are completely experimental
and untested. Don't even pretend you know what you're doing in here
http://cvs.php.net/viewvc.cgi/phd/build.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/build.php
diff -u phd/build.php:1.1 phd/build.php:1.2
--- phd/build.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/build.php Wed Jul 25 21:59:54 2007
@@ -1,2 +0,0 @@
-#!/usr/local/php/bin/php
-
http://cvs.php.net/viewvc.cgi/phd/convert.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/convert.php
diff -u phd/convert.php:1.1 phd/convert.php:1.2
--- phd/convert.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/convert.php Wed Jul 25 21:59:54 2007
@@ -1,2 +0,0 @@
-#!/usr/local/php/bin/php
-
http://cvs.php.net/viewvc.cgi/phd/index.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/index.php
diff -u phd/index.php:1.1 phd/index.php:1.2
--- phd/index.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/index.php Wed Jul 25 21:59:54 2007
@@ -1,2 +0,0 @@
-#!/usr/local/php/bin/php
-
http://cvs.php.net/viewvc.cgi/phd/makestatic.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/makestatic.php
diff -u phd/makestatic.php:1.1 phd/makestatic.php:1.2
--- phd/makestatic.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/makestatic.php Wed Jul 25 21:59:54 2007
@@ -1,2 +0,0 @@
-#!/usr/local/php/bin/php
-
http://cvs.php.net/viewvc.cgi/phd/schema/phd.xsd?r1=1.1&r2=1.2&diff_format=u
Index: phd/schema/phd.xsd
diff -u phd/schema/phd.xsd:1.1 phd/schema/phd.xsd:1.2
--- phd/schema/phd.xsd:1.1 Wed Jul 25 04:52:54 2007
+++ phd/schema/phd.xsd Wed Jul 25 21:59:54 2007
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xsd:schema PUBLIC "-//W3C//DTD XMLSCHEMA 2000102//EN"
"http://www.w3.org/2001/XMLSchema.dtd";>
+<!DOCTYPE xsd:schema PUBLIC "-//W3C//DTD XMLSCHEMA 2000102//EN"
"http://www.w3.org/2001/XMLSchema.dtd"; [
+
+ <!ENTITY % xs-datatypes PUBLIC 'datatypes'
'http://www.w3.org/2001/datatypes.dtd'>
+ <!ENTITY % p 'xsd:'>
+ <!ENTITY % s ':xsd'>
+ <!ENTITY % schemaAttrs 'xmlns:xlink CDATA #FIXED
"http://www.w3.org/1999/xlink";
+ xmlns:docbook CDATA #FIXED
"http://docbook.org/ns/docbook";'>
+
+]>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:docbook="http://docbook.org/ns/docbook";
@@ -10,6 +18,18 @@
targetNamespace="http://phd.php.net/ns/phd";
version="PhD 1.0">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ PhD normative schema version 1.0.
+ Copyright(c) 2007 The Author(s). All Rights Reserved.
+ The Author(s) are described in a LICENSE file which should have accompanied
+ this document; if you did not receive this file, it can be downloaded from
+ the world-wide-web at:
+ <http://phd.php.net/LICENSE>
+ </xsd:documentation>
+ <xsd:appinfo>$Id: phd.xsd,v 1.2 2007/07/25 21:59:54 gwynne Exp
$</xsd:appinfo>
+ </xsd:annotation>
+
<xsd:include schemaLocation="docbook.xsd"/>
<!-- Docbook XSD imports XML and XLink for us -->
@@ -53,7 +73,7 @@
<xsd:sequence>
<xsd:element ref="my-rev"/>
<xsd:element ref="en-rev" minOccurs="0"/>
- </xsd:squence>
+ </xsd:sequence>
</xsd:complexType>
</xsd:element>
http://cvs.php.net/viewvc.cgi/phd/setup/CLI.class.php?r1=1.2&r2=1.3&diff_format=u
Index: phd/setup/CLI.class.php
diff -u phd/setup/CLI.class.php:1.2 phd/setup/CLI.class.php:1.3
--- phd/setup/CLI.class.php:1.2 Wed Jul 25 21:06:54 2007
+++ phd/setup/CLI.class.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: CLI.class.php,v 1.2 2007/07/25 21:06:54 gwynne Exp $
|
+/* $Id: CLI.class.php,v 1.3 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
http://cvs.php.net/viewvc.cgi/phd/setup/Configurator.class.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/setup/Configurator.class.php
diff -u phd/setup/Configurator.class.php:1.1
phd/setup/Configurator.class.php:1.2
--- phd/setup/Configurator.class.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/setup/Configurator.class.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: Configurator.class.php,v 1.1 2007/07/25 04:52:54 gwynne Exp $
|
+/* $Id: Configurator.class.php,v 1.2 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
http://cvs.php.net/viewvc.cgi/phd/setup/HTTP.class.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/setup/HTTP.class.php
diff -u phd/setup/HTTP.class.php:1.1 phd/setup/HTTP.class.php:1.2
--- phd/setup/HTTP.class.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/setup/HTTP.class.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: HTTP.class.php,v 1.1 2007/07/25 04:52:54 gwynne Exp $
|
+/* $Id: HTTP.class.php,v 1.2 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
http://cvs.php.net/viewvc.cgi/phd/setup/Option_Metadata.inc.php?r1=1.2&r2=1.3&diff_format=u
Index: phd/setup/Option_Metadata.inc.php
diff -u phd/setup/Option_Metadata.inc.php:1.2
phd/setup/Option_Metadata.inc.php:1.3
--- phd/setup/Option_Metadata.inc.php:1.2 Wed Jul 25 21:06:54 2007
+++ phd/setup/Option_Metadata.inc.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: Option_Metadata.inc.php,v 1.2 2007/07/25 21:06:54 gwynne Exp $
|
+/* $Id: Option_Metadata.inc.php,v 1.3 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
http://cvs.php.net/viewvc.cgi/phd/setup/SAPI.interface.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/setup/SAPI.interface.php
diff -u phd/setup/SAPI.interface.php:1.1 phd/setup/SAPI.interface.php:1.2
--- phd/setup/SAPI.interface.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/setup/SAPI.interface.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: SAPI.interface.php,v 1.1 2007/07/25 04:52:54 gwynne Exp $
|
+/* $Id: SAPI.interface.php,v 1.2 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
http://cvs.php.net/viewvc.cgi/phd/setup/Template_File.class.php?r1=1.2&r2=1.3&diff_format=u
Index: phd/setup/Template_File.class.php
diff -u phd/setup/Template_File.class.php:1.2
phd/setup/Template_File.class.php:1.3
--- phd/setup/Template_File.class.php:1.2 Wed Jul 25 21:06:54 2007
+++ phd/setup/Template_File.class.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: Template_File.class.php,v 1.2 2007/07/25 21:06:54 gwynne Exp $
|
+/* $Id: Template_File.class.php,v 1.3 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
http://cvs.php.net/viewvc.cgi/phd/setup/setup.messages.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/setup/setup.messages.php
diff -u phd/setup/setup.messages.php:1.1 phd/setup/setup.messages.php:1.2
--- phd/setup/setup.messages.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/setup/setup.messages.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: setup.messages.php,v 1.1 2007/07/25 04:52:54 gwynne Exp $
|
+/* $Id: setup.messages.php,v 1.2 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
http://cvs.php.net/viewvc.cgi/phd/setup/setup.php?r1=1.1&r2=1.2&diff_format=u
Index: phd/setup/setup.php
diff -u phd/setup/setup.php:1.1 phd/setup/setup.php:1.2
--- phd/setup/setup.php:1.1 Wed Jul 25 04:52:54 2007
+++ phd/setup/setup.php Wed Jul 25 21:59:54 2007
@@ -1,7 +1,6 @@
<?php
-/* +-------------------------------------------------------------------------+
- | $Id: setup.php,v 1.1 2007/07/25 04:52:54 gwynne Exp $
|
+/* $Id: setup.php,v 1.2 2007/07/25 21:59:54 gwynne Exp $
+-------------------------------------------------------------------------+
| Copyright(c) 2007 |
| Authors: |
@@ -22,7 +21,7 @@
*/
// Used for versioning.
-$REVISION = '$Id: setup.php,v 1.1 2007/07/25 04:52:54 gwynne Exp $';
+$REVISION = '$Id: setup.php,v 1.2 2007/07/25 21:59:54 gwynne Exp $';
// Chosen interface for the setup. Determined from SAPI name at main()-time.
$chosenInterface = NULL;
