[Pkg-octave-commit] rev 876 - utils

[Rafael Laboissiere]

Author: rafael
Date: 2007-03-29 12:48:03 +0000 (Thu, 29 Mar 2007)
New Revision: 876

Modified:
   utils/svn-commit-version
Log:
* Updated for new layout of the SVN repository
* In subroutine run, always echo the commands before running them

Modified: utils/svn-commit-version
===================================================================
--- utils/svn-commit-version	2007-03-29 12:46:46 UTC (rev 875)
+++ utils/svn-commit-version	2007-03-29 12:48:03 UTC (rev 876)
@@ -10,43 +10,36 @@
 my $dry_run = 0;
 
 GetOptions ("package=s" => \$trunkname,
-            "dry-run"  => \$dry_run,
-            "help" => \$help);
+            "dry-run"   => \$dry_run,
+            "help"      => \$help);
 
 if ($help) {
   print "FIXME\n";
   exit 0;
 }
 
+sub run {
+  my $cmd = shift;
+  print "$cmd\n";
+  if (not $dry_run) {
+    system ($cmd) == 0
+      or dieif (1, q{Cannot run "} . join (" ", (split (" ", $cmd))[0..1])
+	           . q{" command});
+  }
+}
+
 die "Usage: $prog [options] svn-dir [build-dir] [--package=trunk-pkg] [--dry-run]\n"
   if $#ARGV < 0 or $#ARGV > 1;
 
 sub dieif {
   my ($cond, $msg) = @_;
   die "$prog: $msg" if $cond;
-}      
+}
 
 (my $svndir = $ARGV [0]) =~ s{/+$}{};
 
-my $trunkdir = "$svndir/trunk/packages";
-dieif ((not -d $trunkdir), "Trunk directory $trunkdir does not exist");
-
-my $tagsdir = "$svndir/tags/packages";
-dieif ((not -d $tagsdir), "Tags directory $tagsdir does not exist");
-
 my $buildir = $#ARGV == 1 ? $ARGV [1] : ".";
 
-sub run {
-  my $cmd = shift;
-  if ($dry_run) {
-    print "$cmd\n";
-  } else {
-    system ($cmd) == 0
-      or dieif (1, q{Cannot run "} . join (" ", (split (" ", $cmd))[0..1])
-	           . q{" command});
-  }
-}
-
 my $debdir = "$buildir/debian";
 
 dieif ((not -d $debdir), "Directory $debdir does not exist");
@@ -62,18 +55,26 @@
   }
 }
 
-defined $trunkname 
+defined $trunkname
   or $trunkname = $pkgname;
 
-foreach my $d ("$trunkdir/$trunkname", "$tagsdir/$pkgname") {
+my $trunkdir = "$svndir/$trunkname/trunk";
+dieif ((not -d $trunkdir), "Trunk directory $trunkdir does not exist");
+
+my $tagsdir = "$svndir/$pkgname/tags";
+dieif ((not -d $tagsdir), "Tags directory $tagsdir does not exist");
+
+foreach my $d ("$trunkdir", "$tagsdir") {
   dieif ((not -d $d), "Directory $d/$pkgname does not exist");
 }
 
 run "svn ci --message=\"Debian release ${pkgname}_$version\" $debdir";
 
-run "svn up $trunkdir/$trunkname";
+run "svn up $trunkdir/debian";
 
-run "svn cp $trunkdir/$trunkname $tagsdir/$pkgname/$version";
+run "svn mkdir $tagsdir/$version";
 
+run "svn cp $trunkdir/debian $tagsdir/$version";
+
 run ("svn ci --message=\"Tagged Debian release ${pkgname}_$version\" "
-     . "$tagsdir/$pkgname/$version");
+     . "$tagsdir/$version");