https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114955
Revision: 114955
Author: catrope
Date: 2012-04-18 17:31:23 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Update checkoutMediawiki to create symlinks for the Great New URL Structure.
Related to bug 31173 and bug 35939
The old structure looks like this:
bits.wm.o/skins-1.19 --> php-1.19/skins
bits.wm.o/w/extensions-1.19 -> php-1.19/extensions (note the /w)
bits.wm.o/resources-1.19 -> php-1.19 (points to the MW root, so resource paths
look like bits.wm.o/resources-1.19/resources/blah.js)
The new structure cleans this up:
bits.wm.o/static-1.20wmf2/skins --> php-1.20wmf2/skins
bits.wm.o/static-1.20wmf2/extensions --> php-1.20wmf2/extensions
bits.wm.o/static-1.20wmf2/resources --> php-1.20wmf2/resources
We will be using the new URL structure on the WMF cluster starting with version
1.20wmf2.
Modified Paths:
--------------
trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
trunk/tools/mwmultiversion/multiversion/deleteMediaWiki
Modified: trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
===================================================================
--- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2012-04-18
13:44:02 UTC (rev 114954)
+++ trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2012-04-18
17:31:23 UTC (rev 114955)
@@ -94,32 +94,44 @@
createSymlink( $path, $link, "Created StartProfiler.php symlink." );
# Create bits.wikimedia.org symlinks...
- $path = "$commonHomeDir/docroot/bits/skins-$dstVersionNum";
+ $bitsStaticDir = "$commonHomeDir/docroot/bits/static-$dstVersionNum";
+ if ( !file_exists( $bitsStaticDir ) ) {
+ mkdir( $bitsStaticDir, 0775 );
+ }
+ $path = "$commonHomeDir/docroot/bits/static-$dstVersionNum/skins";
$link = "$commonLocalDir/php-$dstVersionNum/skins/";
- createSymlink( $path, $link, "Created skins-$dstVersionNum symlink." );
+ createSymlink( $path, $link, "Created static-$dstVersionNum/skins
symlink." );
- $path = "$commonHomeDir/docroot/bits/w/extensions-$dstVersionNum";
+ $path = "$commonHomeDir/docroot/bits/static-$dstVersionNum/extensions";
$link = "$commonLocalDir/php-$dstVersionNum/extensions";
- createSymlink( $path, $link, "Created w/extensions-$dstVersionNum
symlink." );
+ createSymlink( $path, $link, "Created static-$dstVersionNum/extensions
symlink." );
+ $path = "$commonHomeDir/docroot/bits/static-$dstVersionNum/resources";
+ $link = "$commonLocalDir/php-$dstVersionNum/resources";
+ createSymlink( $path, $link, "Created static-$dstVersionNum/resources
symlink." );
+
# Create secure.wikimedia.org symlinks...
$path = "$commonHomeDir/docroot/secure/skins-$dstVersionNum";
$link = "$commonLocalDir/php-$dstVersionNum/skins";
createSymlink( $path, $link, "Created secure/skins-$dstVersionNum
symlink." );
- # Create skins/resources symlinks...
- $path = "$commonHomeDir/live-1.5/extensions-$dstVersionNum";
+ # Create static- symlinks in live-1.5...
+ $liveStaticDir = "$commonHomeDir/live-1.5/static-$dstVersionNum";
+ if ( !file_exists( $liveStaticDir ) ) {
+ mkdir( $liveStaticDir, 0775 );
+ }
+ $path = "$commonHomeDir/live-1.5/static-$dstVersionNum/skins";
+ $link = "$commonLocalDir/php-$dstVersionNum/skins";
+ createSymlink( $path, $link, "Created
live-1.5/static-$dstVersionNum/skins symlink." );
+
+ $path = "$commonHomeDir/live-1.5/static-$dstVersionNum/extensions";
$link = "$commonLocalDir/php-$dstVersionNum/extensions";
- createSymlink( $path, $link, "Created
live-1.5/extensions-$dstVersionNum symlink." );
+ createSymlink( $path, $link, "Created
live-1.5/static-$dstVersionNum/extensions symlink." );
- $path = "$commonHomeDir/live-1.5/skins-$dstVersionNum";
- $link = "$commonLocalDir/php-$dstVersionNum/skins";
- createSymlink( $path, $link, "Created live-1.5/skins-$dstVersionNum
symlink." );
+ $path = "$commonHomeDir/live-1.5/static-$dstVersionNum/resources";
+ $link = "$commonLocalDir/php-$dstVersionNum/resources";
+ createSymlink( $path, $link, "Created
live-1.5/static-$dstVersionNum/resources symlink." );
- $path = "$commonHomeDir/live-1.5/resources-$dstVersionNum";
- $link = "$commonLocalDir/php-$dstVersionNum";
- createSymlink( $path, $link, "Created live-1.5/resources-$dstVersionNum
symlink." );
-
# Create libs symlinks...
$libDir = "$destIP/lib";
if ( !file_exists( $libDir ) ) {
Modified: trunk/tools/mwmultiversion/multiversion/deleteMediaWiki
===================================================================
--- trunk/tools/mwmultiversion/multiversion/deleteMediaWiki 2012-04-18
13:44:02 UTC (rev 114954)
+++ trunk/tools/mwmultiversion/multiversion/deleteMediaWiki 2012-04-18
17:31:23 UTC (rev 114955)
@@ -38,12 +38,9 @@
# Destroy symlinks created by checkoutMediaWiki outside of $destIP
$symlinks = array(
- "$commonHomeDir/docroot/bits/skins-$dstVersionNum",
- "$commonHomeDir/docroot/bits/w/extensions-$dstVersionNum",
+ "$commonHomeDir/docroot/bits/static-$dstVersionNum",
"$commonHomeDir/docroot/secure/skins-$dstVersionNum",
- "$commonHomeDir/live-1.5/extensions-$dstVersionNum",
- "$commonHomeDir/live-1.5/skins-$dstVersionNum",
- "$commonHomeDir/live-1.5/resources-$dstVersionNum"
+ "$commonHomeDir/live-1.5/static-$dstVersionNum",
);
foreach ( $symlinks as $path ) {
deleteSymlink( $path );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
