Author: ivanovic
Date: Sun May 5 13:11:29 2013
New Revision: 56595
URL: http://svn.gna.org/viewcvs/wesnoth?rev=56595&view=rev
Log:
moved repo over to git links at github
TODO: Once the switch is final to wesnoth and we no longer use wesnoth.org the
scripts need to be adjusted to point to the correct repo. A plan grep should
.help
Modified:
website/gettext.wesnoth.org/bin/update-gettext-stats
website/gettext.wesnoth.org/config.php
website/gettext.wesnoth.org/grab-stats.php
website/gettext.wesnoth.org/index.extra.php
website/gettext.wesnoth.org/index.lang.php
website/gettext.wesnoth.org/index.php
Modified: website/gettext.wesnoth.org/bin/update-gettext-stats
URL:
http://svn.gna.org/viewcvs/wesnoth/website/gettext.wesnoth.org/bin/update-gettext-stats?rev=56595&r1=56594&r2=56595&view=diff
==============================================================================
--- website/gettext.wesnoth.org/bin/update-gettext-stats (original)
+++ website/gettext.wesnoth.org/bin/update-gettext-stats Sun May 5 13:11:29
2013
@@ -1,33 +1,33 @@
#!/bin/bash
-SVNCHECKOUTPATH=/usr/src/svn-checkouts/
+CHECKOUTPATH=/sources/wesnoth
echo update started at `date` >> $HOME/g.w.o-updates.log
#update the 1.10 checkout
-cd $SVNCHECKOUTPATH/1.10/
+cd $CHECKOUTPATH/1.10/
#svn cleanup
-svn -q up
+git pull -q
-#update the trunk checkout
-cd $SVNCHECKOUTPATH/trunk/
+#update the master checkout
+cd $CHECKOUTPATH/master/
#svn cleanup
-svn -q up
+git pull -q
#update the wescamp checkout
-cd $SVNCHECKOUTPATH/trunk/
+cd $CHECKOUTPATH/master/
echo "starting wescamp.py for 1.10 at `date`" >> $HOME/g.w.o-updates.log
-./data/tools/wesnoth/wescamp.py -scampaigns.wesnoth.org -p15002
-w$SVNCHECKOUTPATH/wescamp-i18n/branch-1.10 -C >> $HOME/g.w.o-updates.log
+./data/tools/wesnoth/wescamp.py -scampaigns.wesnoth.org -p15002
-w$CHECKOUTPATH/wescamp-i18n/branch-1.10 -C >> $HOME/g.w.o-updates.log
echo "wescamp.py 1.10 exited with exit code $? at `date`" >>
$HOME/g.w.o-updates.log
echo "starting wescamp.py for 1.12 at `date`" >> $HOME/g.w.o-updates.log
-./data/tools/wesnoth/wescamp.py -scampaigns.wesnoth.org -p15006
-w$SVNCHECKOUTPATH/wescamp-i18n/branch-1.12 -C >> $HOME/g.w.o-updates.log
+./data/tools/wesnoth/wescamp.py -scampaigns.wesnoth.org -p15006
-w$CHECKOUTPATH/wescamp-i18n/branch-1.12 -C >> $HOME/g.w.o-updates.log
echo "wescamp.py 1.12 exited with exit code $? at `date`" >>
$HOME/g.w.o-updates.log
#update the website checkout
-cd $SVNCHECKOUTPATH/website/
+cd $CHECKOUTPATH/website/
svn -q up
#update the stats
-cd $SVNCHECKOUTPATH/website/gettext.wesnoth.org
+cd $CHECKOUTPATH/website/gettext.wesnoth.org
echo "starting grab-stats at `date`" >> $HOME/g.w.o-updates.log
nice --adjustment=5 php grab-stats.php
echo "grab-stats exited with exit code $? at `date`" >> $HOME/g.w.o-updates.log
Modified: website/gettext.wesnoth.org/config.php
URL:
http://svn.gna.org/viewcvs/wesnoth/website/gettext.wesnoth.org/config.php?rev=56595&r1=56594&r2=56595&view=diff
==============================================================================
--- website/gettext.wesnoth.org/config.php (original)
+++ website/gettext.wesnoth.org/config.php Sun May 5 13:11:29 2013
@@ -14,10 +14,10 @@
$wescampbranchversion="1.10";
$wescamptrunkversion="1.12";
-$trunkbasedir="/usr/src/svn-checkouts/trunk/";
-$branchbasedir="/usr/src/svn-checkouts/$branch/";
-$extratbasedir="/usr/src/svn-checkouts/wescamp-i18n/branch-$wescamptrunkversion/";
//trunk addon server
-$extrabbasedir="/usr/src/svn-checkouts/wescamp-i18n/branch-$wescampbranchversion/";
//branch addon server
+$masterbasedir="/sources/wesnoth/master/";
+$branchbasedir="/sources/wesnoth/$branch/";
+$extratbasedir="/sources/wesnoth/wescamp-i18n/branch-$wescamptrunkversion/";
//master addon server
+$extrabbasedir="/sources/wesnoth/wescamp-i18n/branch-$wescampbranchversion/";
//branch addon server
//$packages = file_get_contents($basedir . "/po/DOMAINS");
//$packages = substr($packages, 0, strlen($packages)-1);
@@ -28,9 +28,9 @@
$ignore_langs = "sr@ijekavianlatin sr@latin sr@ijekavian";
//get unofficial packages
-//trunk
+//master
$packarray = array();
-if ($dir = opendir($extratbasedir)) { //trunk
+if ($dir = opendir($extratbasedir)) { //master
// PHP manual says readdir returns false on failure and that
false-evaluating non-booleans may be returned on successful execution.
// Testing shows that readdir may return NULL on failure, causing infinite
loops.
// For our purposes, an empty string is equivalent to a failure anyway.
Modified: website/gettext.wesnoth.org/grab-stats.php
URL:
http://svn.gna.org/viewcvs/wesnoth/website/gettext.wesnoth.org/grab-stats.php?rev=56595&r1=56594&r2=56595&view=diff
==============================================================================
--- website/gettext.wesnoth.org/grab-stats.php (original)
+++ website/gettext.wesnoth.org/grab-stats.php Sun May 5 13:11:29 2013
@@ -30,10 +30,10 @@
$extratpacks = explode(" ", $extratpackages);
$extrabpacks = explode(" ", $extrabpackages);
-function grab_stats ($tob, $official, $packs) // trunk or branch, official (1)
or extras (0), package array
+function grab_stats ($tob, $official, $packs) // master or branch, official
(1) or extras (0), package array
{
//these are defined in config.php
- global $trunkbasedir;
+ global $masterbasedir;
global $branchbasedir;
global $extratbasedir;
global $extrabbasedir;
@@ -43,11 +43,11 @@
$stats = array();
if ($official)
{
- $basedir = ($tob == "trunk") ? $trunkbasedir :
$branchbasedir;
+ $basedir = ($tob == "master") ? $masterbasedir :
$branchbasedir;
$po_dir = $basedir . "/po/" . $package . "/";
$domain = $package;
} else { // wescamp
- $basedir = ($tob == "trunk") ? $extratbasedir :
$extrabbasedir;
+ $basedir = ($tob == "master") ? $extratbasedir :
$extrabbasedir;
$po_dir = $basedir . "/" . $package . "/po/";
$domain = getdomain($package);
}
@@ -80,9 +80,9 @@
}
}
-echo "Getting stats for trunk\n";
-grab_stats("trunk", 1, $packs);
-grab_stats("trunk", 0, $extratpacks);
+echo "Getting stats for master\n";
+grab_stats("master", 1, $packs);
+grab_stats("master", 0, $extratpacks);
echo "Getting stats for branch ($branch)\n";
grab_stats("branch", 1, $packs);
Modified: website/gettext.wesnoth.org/index.extra.php
URL:
http://svn.gna.org/viewcvs/wesnoth/website/gettext.wesnoth.org/index.extra.php?rev=56595&r1=56594&r2=56595&view=diff
==============================================================================
--- website/gettext.wesnoth.org/index.extra.php (original)
+++ website/gettext.wesnoth.org/index.extra.php Sun May 5 13:11:29 2013
@@ -270,11 +270,11 @@
echo "<strong>" . $langs[$lang] . "</strong> (" . $lang . ")";
}else{
if($official){
- $repo = ($version == 'trunk') ? 'trunk' : "branches/$branch";
- echo "<a
href='http://svn.gna.org/viewcvs/*checkout*/wesnoth/$repo/po/"; . $package . "/"
. $lang . ".po?view=markup'>" . $langs[$lang] . "</a> (" .$lang . ")";
+ $repo = ($version == 'master') ? 'master' : "$branch";
+ echo "<a
href='https://raw.github.com/wesnoth/wesnoth-old/$repo/po/$package/$lang.po'>"
. $langs[$lang] . "</a> (" .$lang . ")";
}else{
$packname = getpackage($package);
- $repo = ($version == 'trunk') ? $wescamptrunkversion :
$wescampbranchversion;
+ $repo = ($version == 'master') ? $wescamptrunkversion :
$wescampbranchversion;
$reponame = "$packname-$repo";
echo "<a
href='https://raw.github.com/wescamp/$reponame/master/po/$lang.po'>" .
$langs[$lang] . "</a> ($lang)";
}
@@ -314,11 +314,11 @@
echo "<strong>Template catalog</strong>";
}else{
if($official){
- $repo = ($version == 'trunk') ? 'trunk' : "branches/$branch";
- echo "<a
href='http://svn.gna.org/viewcvs/*checkout*/wesnoth/$repo/po/"; . $package . "/"
. $package . ".pot?view=markup'>Template catalog</a>";
+ $repo = ($version == 'master') ? 'master' : "$branch";
+ echo "<a
href='https://github.com/wesnoth/wesnoth-old/raw/$repo/po/$package/$package.pot'>Template
catalog</a>";
}else{
$packname = getpackage($package);
- $repo = ($version == 'trunk') ? $wescamptrunkversion :
$wescampbranchversion;
+ $repo = ($version == 'master') ? $wescamptrunkversion :
$wescampbranchversion;
$reponame = "$packname-$repo";
echo "<a
href='https://raw.github.com/wescamp/$reponame/master/po/$package.pot'>Template
catalog</a>";
}
Modified: website/gettext.wesnoth.org/index.lang.php
URL:
http://svn.gna.org/viewcvs/wesnoth/website/gettext.wesnoth.org/index.lang.php?rev=56595&r1=56594&r2=56595&view=diff
==============================================================================
--- website/gettext.wesnoth.org/index.lang.php (original)
+++ website/gettext.wesnoth.org/index.lang.php Sun May 5 13:11:29 2013
@@ -30,7 +30,7 @@
$stats = array();
if(!isset($_GET['version'])){
- $version = 'trunk';
+ $version = 'master';
}else{
$version = $_GET['version'];
}
@@ -47,7 +47,7 @@
if($i==0){
$packs = $existing_packs;
}else{
- $packs = ($version == 'trunk') ?
$existing_extra_packs_t : $existing_extra_packs_b;
+ $packs = ($version == 'master') ?
$existing_extra_packs_t : $existing_extra_packs_b;
}
foreach($packs as $pack){
if($i==1) $pack = getdomain($pack);
@@ -120,10 +120,10 @@
<tr>
<td align="left">
Version:
-<? if($version=='trunk'){ ?>
+<? if($version=='master'){ ?>
<strong>Development</strong> || <a
href="?version=branch&package=<?=$package?>&lang=<?=$lang?>"><?=$branch?></a>
<? }else{ ?>
-<a
href="?version=trunk&package=<?=$package?>&lang=<?=$lang?>">Development</a>
|| <strong><?=$branch?></strong>
+<a
href="?version=master&package=<?=$package?>&lang=<?=$lang?>">Development</a>
|| <strong><?=$branch?></strong>
<? } ?>
</td>
</tr>
@@ -207,11 +207,11 @@
<td>
<?
if($official == 0){
- $repo = ($version == 'trunk') ? 'trunk' : "branches/$branch";
- echo "<strong><a
href='http://svn.gna.org/viewcvs/*checkout*/wesnoth/$repo/po/"; . $stat[4]. "/"
. $lang . ".po'>" . $stat[4] . "</a></strong>";
+ $repo = ($version == 'master') ? 'master' : "$branch";
+ echo "<strong><a
href='https://raw.github.com/wesnoth/wesnoth-old/$repo/po/$stat[4]/$lang.po'>"
. $stat[4] . "</a></strong>";
}else{
$packname = getpackage($stat[4]);
- $repo = ($version == 'trunk') ? $wescamptrunkversion :
$wescampbranchversion;
+ $repo = ($version == 'master') ? $wescamptrunkversion :
$wescampbranchversion;
$reponame = "$packname-$repo";
echo "<strong><a
href='https://raw.github.com/wescamp/$reponame/master/po/$lang.po'>" . $stat[4]
."</a></strong>";
}
Modified: website/gettext.wesnoth.org/index.php
URL:
http://svn.gna.org/viewcvs/wesnoth/website/gettext.wesnoth.org/index.php?rev=56595&r1=56594&r2=56595&view=diff
==============================================================================
--- website/gettext.wesnoth.org/index.php (original)
+++ website/gettext.wesnoth.org/index.php Sun May 5 13:11:29 2013
@@ -39,7 +39,7 @@
if(!isset($_GET['version'])){
// set the default starting point when calling gettext.wesnoth.org:
// 'branch': show stats from the current stable branch
-// 'trunk': show stats from trunk
+// 'master': show stats from master
$version = 'branch';
}else{
$version = $_GET['version'];
@@ -61,7 +61,7 @@
if($version == 'branch') {
$statsfile = 'branchstats';
} else {
- $statsfile = 'trunkstats';
+ $statsfile = 'masterstats';
}
if (!file_exists("stats/" . $pack . "/" . $statsfile)) {
continue;
@@ -89,13 +89,13 @@
if($i==0){
$packs = $existing_packs;
}else{
- $packs = ($version == 'trunk') ?
$existing_extra_packs_t : $existing_extra_packs_b;
+ $packs = ($version == 'master') ?
$existing_extra_packs_t : $existing_extra_packs_b;
}
foreach($packs as $pack){
if($version == 'branch') {
$statsfile = 'branchstats';
} else {
- $statsfile = 'trunkstats';
+ $statsfile = 'masterstats';
}
if($i==1){
$pack = getdomain($pack);
@@ -123,7 +123,7 @@
}
}
}elseif($package=='allun'){
- $packs = ($version == 'trunk') ? $existing_extra_packs_t :
$existing_extra_packs_b;
+ $packs = ($version == 'master') ? $existing_extra_packs_t :
$existing_extra_packs_b;
foreach($packs as $pack){
$pack = getdomain($pack);
$statsfile = $version . 'stats';
@@ -227,7 +227,7 @@
<td align="left">
Version:
<? if($version=='branch'){ ?>
-<a href="?version=trunk&package=<?=$package?>">Development</a> ||
<strong><?=$branch?></strong>
+<a href="?version=master&package=<?=$package?>">Development</a> ||
<strong><?=$branch?></strong>
<? }else{ ?>
<strong>Development</strong> || <a
href="?version=branch&package=<?=$package?>"><?=$branch?></a>
<? } ?>
@@ -268,7 +268,7 @@
$packs = $existing_packs;
echo "<br/>Official: ";
}else{
- $packs = ($version == 'trunk') ?
$existing_extra_packs_t : $existing_extra_packs_b;
+ $packs = ($version == 'master') ?
$existing_extra_packs_t : $existing_extra_packs_b;
echo "<br/>Unofficial: ";
}
$first=true;
@@ -345,11 +345,11 @@
echo "<strong><a
href='index.lang.php?lang=$lang&version=$version'>" . $langs[$lang] .
"</a></strong> (" . $lang . ")";
}else{
if($official){
- $repo = ($version == 'trunk') ? 'trunk' : "branches/$branch";
- echo "<a
href='http://svn.gna.org/viewcvs/*checkout*/wesnoth/$repo/po/"; . $package . "/"
. $lang . ".po'>" . $langs[$lang] . "</a> (" .$lang . ")";
+ $repo = ($version == 'master') ? 'master' : "$branch";
+ echo "<a
href='https://raw.github.com/wesnoth/wesnoth-old/$repo/po/$package/$lang.po'>"
. $langs[$lang] . "</a> (" .$lang . ")";
}else{
$packname = getpackage($package);
- $repo = ($version == 'trunk') ? $wescamptrunkversion :
$wescampbranchversion;
+ $repo = ($version == 'master') ? $wescamptrunkversion :
$wescampbranchversion;
$reponame = "$packname-$repo";
echo "<a
href='https://raw.github.com/wescamp/$reponame/master/po/$lang.po'>" .
$langs[$lang] . "</a> ($lang)";
}
@@ -389,11 +389,11 @@
echo "<strong>Template catalog</strong>";
}else{
if($official){
- $repo = ($version == 'trunk') ? 'trunk' : "branches/$branch";
- echo "<a
href='http://svn.gna.org/viewcvs/*checkout*/wesnoth/$repo/po/"; . $package . "/"
. $package . ".pot?view=markup'>Template catalog</a>";
+ $repo = ($version == 'master') ? 'master' : "$branch";
+ echo "<a
href='https://raw.github.com/wesnoth/wesnoth-old/$repo/po/$package/$package.pot'>Template
catalog</a>";
}else{
$packname = getpackage($package);
- $repo = ($version == 'trunk') ? $wescamptrunkversion :
$wescampbranchversion;
+ $repo = ($version == 'master') ? $wescamptrunkversion :
$wescampbranchversion;
$reponame = "$packname-$repo";
echo "<a
href='https://raw.github.com/wescamp/$reponame/master/po/$package.pot'>Template
catalog</a>";
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
