r105822 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r105821‎ | r105822 | r105823 >
Date:19:49, 11 December 2011
Author:dantman
Status:ok
Tags:
Comment:
Follow up r105821, as usual, commit the files I forgot to `svn add`
Modified paths:
  • /trunk/phase3/maintenance/dev/includes/php.sh (added) (history)
  • /trunk/phase3/maintenance/dev/includes/require-php.sh (added) (history)

Diff [purge]

Index: trunk/phase3/maintenance/dev/includes/require-php.sh
@@ -0,0 +1,8 @@
 2+# Include-able script to require that we have a known php binary we can execute
 3+
 4+. "$DEV/includes/php.sh"
 5+
 6+if [ "x$PHP" == "x" -o ! -x "$PHP" ]; then
 7+ echo "Local copy of PHP is not installed"
 8+ exit 1
 9+fi
Index: trunk/phase3/maintenance/dev/includes/php.sh
@@ -0,0 +1,12 @@
 2+# Include-able script to determine the location of our php if any
 3+
 4+if [ -d "$DEV/php" -a -x "$DEV/php/bin/php" ]; then
 5+ # Quick local copy
 6+ PHP="$DEV/php/bin/php"
 7+elif [ -d "$HOME/.mediawiki/php" -a -x "$HOME/.mediawiki/php/bin/php" ]; then
 8+ # Previous home directory location to install php in
 9+ PHP="$HOME/.mediawiki/php/bin/php"
 10+elif [ -d "$HOME/.mwphp" -a -x "$HOME/.mwphp/bin/php" ]; then
 11+ # Previous home directory location to install php in
 12+ PHP="$HOME/.mwphp/bin/php"
 13+fi

Follow-up revisions

RevisionCommit summaryAuthorDate
r113481Replace UploadFromStash/UploadStash with copy from trunk at r105822...reedy16:25, 9 March 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r105821Follow up r102210:...dantman19:45, 11 December 2011

Status & tagging log