| Index: trunk/tools/mwmultiversion/scripts/scap-2 |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | |
| 16 | 16 | mwVersionNums=(`mwversionsinuse`) |
| 17 | 17 | if [ -z "$mwVersionNums" ]; then |
| 18 | | - echo "Unable to read wikiversions.db or it is empty" |
| | 18 | + echo "Unable to read wikiversions.dat or it is empty" |
| 19 | 19 | exit 1 |
| 20 | 20 | fi |
| 21 | 21 | |
| Index: trunk/tools/mwmultiversion/scripts/scap |
| — | — | @@ -1,32 +1,47 @@ |
| 2 | 2 | #!/bin/bash |
| 3 | 3 | |
| 4 | 4 | BINDIR=/home/wikipedia/bin |
| 5 | | -SOURCE=/home/wikipedia/common/php-1.17 |
| 6 | | -DEST=/usr/local/apache/common-local/php-1.17 |
| | 5 | +SOURCE=/home/wikipedia/common |
| 7 | 6 | |
| 8 | 7 | # Perform syntax check |
| 9 | 8 | |
| 10 | 9 | if [ ! -S "$SSH_AUTH_SOCK" ]; then |
| 11 | | - echo >&2 "SSH_AUTH_SOCK not set or not pointing to a socket." |
| 12 | | - echo >&2 "Did you start your ssh-agent?" |
| | 10 | + echo >&2 "SSH_AUTH_SOCK not set or not pointing to a socket." |
| | 11 | + echo >&2 "Did you start your ssh-agent?" |
| 13 | 12 | exit 1 |
| 14 | 13 | fi |
| 15 | 14 | |
| | 15 | +mwVerDbSets=(`mwversionsinuse --withdb`) |
| | 16 | +if [ -z "$mwVerDbSets" ]; then |
| | 17 | + echo "Unable to read wikiversions.dat or it is empty" |
| | 18 | + exit 1 |
| | 19 | +fi |
| 16 | 20 | |
| 17 | 21 | echo Checking syntax... |
| 18 | | -if ! $BINDIR/lint "$SOURCE"; then |
| 19 | | - echo Found syntax errors, cannot sync |
| 20 | | - exit |
| 21 | | -fi |
| | 22 | +for i in "${mwVerDbSets[@]}" |
| | 23 | +do |
| | 24 | + mwVerNum=${i%=*} |
| | 25 | + if ! $BINDIR/lint "$SOURCE"/php-"$mwVerNum"; then |
| | 26 | + echo Found syntax errors, cannot sync |
| | 27 | + exit |
| | 28 | + fi |
| | 29 | +done |
| 22 | 30 | |
| 23 | 31 | # Update the current machine so that serialization works |
| 24 | 32 | $BINDIR/sync-common |
| 25 | 33 | |
| 26 | | -# Regenerate the extension message file list |
| 27 | | -echo Updating ExtensionMessages.php... |
| 28 | | -php $SOURCE/maintenance/mergeMessageFileList.php --list-file=$SOURCE/../wmf-config/extension-list \ |
| 29 | | - --output=$SOURCE/../wmf-config/ExtensionMessages.php |
| 30 | 34 | |
| | 35 | +for i in "${mwVerDbSets[@]}" |
| | 36 | +do |
| | 37 | + mwVerNum=${i%=*} |
| | 38 | + mwDbName=${i#*=} |
| | 39 | + # Regenerate the extension message file list |
| | 40 | + echo Updating ExtensionMessages.php... |
| | 41 | + mwscript mergeMessageFileList.php --wiki="$mwDbName" \ |
| | 42 | + --list-file=$SOURCE/wmf-config/extension-list \ |
| | 43 | + --output=$SOURCE/wmf-config/ExtensionMessages-"$mwVerNum".php |
| | 44 | +done |
| | 45 | + |
| 31 | 46 | # Notify |
| 32 | 47 | $BINDIR/dologmsg "!log $USER synchronizing Wikimedia installation... $(cd /home/wikipedia/common/php-1.17; svn info|grep ^Revision): $*" |
| 33 | 48 | |
| Index: trunk/tools/mwmultiversion/wmf-config/CommonSettings.php |
| — | — | @@ -2290,7 +2290,7 @@ |
| 2291 | 2291 | # |
| 2292 | 2292 | # REALLY ... were not kidding here ... NO EXTENSIONS AFTER |
| 2293 | 2293 | |
| 2294 | | -require( "$wmfConfigDir/ExtensionMessages.php" ); |
| | 2294 | +require( "$wmfConfigDir/ExtensionMessages-$wgVersionNumber.php" ); |
| 2295 | 2295 | |
| 2296 | 2296 | wfProfileOut( "$fname-misc5" ); |
| 2297 | 2297 | wfProfileOut( $fname ); |