Re: [SVN-MIGRATION] SVN PHPDOC

--001636c5a8d10dd3b5046ea73bbe
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

2009/7/14 Philip Olson <[email protected]>:
>> Or have I missed something?
>
> This is now fixed as of a couple of minutes ago but I cannot test on Windows
> so please do that. The only problem I see now is with images/figures, likely
> to do with PhD (the build system).
>
> Regards,
> Philip
>
>

Found and hopefully fixed the build issues. Well, at least on windows...

I've lost commit karma, so patch is below and attached.

Regards,

Richard Quadling.


Index: manual.xml.in
===================================================================
--- manual.xml.in	(revision 284062)
+++ manual.xml.in	(working copy)
@@ -14,9 +14,9 @@
 %isopub;

 <!-- Add translated specific definitions and snippets -->
-<!ENTITY % language-defs     SYSTEM "./@LANGDIR@/language-defs.ent">
-<!ENTITY % language-snippets SYSTEM "./@LANGDIR@/language-snippets.ent">
-<!ENTITY % extensions        SYSTEM "./@LANGDIR@/extensions.ent">
+<!ENTITY % language-defs     SYSTEM "../@LANGDIR@/language-defs.ent">
+<!ENTITY % language-snippets SYSTEM "../@LANGDIR@/language-snippets.ent">
+<!ENTITY % extensions        SYSTEM "../@LANGDIR@/extensions.ent">

 %language-defs;
 %extensions;

Property changes on: scripts
___________________________________________________________________
Modified: svn:ignore
   - entities.*.xml

   + entities.*.xml
file-entities.php


Index: scripts/file-entities.php.in
===================================================================
--- scripts/file-entities.php.in	(revision 284061)
+++ scripts/file-entities.php.in	(working copy)
@@ -303,7 +303,7 @@
     if ($filename == "") {
         return sprintf("<!ENTITY %-40s        ''>\n", $entname);
     } else {
-        return sprintf("<!ENTITY %-40s SYSTEM '%s'>\n", $entname,
str_replace(str_replace("\\", "/", $GLOBALS['out_dir']), '..',
str_replace("\\", "/", $filename)));
+        return sprintf("<!ENTITY %-40s SYSTEM 'file:///%s'>\n",
$entname, str_replace(str_replace("\\", "/", $GLOBALS['out_dir']),
'..', str_replace(array("\\", " "), array("/", "%20"), $filename)));
    }
 }





-- 
-----
Richard Quadling
Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731
"Standing on the shoulders of some very clever giants!"
ZOPA : http://uk.zopa.com/member/RQuadling

--001636c5a8d10dd3b5046ea73bbe
Content-Type: text/plain; charset=US-ASCII; name="phpdoc-winbuild.patch.txt"
Content-Disposition: attachment; filename="phpdoc-winbuild.patch.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fx4fmb160

SW5kZXg6IG1hbnVhbC54bWwuaW4NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBtYW51YWwueG1sLmluCShyZXZp
c2lvbiAyODQwNjIpDQorKysgbWFudWFsLnhtbC5pbgkod29ya2luZyBjb3B5KQ0KQEAgLTE0LDkg
KzE0LDkgQEANCiAlaXNvcHViOwogCiA8IS0tIEFkZCB0cmFuc2xhdGVkIHNwZWNpZmljIGRlZmlu
aXRpb25zIGFuZCBzbmlwcGV0cyAtLT4KLTwhRU5USVRZICUgbGFuZ3VhZ2UtZGVmcyAgICAgU1lT
VEVNICIuL0BMQU5HRElSQC9sYW5ndWFnZS1kZWZzLmVudCI+Ci08IUVOVElUWSAlIGxhbmd1YWdl
LXNuaXBwZXRzIFNZU1RFTSAiLi9ATEFOR0RJUkAvbGFuZ3VhZ2Utc25pcHBldHMuZW50Ij4KLTwh
RU5USVRZICUgZXh0ZW5zaW9ucyAgICAgICAgU1lTVEVNICIuL0BMQU5HRElSQC9leHRlbnNpb25z
LmVudCI+Cis8IUVOVElUWSAlIGxhbmd1YWdlLWRlZnMgICAgIFNZU1RFTSAiLi4vQExBTkdESVJA
L2xhbmd1YWdlLWRlZnMuZW50Ij4KKzwhRU5USVRZICUgbGFuZ3VhZ2Utc25pcHBldHMgU1lTVEVN
ICIuLi9ATEFOR0RJUkAvbGFuZ3VhZ2Utc25pcHBldHMuZW50Ij4KKzwhRU5USVRZICUgZXh0ZW5z
aW9ucyAgICAgICAgU1lTVEVNICIuLi9ATEFOR0RJUkAvZXh0ZW5zaW9ucy5lbnQiPgogCiAlbGFu
Z3VhZ2UtZGVmczsKICVleHRlbnNpb25zOwoNClByb3BlcnR5IGNoYW5nZXMgb246IHNjcmlwdHMN
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18NCk1vZGlmaWVkOiBzdm46aWdub3JlDQogICAtIGVudGl0aWVzLioueG1sCg0K
ICAgKyBlbnRpdGllcy4qLnhtbApmaWxlLWVudGl0aWVzLnBocAoNCg0KSW5kZXg6IHNjcmlwdHMv
ZmlsZS1lbnRpdGllcy5waHAuaW4NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBzY3JpcHRzL2ZpbGUtZW50aXRp
ZXMucGhwLmluCShyZXZpc2lvbiAyODQwNjEpDQorKysgc2NyaXB0cy9maWxlLWVudGl0aWVzLnBo
cC5pbgkod29ya2luZyBjb3B5KQ0KQEAgLTMwMyw3ICszMDMsNyBAQA0KICAgICBpZiAoJGZpbGVu
YW1lID09ICIiKSB7CiAgICAgICAgIHJldHVybiBzcHJpbnRmKCI8IUVOVElUWSAlLTQwcyAgICAg
ICAgJyc+XG4iLCAkZW50bmFtZSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgcmV0dXJuIHNwcmlu
dGYoIjwhRU5USVRZICUtNDBzIFNZU1RFTSAnJXMnPlxuIiwgJGVudG5hbWUsIHN0cl9yZXBsYWNl
KHN0cl9yZXBsYWNlKCJcXCIsICIvIiwgJEdMT0JBTFNbJ291dF9kaXInXSksICcuLicsIHN0cl9y
ZXBsYWNlKCJcXCIsICIvIiwgJGZpbGVuYW1lKSkpOworICAgICAgICByZXR1cm4gc3ByaW50Zigi
PCFFTlRJVFkgJS00MHMgU1lTVEVNICdmaWxlOi8vLyVzJz5cbiIsICRlbnRuYW1lLCBzdHJfcmVw
bGFjZShzdHJfcmVwbGFjZSgiXFwiLCAiLyIsICRHTE9CQUxTWydvdXRfZGlyJ10pLCAnLi4nLCBz
dHJfcmVwbGFjZShhcnJheSgiXFwiLCAiICIpLCBhcnJheSgiLyIsICIlMjAiKSwgJGZpbGVuYW1l
KSkpOwogICAgfQogfQogCg==
--001636c5a8d10dd3b5046ea73bbe--