[Midnightbsd-cvs] mports [15414] trunk/Tools: Update magus to use subversion roots instead.

[laffer1 at midnightbsd.org]

Revision: 15414
          http://svnweb.midnightbsd.org/mports/?rev=15414
Author:   laffer1
Date:     2013-09-04 07:22:29 -0400 (Wed, 04 Sep 2013)
Log Message:
-----------
Update magus to use subversion roots instead.  In this case, we switched CvsDir and CvsRoot to VcsRoot and VcsDir to be more generic.  While here, fix the licenseit script

Modified Paths:
--------------
    trunk/Tools/lib/Magus/Config.pm
    trunk/Tools/lib/Magus/Index.pm
    trunk/Tools/magus/master/update_cluster.pl
    trunk/Tools/scripts/licenseit

Modified: trunk/Tools/lib/Magus/Config.pm
===================================================================
--- trunk/Tools/lib/Magus/Config.pm	2013-09-03 23:11:02 UTC (rev 15413)
+++ trunk/Tools/lib/Magus/Config.pm	2013-09-04 11:22:29 UTC (rev 15414)
@@ -48,8 +48,7 @@
 sub load_config {
   %Config = (
     # defaults
-    CvsFlags       => '',
-    CvsRoot        => '/home/cvs',
+    VcsRoot        => 'http://svn.midnightbsd.org/svn/',   
     SlaveSrcDir    => '/usr/src',
     SlavePidFile   => '/var/run/magus.pid',
     %{ LoadFile(shift) },

Modified: trunk/Tools/lib/Magus/Index.pm
===================================================================
--- trunk/Tools/lib/Magus/Index.pm	2013-09-03 23:11:02 UTC (rev 15413)
+++ trunk/Tools/lib/Magus/Index.pm	2013-09-04 11:22:29 UTC (rev 15414)
@@ -41,7 +41,7 @@
   my $arch = $run->arch;
   my %visited;
   
-  $root ||= "$Magus::Config{MasterDataDir}/$Magus::Config{MportsCvsDir}";
+  $root ||= "$Magus::Config{MasterDataDir}/$Magus::Config{MportsVcsDir}";
   
   local $| = 1;
   
@@ -132,4 +132,4 @@
    
 1;
 __END__
- 
\ No newline at end of file
+ 

Modified: trunk/Tools/magus/master/update_cluster.pl
===================================================================
--- trunk/Tools/magus/master/update_cluster.pl	2013-09-03 23:11:02 UTC (rev 15413)
+++ trunk/Tools/magus/master/update_cluster.pl	2013-09-04 11:22:29 UTC (rev 15414)
@@ -58,12 +58,12 @@
     die "Usage: $0 new <arch> <osversion>\n";
   }
   
-  update_cvs_dir();
+  update_vcs_dir();
 
   my $run = Magus::Run->create({osversion => $osversion, arch => $arch});
   
   make_tarball($run);
-  Magus::Index->sync("$Magus::Config{MasterDataDir}/$Magus::Config{MportsCvsDir}", $run);
+  Magus::Index->sync("$Magus::Config{MasterDataDir}/$Magus::Config{MportsVcsDir}", $run);
   
   $run->status('active');
   $run->update;
@@ -74,7 +74,7 @@
 # The basic outline of the update is this:
 # 1) Check to see if any runs are finished, if they are marked them as complete.  If no runs
 #    are done we exit, because there is nothing to do.
-# 2) Update the MportsCvs dir.
+# 2) Update the MportsVcs dir.
 # 3) Make a new MportsTarball from 2)
 # 3) create a new run.
 # 4) index the tree and create port entries for the new runs.
@@ -91,7 +91,7 @@
     return;
   }
     
-  update_cvs_dir();
+  update_vcs_dir();
   
   foreach my $done (@completed) {
     printf "refreshing %s on %s\n", $done->osversion, $done->arch;
@@ -98,7 +98,7 @@
     my $run = Magus::Run->create({osversion => $done->osversion, arch => $done->arch});
     make_tarball($run);
 
-    Magus::Index->sync("$Magus::Config{MasterDataDir}/$Magus::Config{MportsCvsDir}", $run);
+    Magus::Index->sync("$Magus::Config{MasterDataDir}/$Magus::Config{MportsVcsDir}", $run);
     
     $run->status('active');
     $run->update;
@@ -106,21 +106,20 @@
 }
 
 
-sub update_cvs_dir {
+sub update_vcs_dir {
   chdir($Magus::Config{'MasterDataDir'})  || die "Couldn't cd to $Magus::Config{'MasterDataDir'}: $!\n";
 
   # let the magus group read and write.
   umask(0002);  
 
-  print "Deleteing $Magus::Config{MportsCvsDir}...";
-  if (-d $Magus::Config{MportsCvsDir}) {
-    rmtree($Magus::Config{MportsCvsDir})    || die "Couldn't rmtree $Magus::Config{'MportsCvsDir'}: $!\n";
+  print "Deleteing $Magus::Config{MportsVcsDir}...";
+  if (-d $Magus::Config{MportsVcsDir}) {
+    rmtree($Magus::Config{MportsVcsDir})    || die "Couldn't rmtree $Magus::Config{'MportsVcsDir'}: $!\n";
   }
   
   print " done.\n";
   
-  my $cmd = "cvs $Magus::Config{CvsFlags} -d $Magus::Config{CvsRoot} co -P $Magus::Config{MportsCvsDir}";
-  
+  my $cmd = "cd $Magus::Config{MportsVcsDir} && svn co $Magus::Config{VcsRoot} mports";
   system($cmd) == 0 || die "$cmd returned non-zero: $?\n";
 }
 
@@ -132,12 +131,12 @@
   
   my $tarball = $run->tarball;
 
-  set_tree_id("$Magus::Config{'MasterDataDir'}/$Magus::Config{'MportsCvsDir'}", $run);
+  set_tree_id("$Magus::Config{'MasterDataDir'}/$Magus::Config{'MportsVcsDir'}", $run);
   
   chdir($Magus::Config{'MasterDataDir'})  || die "Couldn't cd to $Magus::Config{'MasterDataDir'}: $!\n";
   unlink($tarball) || ($! !~ m/no such/i && die "Couldn't unlink $tarball: $!\n");
   
-  my $tar = "/usr/bin/tar cfj $tarball $Magus::Config{MportsCvsDir}";
+  my $tar = "/usr/bin/tar cfj $tarball $Magus::Config{MportsVcsDir}";
   
   system($tar) == 0 || die "$tar returned non-zero: $?\n";
   move($tarball, $Magus::Config{'RunTarballDir'}) || die "Couldn't mv $tarball $Magus::Config{'RunTarballDir'}: $!\n";

Modified: trunk/Tools/scripts/licenseit
===================================================================
--- trunk/Tools/scripts/licenseit	2013-09-03 23:11:02 UTC (rev 15413)
+++ trunk/Tools/scripts/licenseit	2013-09-04 11:22:29 UTC (rev 15414)
@@ -13,7 +13,7 @@
 $EDITOR +$LINENUM Makefile
 
 if make FATAL_LICENSE_CHECK=1 check-license; then
-	cvs ci -m "license" Makefile
+	svn ci -m "license" Makefile
 fi
 
-rm -r work/
\ No newline at end of file
+rm -r work/