Index: unk/Ohana/etc/distributions.txt =================================================================== --- /trunk/Ohana/etc/distributions.txt (revision 4738) +++ (revision ) @@ -1,188 +1,0 @@ - -# elixir configuration information -DISTRIBUTION elixir-config 1.1 - USE config-1-1 config -END - -DISTRIBUTION elixir-config 1.2 - USE config-1-2 config -END - -# complete untagged elixir distribution -DISTRIBUTION elixir-ohana head - - USE base - - USE addrefs - USE addspphot - USE addstar - USE delstar - USE elixir - USE gastro - USE gcompare - USE gophot - USE imclean - USE imregister - USE kapa - USE kii - USE misc - USE nightd - USE opihi.v2 - USE perl - USE relphot - USE shell - USE tcl - - USE libautocode - USE libdummy - USE libohana - USE libfits -END - -# complete elixir distribution -DISTRIBUTION elixir-ohana 1.3 - - USE base - - USE addstar-1-1 addstar - USE delstar-1-1 delstar - USE elixir-1-2 elixir - USE gastro-1-1 gastro - USE gcompare-1-0 gcompare - USE gophot-1-0 gophot - USE imclean-1-1 imclean - USE imregister-1-2 imregister - USE kapa-1-1 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 relphot-1-1 relphot - USE shell-1-0 shell - USE tcl-1-0 tcl - - USE libdummy-1-1 libdummy - USE libohana-1-3 libohana - USE libautocode-1-0 libautocode - USE libfits-1-3 libfits -END - -# complete elixir distribution -DISTRIBUTION elixir-ohana 1.2 - - USE base - - USE addrefs-1-0 addrefs - USE addspphot-1-0 addspphot - USE addstar-1-0 addstar - USE delstar-1-0 delstar - USE elixir-1-1 elixir - USE gastro-1-0 gastro - USE gcompare-1-0 gcompare - USE gophot-1-0 gophot - USE imclean-1-0 imclean - USE imregister-1-1 imregister - USE kapa-1-0 kapa - USE kii-1-1 kii - USE misc-1-0 misc - USE nightd-1-0 nightd - USE opihi-2-1 opihi.v2 - USE perl-1-0 perl - USE relphot-1-0 relphot - USE shell-1-0 shell - USE tcl-1-0 tcl - - USE libdummy-1-0 libdummy - USE libohana-1-2 libohana - USE libfits-1-2 libfits -END - -# complete elixir distribution -DISTRIBUTION elixir-ohana 1.1 - - USE base - - USE addrefs-1-0 addrefs - USE addspphot-1-0 addspphot - USE addstar-1-0 addstar - USE delstar-1-0 delstar - USE elixir-1-1 elixir - USE gastro-1-0 gastro - USE gcompare-1-0 gcompare - USE gophot-1-0 gophot - USE imclean-1-0 imclean - USE imregister-1-1 imregister - USE kapa-1-0 kapa - USE kii-1-1 kii - USE misc-1-0 misc - USE nightd-1-0 nightd - USE opihi-2-1 opihi.v2 - USE perl-1-0 perl - USE relphot-1-0 relphot - USE shell-1-0 shell - USE tcl-1-0 tcl - - USE libdummy-1-0 libdummy - USE libohana-1-1 libohana - USE libfits-1-1 libfits -END - -# complete elixir distribution -DISTRIBUTION elixir-ohana 1.0 - - USE base - - USE addrefs-1-0 addrefs - USE addspphot-1-0 addspphot - USE addstar-1-0 addstar - USE delstar-1-0 delstar - USE elixir-1-0 elixir - USE gastro-1-0 gastro - USE gcompare-1-0 gcompare - USE gophot-1-0 gophot - USE imclean-1-0 imclean - USE imregister-1-0 imregister - USE kapa-1-0 kapa - USE kii-1-0 kii - USE misc-1-0 misc - USE nightd-1-0 nightd - USE opihi-2-0 opihi.v2 - USE perl-1-0 perl - USE relphot-1-0 relphot - USE shell-1-0 shell - USE tcl-1-0 tcl - - USE libdummy-1-0 libdummy - USE libohana-1-0 libohana - USE libfits-1-0 libfits -END - -# elixir configuration information -DISTRIBUTION elixir-config 1.0 - USE config-1-0 config -END - -# the mana packages -DISTRIBUTION mana 1.0 - USE base - USE libdummy-1-0 libdummy - USE libohana-1-0 libohana - USE libfits-1-0 libfits - USE kapa-1-0 kapa - USE kii-1-0 kii - USE opihi-2-0 opihi.v2 -END - -# basic ohana tools (fits tools, precess, radec, etc) -DISTRIBUTION ohana-tools 1.0 - - USE base - - USE gcompare-1-0 gcompare - USE misc-1-0 misc - - USE libdummy-1-0 libdummy - USE libohana-1-0 libohana - USE libfits-1-0 libfits -END Index: /trunk/Ohana/etc/distributions/dvo-1.0.dst =================================================================== --- /trunk/Ohana/etc/distributions/dvo-1.0.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/dvo-1.0.dst (revision 4739) @@ -0,0 +1,13 @@ +# the mana packages +DISTRIBUTION dvo 1.0 + USE base + USE libdummy-1-0 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 opihi-2-3 opihi.base + USE dvo-1-0 dvo +END Index: /trunk/Ohana/etc/distributions/elixir-config.dst =================================================================== --- /trunk/Ohana/etc/distributions/elixir-config.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/elixir-config.dst (revision 4739) @@ -0,0 +1,15 @@ + +# elixir configuration information +DISTRIBUTION elixir-config 1.1 + USE config-1-1 config +END + +DISTRIBUTION elixir-config 1.2 + USE config-1-2 config +END + +# elixir configuration information +DISTRIBUTION elixir-config 1.0 + USE config-1-0 config +END + Index: /trunk/Ohana/etc/distributions/elixir-ohana-1.0.dst =================================================================== --- /trunk/Ohana/etc/distributions/elixir-ohana-1.0.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/elixir-ohana-1.0.dst (revision 4739) @@ -0,0 +1,30 @@ +# complete elixir distribution +DISTRIBUTION elixir-ohana 1.0 + + USE base + + USE addrefs-1-0 addrefs + USE addspphot-1-0 addspphot + USE addstar-1-0 addstar + USE delstar-1-0 delstar + USE elixir-1-0 elixir + USE gastro-1-0 gastro + USE gcompare-1-0 gcompare + USE gophot-1-0 gophot + USE imclean-1-0 imclean + USE imregister-1-0 imregister + USE kapa-1-0 kapa + USE kii-1-0 kii + USE misc-1-0 misc + USE nightd-1-0 nightd + USE opihi-2-0 opihi.v2 + USE perl-1-0 perl + USE relphot-1-0 relphot + USE shell-1-0 shell + USE tcl-1-0 tcl + + USE libdummy-1-0 libdummy + USE libohana-1-0 libohana + USE libfits-1-0 libfits +END + Index: /trunk/Ohana/etc/distributions/elixir-ohana-1.1.dst =================================================================== --- /trunk/Ohana/etc/distributions/elixir-ohana-1.1.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/elixir-ohana-1.1.dst (revision 4739) @@ -0,0 +1,30 @@ +# complete elixir distribution +DISTRIBUTION elixir-ohana 1.1 + + USE base + + USE addrefs-1-0 addrefs + USE addspphot-1-0 addspphot + USE addstar-1-0 addstar + USE delstar-1-0 delstar + USE elixir-1-1 elixir + USE gastro-1-0 gastro + USE gcompare-1-0 gcompare + USE gophot-1-0 gophot + USE imclean-1-0 imclean + USE imregister-1-1 imregister + USE kapa-1-0 kapa + USE kii-1-1 kii + USE misc-1-0 misc + USE nightd-1-0 nightd + USE opihi-2-1 opihi.v2 + USE perl-1-0 perl + USE relphot-1-0 relphot + USE shell-1-0 shell + USE tcl-1-0 tcl + + USE libdummy-1-0 libdummy + USE libohana-1-1 libohana + USE libfits-1-1 libfits +END + Index: /trunk/Ohana/etc/distributions/elixir-ohana-1.2.dst =================================================================== --- /trunk/Ohana/etc/distributions/elixir-ohana-1.2.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/elixir-ohana-1.2.dst (revision 4739) @@ -0,0 +1,30 @@ +# complete elixir distribution +DISTRIBUTION elixir-ohana 1.2 + + USE base + + USE addrefs-1-0 addrefs + USE addspphot-1-0 addspphot + USE addstar-1-0 addstar + USE delstar-1-0 delstar + USE elixir-1-1 elixir + USE gastro-1-0 gastro + USE gcompare-1-0 gcompare + USE gophot-1-0 gophot + USE imclean-1-0 imclean + USE imregister-1-1 imregister + USE kapa-1-0 kapa + USE kii-1-1 kii + USE misc-1-0 misc + USE nightd-1-0 nightd + USE opihi-2-1 opihi.v2 + USE perl-1-0 perl + USE relphot-1-0 relphot + USE shell-1-0 shell + USE tcl-1-0 tcl + + USE libdummy-1-0 libdummy + USE libohana-1-2 libohana + USE libfits-1-2 libfits +END + Index: /trunk/Ohana/etc/distributions/elixir-ohana-1.3.dst =================================================================== --- /trunk/Ohana/etc/distributions/elixir-ohana-1.3.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/elixir-ohana-1.3.dst (revision 4739) @@ -0,0 +1,29 @@ +# complete elixir distribution +DISTRIBUTION elixir-ohana 1.3 + + USE base + + USE addstar-1-1 addstar + USE delstar-1-1 delstar + USE elixir-1-2 elixir + USE gastro-1-1 gastro + USE gcompare-1-0 gcompare + USE gophot-1-0 gophot + USE imclean-1-1 imclean + USE imregister-1-2 imregister + USE kapa-1-1 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 relphot-1-1 relphot + USE shell-1-0 shell + USE tcl-1-0 tcl + + USE libdummy-1-1 libdummy + USE libohana-1-3 libohana + USE libautocode-1-0 libautocode + USE libfits-1-3 libfits +END + Index: /trunk/Ohana/etc/distributions/elixir-ohana-head.dst =================================================================== --- /trunk/Ohana/etc/distributions/elixir-ohana-head.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/elixir-ohana-head.dst (revision 4739) @@ -0,0 +1,31 @@ +# complete untagged elixir distribution +DISTRIBUTION elixir-ohana head + + USE base + + USE addrefs + USE addspphot + USE addstar + USE delstar + USE elixir + USE gastro + USE gcompare + USE gophot + USE imclean + USE imregister + USE kapa + USE kii + USE misc + USE nightd + USE opihi.v2 + USE perl + USE relphot + USE shell + USE tcl + + USE libautocode + USE libdummy + USE libohana + USE libfits +END + Index: /trunk/Ohana/etc/distributions/mana-1.0.dst =================================================================== --- /trunk/Ohana/etc/distributions/mana-1.0.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/mana-1.0.dst (revision 4739) @@ -0,0 +1,10 @@ +# the mana packages +DISTRIBUTION mana 1.0 + USE base + USE libdummy-1-0 libdummy + USE libohana-1-0 libohana + USE libfits-1-0 libfits + USE kapa-1-0 kapa + USE kii-1-0 kii + USE opihi-2-0 opihi.v2 +END Index: /trunk/Ohana/etc/distributions/mana-1.1.dst =================================================================== --- /trunk/Ohana/etc/distributions/mana-1.1.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/mana-1.1.dst (revision 4739) @@ -0,0 +1,13 @@ +# the mana packages +DISTRIBUTION mana 1.1 + USE base + USE libdummy-1-0 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 opihi-2-3 opihi.base + USE mana-1-1 mana +END Index: /trunk/Ohana/etc/distributions/ohana-tools-1.0.dst =================================================================== --- /trunk/Ohana/etc/distributions/ohana-tools-1.0.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/ohana-tools-1.0.dst (revision 4739) @@ -0,0 +1,12 @@ +# basic ohana tools (fits tools, precess, radec, etc) +DISTRIBUTION ohana-tools 1.0 + + USE base + + USE gcompare-1-0 gcompare + USE misc-1-0 misc + + USE libdummy-1-0 libdummy + USE libohana-1-0 libohana + USE libfits-1-0 libfits +END Index: /trunk/Ohana/etc/distributions/psched-1.0.dst =================================================================== --- /trunk/Ohana/etc/distributions/psched-1.0.dst (revision 4739) +++ /trunk/Ohana/etc/distributions/psched-1.0.dst (revision 4739) @@ -0,0 +1,15 @@ +# the mana packages +DISTRIBUTION psched 1.0 + USE base + USE libdummy-1-0 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 opihi-2-3 opihi.base + USE psched-1-0 psched + USE pclient-1-0 pclient + USE pcontrol-1-0 pcontrol +END Index: /trunk/Ohana/etc/mkdist =================================================================== --- /trunk/Ohana/etc/mkdist (revision 4738) +++ /trunk/Ohana/etc/mkdist (revision 4739) @@ -1,11 +1,18 @@ #!/usr/bin/env perl -$dist = "distributions.txt"; +$distdir = "distributions"; if (@ARGV != 2) { die "USAGE: mkdist (group) (version)\n"; } -open (FILE, $dist) || die "ERROR: can't open distribution file\n"; -@list = ; -close (FILE); +@files = <$distdir/*.dst>; +foreach $file (@files) { + open (FILE, $file) || die "ERROR: can't open distribution file\n"; + @sublist = ; + close (FILE); + push @list, @sublist; + $Ns = @sublist; + $Nt = @list; + print STDERR "read $Ns from $file, $Nt so far\n"; +} $group = $ARGV[0]; @@ -67,5 +74,5 @@ sub vsystem { print STDERR "@_\n"; - $status = system ("@_"); + # $status = system ("@_"); $status; }