Changeset 4807

Timestamp:

Aug 17, 2005, 8:10:10 AM (21 years ago)

Author:

eugene

Message:

mkdist improvements, adjustments to distribution tables

Location:

trunk/Ohana/etc

Files:

• distributions/elixir-config.dst (modified) (2 diffs)
• distributions/elixir-ohana-1.3.dst (modified) (2 diffs)
• distributions/mana-1.1.dst (modified) (1 diff)
• distributions/opihi-2.3.dst (modified) (1 diff)
• distributions/psched-0.1.dst (modified) (1 diff)
• mkdist (modified) (6 diffs)

trunk/Ohana/etc/distributions/elixir-config.dst

@@ -1 +1 @@
 
 # elixir configuration information
+DISTRIBUTION elixir-config 1.0
+ USE config-1-0    config
+END
+
 DISTRIBUTION elixir-config 1.1
  USE config-1-1    config
@@ -9 +13 @@
 END
 
-# elixir configuration information
-DISTRIBUTION elixir-config 1.0
- USE config-1-0    config
+DISTRIBUTION elixir-config 1.3
+ USE config-1-3    config
 END
-

trunk/Ohana/etc/distributions/elixir-ohana-1.3.dst

@@ -4 +4 @@
  USE base
 
- USE addstar-1-1     addstar
- USE delstar-1-1     delstar
+ USE addstar-1-2     addstar
+ USE delstar-1-2     delstar
  USE elixir-1-2      elixir
  USE gastro-1-1      gastro
@@ -12 +12 @@
  USE imclean-1-1     imclean
  USE imregister-1-2  imregister
- USE kapa-1-1        kapa
+ USE kapa-1-2        kapa
  USE kii-1-2         kii
  USE misc-1-1        misc
  USE nightd-1-1      nightd
- USE opihi-2-2       opihi.v2
- USE perl-1-1        perl
+ USE opihi-2-3       opihi.base
+ USE dvo-0-1         dvo
+ USE mana-1-1        mana
+ USE perl-1-2        perl
  USE relphot-1-1     relphot
- USE shell-1-0       shell
+ USE shell-1-1       shell
  USE tcl-1-0         tcl
 
  USE libdummy-1-1    libdummy
- USE libohana-1-3    libohana
- USE libautocode-1-0 libautocode
+ USE libohana-1-4    libohana
+ USE libautocode-1-1 libautocode
  USE libfits-1-3     libfits
 END
-

trunk/Ohana/etc/distributions/mana-1.1.dst

@@ -2 +2 @@
 DISTRIBUTION mana 1.1
  USE base
- USE libdummy-1-0    libdummy
+ USE libdummy-1-1    libdummy
  USE libohana-1-4    libohana
  USE libautocode-1-1 libautocode
  USE libfits-1-3     libfits
  USE kii-1-2         kii
- USE kapa-1-1        kapa
+ USE kapa-1-2        kapa
 
  USE opihi-2-3       opihi.base

trunk/Ohana/etc/distributions/opihi-2.3.dst

@@ -2 +2 @@
 DISTRIBUTION opihi 2.3
  USE base
- USE libdummy-1-0    libdummy
+ USE libdummy-1-1    libdummy
  USE libohana-1-4    libohana
  USE libautocode-1-1 libautocode
  USE libfits-1-3     libfits
  USE kii-1-2         kii
- USE kapa-1-1        kapa
+ USE kapa-1-2        kapa
 
  USE opihi-2-3       opihi.base
  USE mana-1-1        mana
- USE dvo-1-0         dvo
- USE psched-1-0      psched
- USE pclient-1-0     pclient
- USE pcontrol-1-0    pcontrol
+ USE dvo-0-1         dvo
+ USE psched-0-1      psched
+ USE pclient-0-1     pclient
+ USE pcontrol-0-1    pcontrol
 END

trunk/Ohana/etc/distributions/psched-0.1.dst

@@ -2 +2 @@
 DISTRIBUTION psched 0.1
  USE base
- USE libdummy-1-0    libdummy
+ USE libdummy-1-1    libdummy
  USE libohana-1-4    libohana
  USE libautocode-1-1 libautocode
  USE libfits-1-3     libfits
  USE kii-1-2         kii
- USE kapa-1-1        kapa
+ USE kapa-1-2        kapa
 
  USE opihi-2-3       opihi.base

trunk/Ohana/etc/mkdist

@@ -1 +1 @@
 #!/usr/bin/env perl
+
+$diff = 0;
+$list = 0;
+@tARGV = ();
+for (; @ARGV > 0; ) {
+    if ($ARGV[0] eq "-diff") {
+        $diff = 1;
+        shift; next;
+    }
+    if ($ARGV[0] eq "-list") {
+        $list = 1;
+        shift; next;
+    }
+    if ($ARGV[0] eq "-h")     { &usage (); }
+    if ($ARGV[0] eq "-help")  { &usage (); }
+    if ($ARGV[0] eq "--help") { &usage (); }
+    @tARGV = (@tARGV, $ARGV[0]);
+    shift;
+}
+@ARGV = @tARGV;
 
 $distdir = "distributions";
 
-if (@ARGV != 2) { die "USAGE: mkdist (group) (version)\n"; }
+if (!$list && @ARGV != 2) { &usage (); }
+if ( $list && @ARGV != 0) { &usage (); }
 
 @files = <$distdir/*.dst>;
@@ -13 +34 @@
     $Ns = @sublist;
     $Nt = @list;
-    print STDERR "read $Ns from $file, $Nt so far\n";
 }
 
@@ -23 +43 @@
 @tag = ();
 
+if ($list) { 
+    printf STDERR "Available Distributions\n";
+    printf STDERR "%-16s  %7s\n", "Module", "Version";
+    printf STDERR "-------------------------\n";
+}
+
 foreach $line (@list) {
 
@@ -31 +57 @@
         ($tmp, $word1, $word2) = split (" ", $line);
         if (($word1 eq $group) && ($word2 eq $version)) { $ingroup = 1; }
+        if ($list) { printf STDERR "%-16s  %7s\n", $word1, $word2; }
     }
-    if (!$ingroup) { next; }
+    if (!$ingroup || $list) { next; }
 
     # found END
@@ -53 +80 @@
 }
 
+if ($list) { exit 0; }
 if (@name == 0) { die "ERROR: $group $version not found\n"; }
+
+if ($diff) { &difflist (); }
 
 for ($i = 0; $i < @name; $i++) {
@@ -78 +108 @@
 }
 
+sub usage {
+    print STDERR "USAGE: mkdist -list\n   : list valid distributions \n";
+    print STDERR "USAGE: mkdist (group) (version)\n   : make a distribution tarball\n";
+    print STDERR "USAGE: mkdist -diff (group) (version)\n";
+    print STDERR "   : show the difference between the distribution and current tree\n";
+    exit 2;
+}
+
+sub difflist {
+
+    for ($i = 0; $i < @name; $i++) {
+        if ($tag[$i] eq "") {
+            &vsystem ("cvs -q rdiff -s -r HEAD $name[$i]");
+        } else {
+            &vsystem ("cvs -q rdiff -s -r $tag[$i] $name[$i]");
+        }       
+    }
+    exit 0;
+}