svn: /web/doc-editor/trunk/php/ RepositoryManager.php conf/conf.ini

yannick                                  Sun, 04 Apr 2010 17:10:42 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=297460

Log:
Make php binary path an option

Changed paths:
    U   web/doc-editor/trunk/php/RepositoryManager.php
    U   web/doc-editor/trunk/php/conf/conf.ini

Modified: web/doc-editor/trunk/php/RepositoryManager.php
===================================================================
--- web/doc-editor/trunk/php/RepositoryManager.php	2010-04-04 17:01:29 UTC (rev 297459)
+++ web/doc-editor/trunk/php/RepositoryManager.php	2010-04-04 17:10:42 UTC (rev 297460)
@@ -324,7 +324,7 @@
         );

         $cmd = 'cd '.realpath($appConf[$project]['vcs.configure.script.path']).';'
-              .'/usr/bin/php configure.php '
+              .$appConf['GLOBAL_CONFIGURATION']['php.bin'].' configure.php '
               .$appConf[$project]['vcs.configure.script.options'];

         $cmd = str_replace("{LangCode}", $lang, $cmd).';';
@@ -660,6 +660,7 @@
         $commitLog = Array();

         // Task for folders
+        // $foldersInfos[] = array('lang' => $a->lang, 'path' => $a->path, 'name'=> '-');
         $foldersInfos = $rf->getPendingFoldersCommit();

         if( $foldersInfos ) {
@@ -1532,4 +1533,4 @@
     }
 }

-?>
+?>

Modified: web/doc-editor/trunk/php/conf/conf.ini
===================================================================
--- web/doc-editor/trunk/php/conf/conf.ini	2010-04-04 17:01:29 UTC (rev 297459)
+++ web/doc-editor/trunk/php/conf/conf.ini	2010-04-04 17:10:42 UTC (rev 297460)
@@ -11,3 +11,5 @@
 vcs.type = svn

 data.path = "data/"
+
+php.bin = "/usr/bin/php"
\ No newline at end of file