cvs: phd / build.php config.php
| From: | Hannes Magnusson | Date: | Sun, 21 Oct 2007 11:57:20 +0000 |
| Subject: | cvs: phd / build.php config.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-251@lists.php.net to get a copy of this message | ||
bjori Sun Oct 21 11:57:20 2007 UTC
Modified files:
/phd build.php config.php
Log:
This belongs in the config file
http://cvs.php.net/viewvc.cgi/phd/build.php?r1=1.34&r2=1.35&diff_format=u
Index: phd/build.php
diff -u phd/build.php:1.34 phd/build.php:1.35
--- phd/build.php:1.34 Sun Oct 21 11:50:27 2007
+++ phd/build.php Sun Oct 21 11:57:20 2007
@@ -1,6 +1,6 @@
#!@php_bin@
<?php
-/* $Id: build.php,v 1.34 2007/10/21 11:50:27 bjori Exp $ */
+/* $Id: build.php,v 1.35 2007/10/21 11:57:20 bjori Exp $ */
function err($no, $str, $file, $line) {
global $notify;
@@ -37,9 +37,6 @@
&& is_array($OPTIONS["output_theme"])
or die("Invalid configuration/file not found.\nYou need to run setup/setup.php
first\n");
-$OPTIONS["chunk_extra"]["legalnotice"] = true;
-$OPTIONS["xml_file"] = $OPTIONS["xml_root"] . "/.manual.xml";
-
require $ROOT. "/include/PhDReader.class.php";
require $ROOT. "/include/PhDPartialReader.class.php";
require $ROOT. "/include/PhDHelper.class.php";
@@ -88,8 +85,8 @@
case "php":
$themes[$themename] = new $themename($IDs,
array(
- "version" =>
$OPTIONS["xml_root"]."/phpbook/phpbook-xsl/version.xml",
- "acronym" =>
$OPTIONS["xml_root"]."/entities/acronyms.xml",
+ "version" => $OPTIONS["version_info"],
+ "acronym" => $OPTIONS["acronyms_file"],
)
);
break;
http://cvs.php.net/viewvc.cgi/phd/config.php?r1=1.3&r2=1.4&diff_format=u
Index: phd/config.php
diff -u phd/config.php:1.3 phd/config.php:1.4
--- phd/config.php:1.3 Sun Oct 21 11:42:32 2007
+++ phd/config.php Sun Oct 21 11:57:20 2007
@@ -1,5 +1,5 @@
<?php
-/* Generated by PhD $Id: config.php,v 1.3 2007/10/21 11:42:32 bjori Exp $ at Thu, 09 Aug 2007
15:10:10 +0200. */
+/* Generated by PhD $Id: config.php,v 1.4 2007/10/21 11:57:20 bjori Exp $ at Thu, 09 Aug 2007
15:10:10 +0200. */
$OPTIONS = array (
'output_format' => array('xhtml'),
@@ -30,6 +30,10 @@
*/
),
);
+$OPTIONS["version_info"] =
$OPTIONS["xml_root"]."/phpbook/phpbook-xsl/version.xml";
+$OPTIONS["acronyms_file"] =
$OPTIONS["xml_root"]."/entities/acronyms.xml";
+$OPTIONS["chunk_extra"]["legalnotice"] = true;
+
if ($argc == 2) {
$OPTIONS["xml_root"] = $argv[1];
@@ -45,3 +49,5 @@
}
}
+$OPTIONS["xml_file"] = $OPTIONS["xml_root"] . "/.manual.xml";
+