Index: /branches/cnb_branch_20090215/DataStore/Todo =================================================================== --- /branches/cnb_branch_20090215/DataStore/Todo (revision 22418) +++ /branches/cnb_branch_20090215/DataStore/Todo (revision 22419) @@ -2,4 +2,2 @@ - Nothing yet - - Index: /branches/cnb_branch_20090215/doc/design/remote.copy.txt =================================================================== --- /branches/cnb_branch_20090215/doc/design/remote.copy.txt (revision 22418) +++ /branches/cnb_branch_20090215/doc/design/remote.copy.txt (revision 22419) @@ -55,6 +55,6 @@ rc_manifest: -STAGE: -ID: +STAGE: chip +ID: nnnnn DB_VERSION : version number of source database DB_DATA : filename.sql Index: /branches/cnb_branch_20090215/ippScripts/scripts/register_imfile.pl =================================================================== --- /branches/cnb_branch_20090215/ippScripts/scripts/register_imfile.pl (revision 22418) +++ /branches/cnb_branch_20090215/ippScripts/scripts/register_imfile.pl (revision 22419) @@ -17,9 +17,8 @@ use Storable qw(freeze thaw); use File::Basename qw( basename); -use IPC::Cmd 0.36 qw( can_run run ); +use IPC::Run qw( harness run ); use PS::IPP::Config 1.01 qw( :standard ); use PS::IPP::Metadata::Config; - -my $PI = 3.141592653589793238462643383279502; +use Math::Trig; my $ipprc = PS::IPP::Config->new(); # IPP configuration @@ -58,7 +57,11 @@ # Look for programs we need my $missing_tools; -my $regtool = can_run('regtool') or (warn "Can't find regtool" and $missing_tools = 1); -my $ppStats = can_run('ppStats') or (warn "Can't find ppStats" and $missing_tools = 1); -my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1); +my $regtool = `which regtool` or (warn "Can't find regtool" and $missing_tools = 1); +my $ppStats = `which ppStats` or (warn "Can't find ppStats" and $missing_tools = 1); +my $ppStatsFromMetadata = `which ppStatsFromMetadata` or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1); +chomp $regtool; +chomp $ppStats; +chomp $ppStatsFromMetadata; + if ($missing_tools) { @@ -80,16 +83,30 @@ # Run ppStats on the input file { - my $command = "$ppStats $uri -recipe PPSTATS $RECIPE -level | $ppStatsFromMetadata - - REGISTER_IMFILE"; # Command to run ppStats and ppStatsFromMetadata - $command .= " -dbname $dbname" if defined $dbname; - my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = - cache_run(command => $command, verbose => $verbose); - unless ($success) { - $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); - &my_die ("Unable to perform ppStats on exposure id $exp_id: $error_code", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $error_code); - } - foreach my $line (@$stdout_buf) { - $cmdflags .= " $line"; - } - chomp $cmdflags; + my $command1 = "$ppStats $uri -recipe PPSTATS $RECIPE -level"; + my $command2 = "$ppStatsFromMetadata - - REGISTER_IMFILE"; + + # Since there are no spaces in the arguments, we can get away with this: + my @command1 = split(/ /, $command1); + my @command2 = split(/ /, $command2); + + # Run ppStats + my ($in1, $out1, $err1); # Buffers for ppStats + my $h1 = harness \@command1, \$in1, \$out1, \$err1; + print "[Running $command1]\n"; + my $result1 = run $h1; + print $out1; + print $err1; + &my_die("Unable to perform ppStats on exposure id $exp_id: " . $h1->result(), $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $h1->result() ) unless $result1; + + print "[Running " . join(' ', @command2) . "]\n"; + my ($out2, $err2); # Buffers for ppStatsFromMetadata + my $h2 = harness \@command2, \$out1, \$out2, \$err2; + print "[Running $command2]\n"; + my $result2 = run $h2; + print $out2; + print $err2; + &my_die("Unable to perform ppStatsFromMetadata on exposure id $exp_id: " . $h2->result(), $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $h2->result() ) unless $result2; + chomp $out2; + $cmdflags = $out2; } @@ -123,9 +140,9 @@ # if the needed data is available, pass it to sunmoon: if ($longitude && $latitude && $ra && $dec && $dateobs) { - - $longitude *= 12.0 / $PI; # longitude is reported in West radians; sunmoon wants it in West Hours - $latitude *= 180.0 / $PI; # latitude is reported in North radians; sunmoon wants it in North Degrees - $ra *= 180.0 / $PI; # ra is reported in radians; sunmoon wants it in degrees - $dec *= 180.0 / $PI; # dec is reported in radians; sunmoon wants it in degrees + + $longitude *= 12.0 / pi; # longitude is reported in West radians; sunmoon wants it in West Hours + $latitude *= 180.0 / pi; # latitude is reported in North radians; sunmoon wants it in North Degrees + $ra *= 180.0 / pi; # ra is reported in radians; sunmoon wants it in degrees + $dec *= 180.0 / pi; # dec is reported in radians; sunmoon wants it in degrees my $sunmoon_cmd = "sunmoon -latitude $latitude -longitude $longitude -elevation $elevation $dateobs $ra $dec"; @@ -137,7 +154,7 @@ if ($?) { - warn ("failure running $sunmoon_cmd, not supplying\n"); + warn ("failure running $sunmoon_cmd, not supplying\n"); } else { - $command .= " $sunmoon_data"; + $command .= " $sunmoon_data"; } } Index: /branches/cnb_branch_20090215/ippTests/buildtest/ippcheck.003 =================================================================== --- /branches/cnb_branch_20090215/ippTests/buildtest/ippcheck.003 (revision 22418) +++ /branches/cnb_branch_20090215/ippTests/buildtest/ippcheck.003 (revision 22419) @@ -45,11 +45,8 @@ writeStatus "Remove old ipp build status: " $? -#cvs checkout -CVSROOT="giebink@cvs.pan-starrs.ifa.hawaii.edu:/cvsroot/pan-starrs" -export CVSROOT -echo "CVSROOT =" $CVSROOT >> $logfile -writeStep "Begin cvs co ipp" -cvs co ipp >> $buildfile 2>> $errorfile -writeStatus "CVS ipp checkout status: " $? +#svn checkout +writeStep "Begin svn co ipp" +svn co http://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/ ipp >> $buildfile 2>> $errorfile +writeStatus "SVN ipp checkout status: " $? #remove old C libraries and Perl modules @@ -63,13 +60,13 @@ writeStatus "Remove old extperl dir status: " $? -#cvs checkout extlibs -writeStep "Begin cvs co extlibs" -cvs co extlibs>> $buildfile 2>> $errorfile -writeStatus "CVS extlibs checkout status: " $? +#svn checkout extlibs +writeStep "Begin svn co extlibs" +svn co http://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/extlibs/ ext >> $buildfile 2>> $errorfile +writeStatus "SVN extlibs checkout status: " $? -#cvs checkout extperl -writeStep "Begin cvs co extperl" -cvs co extperl>> $buildfile 2>> $errorfile -writeStatus "CVS extperl checkout status: " $? +#svn checkout extperl +writeStep "Begin svn co extperl" +svn co http://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/extperl/ extperl >> $buildfile 2>> $errorfile +writeStatus "SVN extperl checkout status: " $? #psconfig bootstrap @@ -106,6 +103,6 @@ #check psbuild -writeStep "Running psbuild -profile -dev" -psbuild -profile -dev >> $buildfile 2>> $errorfile +writeStep "Running psbuild -dev" +psbuild -dev >> $buildfile 2>> $errorfile writeStatus "Run psbuild status: " $? @@ -115,5 +112,5 @@ writeStep "Building ipp configuration: configure --prefix='/data/ipp003.0/ippTests/psconfig/default.lin64'" -configure --prefix='/data/ipp003.0/ippTests/psconfig/default.lin64' >> $buildfile 2>> $errorfile +configure --prefix='/data/ipp003.0/ippTests/psconfig/default.lin64' --enable-tests >> $buildfile 2>> $errorfile writeStatus "ipp configure status: " $? Index: /branches/cnb_branch_20090215/ppStack/src/ppStackArguments.c =================================================================== --- /branches/cnb_branch_20090215/ppStack/src/ppStackArguments.c (revision 22418) +++ /branches/cnb_branch_20090215/ppStack/src/ppStackArguments.c (revision 22419) @@ -256,5 +256,5 @@ valueArgRecipeStr(arguments, recipe, "-psf-model", "PSF.MODEL", recipe); - if (psMetadataLookupBool(NULL, arguments, "-viusal") { + if (psMetadataLookupBool(NULL, arguments, "-viusal")) { pmVisualSetVisual(true); } Index: /branches/cnb_branch_20090215/ppSub/src/ppSub.h =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSub.h (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSub.h (revision 22419) @@ -6,6 +6,11 @@ * * @author IfA +<<<<<<< .working * @version $Revision: 1.6.2.1 $ $Name: not supported by cvs2svn $ * @date $Date: 2009-02-19 17:59:49 $ +======= + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ +>>>>>>> .merge-right.r22214 * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c (revision 22419) @@ -6,6 +6,11 @@ * * @author IfA +<<<<<<< .working * @version $Revision: 1.58.2.1 $ $Name: not supported by cvs2svn $ * @date $Date: 2009-02-19 17:59:49 $ +======= + * @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ +>>>>>>> .merge-right.r22214 * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.33.2.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:49 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.23.2.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:49 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c (revision 22419) @@ -6,6 +6,11 @@ * * @author IfA +<<<<<<< .working * @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $ * @date $Date: 2009-02-19 17:59:49 $ +======= + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ +>>>>>>> .merge-right.r22214 * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:49 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.112.2.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:49 $ + * @version $Revision: 1.113 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c (revision 22419) @@ -6,6 +6,11 @@ * * @author IfA +<<<<<<< .working * @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $ * @date $Date: 2009-02-19 17:59:49 $ +======= + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ +>>>>>>> .merge-right.r22214 * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.4.4.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:49 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:50 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:50 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:50 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c =================================================================== --- /branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c (revision 22418) +++ /branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c (revision 22419) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.3.2.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-19 17:59:50 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-18 00:31:20 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ Index: /branches/cnb_branch_20090215/psModules/src/extras/pmVisual.c =================================================================== --- /branches/cnb_branch_20090215/psModules/src/extras/pmVisual.c (revision 22418) +++ /branches/cnb_branch_20090215/psModules/src/extras/pmVisual.c (revision 22419) @@ -18,5 +18,8 @@ #include "pmHDU.h" #include "pmFPA.h" +#include "pmFPAfile.h" #include "pmAstrometryObjects.h" +#include "pmSubtractionStamps.h" + #include "pmFPAExtent.h" @@ -28,4 +31,8 @@ # define KAPAY 700 +#include "pmAstrometryVisual.h" +#include "pmSubtractionVisual.h" +#include "pmStackVisual.h" + static bool isVisual = false; @@ -40,5 +47,5 @@ bool pmVisualClose(void) { - pmAstrometryVisualClose(); + pmAstromVisualClose(); pmSubtractionVisualClose(); pmStackVisualClose(); Index: /branches/cnb_branch_20090215/psModules/src/imcombine/pmStackVisual.c =================================================================== --- /branches/cnb_branch_20090215/psModules/src/imcombine/pmStackVisual.c (revision 22419) +++ /branches/cnb_branch_20090215/psModules/src/imcombine/pmStackVisual.c (revision 22419) @@ -0,0 +1,63 @@ +/** Diagnostic plots for pmStack + * @author Chris Beaumont, IfA + */ + +/* Include Files */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include + +#include "pmKapaPlots.h" +#include "pmVisual.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmAstrometryObjects.h" + +# if (HAVE_KAPA) +# include + +//variables to determine when things are plotted +static bool plotTestImage = true; + +// variables to store plotting window indices +static int kapa = -1; +static int kapa2 = -1; + +/** destroy windows at the end of a run*/ +bool pmStackVisualClose() +{ + if(kapa != -1) + KiiClose(kapa); + if(kapa2 != -1) + KiiClose(kapa2); + return true; +} + + +/** Display a test image + * @param image to plot + * @param name for plot. No spaces allowed. + */ +bool pmStackVisualPlotTestImage(psImage *image, char *name) { + + if (!pmVisualIsVisual() || !plotTestImage) return true; + if (!pmVisualInitWindow(&kapa, "pmStack:Images")) return false; + + pmVisualScaleImage(kapa, image, name, 0, true); + pmVisualAskUser(&plotTestImage); + return true; +} + + +#else +bool pmStackVisualClose() {return true;} +bool pmStackVisualPlotTestImage(psImage *image, char *name) {return true;} +#endif Index: /branches/cnb_branch_20090215/psModules/src/imcombine/pmStackVisual.h =================================================================== --- /branches/cnb_branch_20090215/psModules/src/imcombine/pmStackVisual.h (revision 22419) +++ /branches/cnb_branch_20090215/psModules/src/imcombine/pmStackVisual.h (revision 22419) @@ -0,0 +1,7 @@ +#ifndef PM_STACK_VISUAL_H +#define PM_STACK_VISUAL_H + +bool pmStackVisualClose(void); +bool pmStackVisualPlotTestImage(psImage *image, char *name); + +#endif Index: /branches/cnb_branch_20090215/psconfig/psbuild =================================================================== --- /branches/cnb_branch_20090215/psconfig/psbuild (revision 22418) +++ /branches/cnb_branch_20090215/psconfig/psbuild (revision 22419) @@ -218,7 +218,7 @@ $stop_now = 0; - for ($i = 0; !$stop_now && ($i < @cvsname); $i++) { - if (($stop ne "") && ($stop eq $cvsname[$i])) { $stop_now = 1; } - if (($start ne "") && ($start ne $cvsname[$i])) { next; } + for ($i = 0; !$stop_now && ($i < @module); $i++) { + if (($stop ne "") && ($stop eq $module[$i])) { $stop_now = 1; } + if (($start ne "") && ($start ne $module[$i])) { next; } $start = ""; @@ -227,12 +227,12 @@ if ($do_build eq "N") { next; } - $workdir = "../$cvsname[$i]"; + $workdir = "../$module[$i]"; # XXX need to grab current value for cleanup - print "\n ** psbuild: $cvsname[$i] ** \n"; - print "\033]0; ** psbuild: $cvsname[$i] ** \007"; + print "\n ** psbuild: $module[$i] ** \n"; + print "\033]0; ** psbuild: $module[$i] ** \007"; if (!-d $workdir || !-r $workdir || !-x $workdir) { - print STDERR "WARNING: no directory for component $cvsname[$i], skipping\n"; + print STDERR "WARNING: no directory for component $module[$i], skipping\n"; next; } @@ -248,11 +248,11 @@ if (-e "Build.PL") { vsystem ("$psperlbuild"); - if ($?) { &failure($cvsname[$i], "failure in perl Build.PL"); } + if ($?) { &failure($module[$i], "failure in perl Build.PL"); } vsystem ("./Build"); - if ($?) { &failure($cvsname[$i], "failure in Build"); } + if ($?) { &failure($module[$i], "failure in Build"); } vsystem ("./Build install"); - if ($?) { &failure($cvsname[$i], "failure in Build install"); } + if ($?) { &failure($module[$i], "failure in Build install"); } next; @@ -273,26 +273,26 @@ $skip_configure = 1; vsystem ("$psautogen $psopts"); - if ($?) { &failure($cvsname[$i], "failure in psautogen"); } + if ($?) { &failure($module[$i], "failure in psautogen"); } } if ($rebuild_this && -e "configure" && !$skip_configure) { vsystem ("$psconfigure $psopts"); - if ($?) { &failure($cvsname[$i], "failure in psconfigure"); } - } - - if (! -e "Makefile") { &failure($cvsname[$i], "missing makefile: do you need to run the -dev developer build?"); } + if ($?) { &failure($module[$i], "failure in psconfigure"); } + } + + if (! -e "Makefile") { &failure($module[$i], "missing makefile: do you need to run the -dev developer build?"); } if ($clean) { vsystem ("make clean"); - if ($?) { &failure($cvsname[$i], "failure in make clean"); } + if ($?) { &failure($module[$i], "failure in make clean"); } } vsystem ("make"); - if ($?) { &failure($cvsname[$i], "failure in make"); } + if ($?) { &failure($module[$i], "failure in make"); } vsystem ("make install"); - if ($?) { &failure($cvsname[$i], "failure in make install"); } - - print "*** done with $cvsname[$i] ***\n"; + if ($?) { &failure($module[$i], "failure in make install"); } + + print "*** done with $module[$i] ***\n"; success: @@ -359,5 +359,5 @@ sub load_distfile { # open and read the distribution file - # results go into @cvsname, @branchtag, @branchver, @mode + # results go into @module, @branchtag, @branchver, @mode open (FILE, $distribution) || die "ERROR: can't open distribution file $distribution\n"; @list = ; @@ -365,5 +365,5 @@ @mode = (); - @cvsname = (); + @module = (); @branchtag = (); @branchver = (); @@ -374,7 +374,7 @@ if ($line =~ m|^\s*\#|) { next; } - ($mode, $cvsname, $branchtag, $branchver) = split (" ", $line); - - if ($cvsname eq "") { die "missing module name\n"; } + ($mode, $module, $branchtag, $branchver) = split (" ", $line); + + if ($module eq "") { die "missing module name\n"; } ($do_tag, $do_build, $do_package, $do_update) = $mode =~ m|(\S)(\S)(\S)(\S)|; @@ -385,8 +385,8 @@ if ($verbose) { print "tag: $do_tag, build: $do_build, package: $do_package, update: $do_update "; } - if ($verbose) { print "module: $cvsname, branchtag: $branchtag, branchver: $branchver \n"; } + if ($verbose) { print "module: $module, branchtag: $branchtag, branchver: $branchver \n"; } push @mode, $mode; - push @cvsname, $cvsname; + push @module, $module; push @branchtag, $branchtag; push @branchver, $branchver; Index: /branches/cnb_branch_20090215/psconfig/pschecklibs =================================================================== --- /branches/cnb_branch_20090215/psconfig/pschecklibs (revision 22418) +++ /branches/cnb_branch_20090215/psconfig/pschecklibs (revision 22419) @@ -232,8 +232,8 @@ print "psconfigure: $psconfigure"; - ## try to build the module from ../../extlibs/$tarball + ## try to build the module ../extlibs/$tarball # go to extlibs and unpack the tarball - chdir "../../extlibs"; + chdir "../extlibs"; print "extract $name from $tarball\n"; Index: /branches/cnb_branch_20090215/psconfig/pscheckperl =================================================================== --- /branches/cnb_branch_20090215/psconfig/pscheckperl (revision 22418) +++ /branches/cnb_branch_20090215/psconfig/pscheckperl (revision 22419) @@ -90,6 +90,6 @@ } - # try to build the module from ../../extperl/Module.*.tar.gz - chdir "../../extperl" or die "Unable to find ../../extperl directory."; + # try to build the module from ../extperl/Module.*.tar.gz + chdir "../extperl" or die "Unable to find ../extperl directory."; print "extract $module from $tarball\n"; Index: /branches/cnb_branch_20090215/psconfig/psdist =================================================================== --- /branches/cnb_branch_20090215/psconfig/psdist (revision 22418) +++ /branches/cnb_branch_20090215/psconfig/psdist (revision 22419) @@ -100,10 +100,10 @@ sub difflist { - for ($i = 0; $i < @cvsname; $i++) { + for ($i = 0; $i < @module; $i++) { # the base component cannot be rdiffed - print STDERR "--- $cvsname[$i] ---\n"; - if ($cvsname[$i] eq "base") { next; } + print STDERR "--- $module[$i] ---\n"; + if ($module[$i] eq "base") { next; } if ($tag[$i] eq "") { next; } - &vsystem ("cvs -q rdiff -s -r $tag[$i] $cvsname[$i]"); + &vsystem ("cvs -q rdiff -s -r $tag[$i] $module[$i]"); print STDERR "\n\n"; } @@ -114,25 +114,25 @@ print STDERR "setting tags\n"; if ($settag_mode eq "") { die "-tag mode is not set\n"; } - for ($i = 0; $i < @cvsname; $i++) { - if (($module ne "") && ($module ne $cvsname[$i])) { next; } + for ($i = 0; $i < @module; $i++) { + if (($module ne "") && ($module ne $module[$i])) { next; } ## XXX make this backwards compatible with pre-ipp-2.4 releases (with four, not five, entries)? ($do_tag, $do_build, $do_dist, $do_update, $dev_build) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)(\S)|; if ($do_tag eq "N") { - push @remind, $cvsname[$i]; - next; - } - if ($branchtag[$i] eq "") { die "branch tag missing for $cvsname[$i]\n"; } + push @remind, $module[$i]; + next; + } + if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; } if ($branchver[$i] eq "") { die "branch tag version missing\n"; } $tag = "$branchtag[$i]$branchver[$i]"; if ($settag_mode eq "branch") { - &vsystem ("cvs -q rtag -b $branchtag[$i] $cvsname[$i]"); + &vsystem ("cvs -q rtag -b $branchtag[$i] $module[$i]"); next; } if ($settag_mode eq "dev") { - &vsystem ("cvs -q rtag $tag $cvsname[$i]"); + &vsystem ("cvs -q rtag $tag $module[$i]"); next; } if ($settag_mode eq "rev") { - &vsystem ("cvs -q rtag -r $branchtag[$i] $tag $cvsname[$i]"); + &vsystem ("cvs -q rtag -r $branchtag[$i] $tag $module[$i]"); next; } @@ -152,21 +152,21 @@ chdir ".."; - for ($i = 0; $i < @cvsname; $i++) { - if (($module ne "") && ($module ne $cvsname[$i])) { next; } + for ($i = 0; $i < @module; $i++) { + if (($module ne "") && ($module ne $module[$i])) { next; } ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|; if ($do_update eq "N") { - push @remind, $cvsname[$i]; + push @remind, $module[$i]; next; } # only update modules with tags - if ($branchtag[$i] eq "") { die "branch tag missing for $cvsname[$i]\n"; } + if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; } if ($branchver[$i] eq "") { die "branch tag version missing\n"; } $tag = "$branchtag[$i]$branchver[$i]"; if ($update_mode eq "tags") { - &vsystem ("cvs -q co -r $tag $cvsname[$i]"); + &vsystem ("cvs -q co -r $tag $module[$i]"); next; } if ($update_mode eq "head") { - &vsystem ("cvs -q co -A $cvsname[$i]"); + &vsystem ("cvs -q co -A $module[$i]"); next; } @@ -187,18 +187,18 @@ mkdir $distribution; chdir $distribution; - for ($i = 0; $i < @cvsname; $i++) { - if (($module ne "") && ($module ne $cvsname[$i])) { next; } + for ($i = 0; $i < @module; $i++) { + if (($module ne "") && ($module ne $module[$i])) { next; } ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|; if ($do_dist eq "N") { next; } - if ($branchtag[$i] eq "") { die "branch tag missing for $cvsname[$i]\n"; } + if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; } if ($branchver[$i] eq "") { die "branch tag version missing\n"; } $tag = "$branchtag[$i]$branchver[$i]"; if ($mkdist_head) { - &vsystem ("cvs co $cvsname[$i]"); + &vsystem ("cvs co $module[$i]"); if ($status) { die "error running cvs"; } } else { - &vsystem ("cvs co -r $tag $cvsname[$i]"); + &vsystem ("cvs co -r $tag $module[$i]"); if ($status) { die "error running cvs"; } } @@ -218,11 +218,11 @@ # run autogen.sh, if present, to build a configure script chdir $distribution; - for ($i = 0; $i < @cvsname; $i++) { - if (($module ne "") && ($module ne $cvsname[$i])) { next; } + for ($i = 0; $i < @module; $i++) { + if (($module ne "") && ($module ne $module[$i])) { next; } ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|; if ($do_dist eq "N") { next; } - if (! -e "$cvsname[$i]/autogen.sh" || -e "$cvsname[$i]/Build.PL" ) { next; } - chdir $cvsname[$i]; + if (! -e "$module[$i]/autogen.sh" || -e "$module[$i]/Build.PL" ) { next; } + chdir $module[$i]; vsystem ("./autogen.sh --no-configure"); @@ -255,5 +255,5 @@ sub load_distfile { # open and read the distribution file - # results go into @cvsname, @branchtag, @branchver, @mode + # results go into @module, @branchtag, @branchver, @mode $file = "$tagsets/$ARGV[0].dist"; open (FILE, $file) || die "ERROR: can't open distribution file $file\n"; @@ -262,5 +262,5 @@ @mode = (); - @cvsname = (); + @module = (); @branchtag = (); @branchver = (); @@ -271,7 +271,7 @@ if ($line =~ m|^\s*\#|) { next; } - ($mode, $cvsname, $branchtag, $branchver) = split (" ", $line); - - if ($cvsname eq "") { die "missing module name\n"; } + ($mode, $my_module, $branchtag, $branchver) = split (" ", $line); + + if ($my_module eq "") { die "missing module name\n"; } ($do_tag, $do_build, $do_dist, $do_update) = $mode =~ m|(\S)(\S)(\S)(\S)|; @@ -281,9 +281,9 @@ if (($do_update ne "Y") && ($do_update ne "N")) { die "invalid tag option $do_update\n"; } - # print "module: $cvsname, branchtag: $branchtag, branchver: $branchver "; + # print "module: $my_module, branchtag: $branchtag, branchver: $branchver "; # print "tag: $do_tag, build: $do_build, dist: $do_dist, update: $do_update\n"; push @mode, $mode; - push @cvsname, $cvsname; + push @module, $my_module; push @branchtag, $branchtag; push @branchver, $branchver; Index: /branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.dist =================================================================== --- /branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.dist (revision 22418) +++ /branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.dist (revision 22419) @@ -6,5 +6,5 @@ # |||||-- build for developer? # ||||| -# ||||| CVS module CVS branch tag CVS branch version +# ||||| module branch name tag version # ||||| YYNNY Ohana ipp-2-7 -0 Index: /branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.perl =================================================================== --- /branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.perl (revision 22418) +++ /branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.perl (revision 22419) @@ -1,63 +1,63 @@ # NN Name Tarball Version Optional Responses 00 Getopt::Long Getopt-Long-2.36.tar.gz 2.3 n - 00 Module::Build Module-Build-0.2806.tar.gz 0.2806 - 01 ExtUtils::MakeMaker ExtUtils-MakeMaker-6.31.tar.gz 0 - 02 Params::Validate Params-Validate-0.87-eam-v1.tar.gz 0.77 + 00 Module::Build Module-Build-0.2806.tar.gz 0.2806 + 01 ExtUtils::MakeMaker ExtUtils-MakeMaker-6.31.tar.gz 0 + 02 Params::Validate Params-Validate-0.91.tar.gz 0.77 # 02 Apache::Test Apache-Test-1.29.tar.gz 1.29 - 03 DateTime::TimeZone DateTime-TimeZone-0.59.tar.gz 0 - 04 DateTime::Locale DateTime-Locale-0.33.tar.gz 0 - 05 Time::Local Time-Local-1.17.tar.gz 0 - 06 DateTime DateTime-0.36.tar.gz 0 - 07 MIME::Base64 MIME-Base64-3.07.tar.gz 0 - 08 IO::Compress::Base IO-Compress-Base-2.003.tar.gz 0 - 09 Compress::Raw::Zlib Compress-Raw-Zlib-2.003.tar.gz 0 - 10 Class::Factory::Util Class-Factory-Util-1.6.tar.gz 0 - 11 DateTime::Format::Strptime DateTime-Format-Strptime-1.0700.tar.gz 0 - 12 Net::Domain::TLD Net-Domain-TLD-1.65.tar.gz 0 - 13 Sub::Uplevel Sub-Uplevel-0.14.tar.gz 0 - 14 HTML::Tagset HTML-Tagset-3.10.tar.gz 0 - 15 Digest Digest-1.15.tar.gz 0 - 16 IO::Compress::Zlib::Extra IO-Compress-Zlib-2.003.tar.gz 0 - 17 version version-0.70.tar.gz 0 - 18 Text::Balanced Text-Balanced-v2.0.0.tar.gz 0 - 19 DateTime::Format::Builder DateTime-Format-Builder-0.7807.tar.gz 0 - 20 ExtUtils::Manifest ExtUtils-Manifest-1.51.tar.gz 0 - 21 URI URI-1.35.tar.gz 1.30 - 22 Data::Validate::Domain Data-Validate-Domain-0.05.tar.gz 0 - 23 Test::Exception Test-Exception-0.24.tar.gz 0 - 24 Tree::DAG_Node Tree-DAG_Node-1.05.tar.gz 0 - 25 Array::Compare Array-Compare-1.13.tar.gz 0 - 26 HTML::Parser HTML-Parser-3.56.tar.gz 0 - 27 Digest::MD5 Digest-MD5-2.36.tar.gz 0 - 28 Net::FTP libnet-1.19.tar.gz 0 - 29 Compress::Zlib Compress-Zlib-2.003.tar.gz 0 - 30 Locale::Maketext::Simple Locale-Maketext-Simple-0.18.tar.gz 0 - 31 Parse::RecDescent Parse-RecDescent-1.94.tar.gz 1.94 - 32 Class::Accessor Class-Accessor-0.30.tar.gz 0.19 - 33 DateTime::Format::ISO8601 DateTime-Format-ISO8601-0.0403.tar.gz 0.0402 - 34 CGI CGI.pm-3.25.tar.gz 3 - 35 Test::Cmd Test-Cmd-1.05.tar.gz 1.05 - 36 Net::HTTPServer Net-HTTPServer-1.1.1.tar.gz 1.1.1 - 37 LWP libwww-perl-5.805.tar.gz 0 - 38 Digest::MD5::File Digest-MD5-File-0.05.tar.gz 0.03 - 39 File::Temp File-Temp-0.18.tar.gz 0.16 - 40 Data::Validate::URI Data-Validate-URI-0.01.tar.gz 0.01 - 41 Test::Warn Test-Warn-0.08.tar.gz 0 - 42 YAML YAML-0.62.tar.gz 0.58 y - 43 Module::Load Module-Load-0.10.tar.gz 0 - 44 Params::Check Params-Check-0.25.tar.gz 0 - 45 Template Template-Toolkit-2.16.tar.gz 0 n,n - 46 Statistics::Descriptive Statistics-Descriptive-2.6.tar.gz 2.6 - 47 Storable Storable-2.15.tar.gz 0 - 48 IO::String IO-String-1.08.tar.gz 0 - 49 Date::Parse TimeDate-1.16.tar.gz 0 - 50 Digest::SHA1 Digest-SHA1-2.11.tar.gz 0 - 51 DB_File DB_File-1.814.tar.gz 0 - 52 File::NFSLock File-NFSLock-1.20.tar.gz 0 - 53 Heap Heap-0.71.tar.gz 0 - 54 Module::Load::Conditional Module-Load-Conditional-0.16.tar.gz 0 - 55 IPC::Run IPC-Run-0.80.tar.gz 0 - 56 Cache Cache-2.04.tar.gz 0 - 57 IPC::Cmd IPC-Cmd-0.36.tar.gz 0.36 + 03 DateTime::TimeZone DateTime-TimeZone-0.59.tar.gz 0 + 04 DateTime::Locale DateTime-Locale-0.33.tar.gz 0 + 05 Time::Local Time-Local-1.17.tar.gz 0 + 06 DateTime DateTime-0.36.tar.gz 0 + 07 MIME::Base64 MIME-Base64-3.07.tar.gz 0 + 08 IO::Compress::Base IO-Compress-Base-2.003.tar.gz 0 + 09 Compress::Raw::Zlib Compress-Raw-Zlib-2.003.tar.gz 0 + 10 Class::Factory::Util Class-Factory-Util-1.6.tar.gz 0 + 11 DateTime::Format::Strptime DateTime-Format-Strptime-1.0700.tar.gz 0 + 12 Net::Domain::TLD Net-Domain-TLD-1.65.tar.gz 0 + 13 Sub::Uplevel Sub-Uplevel-0.14.tar.gz 0 + 14 HTML::Tagset HTML-Tagset-3.10.tar.gz 0 + 15 Digest Digest-1.15.tar.gz 0 + 16 IO::Compress::Zlib::Extra IO-Compress-Zlib-2.003.tar.gz 0 + 17 version version-0.70.tar.gz 0 + 18 Text::Balanced Text-Balanced-v2.0.0.tar.gz 0 + 19 DateTime::Format::Builder DateTime-Format-Builder-0.7807.tar.gz 0 + 20 ExtUtils::Manifest ExtUtils-Manifest-1.51.tar.gz 0 + 21 URI URI-1.35.tar.gz 1.30 + 22 Data::Validate::Domain Data-Validate-Domain-0.05.tar.gz 0 + 23 Test::Exception Test-Exception-0.24.tar.gz 0 + 24 Tree::DAG_Node Tree-DAG_Node-1.05.tar.gz 0 + 25 Array::Compare Array-Compare-1.13.tar.gz 0 + 26 HTML::Parser HTML-Parser-3.56.tar.gz 0 + 27 Digest::MD5 Digest-MD5-2.36.tar.gz 0 + 28 Net::FTP libnet-1.19.tar.gz 0 + 29 Compress::Zlib Compress-Zlib-2.003.tar.gz 0 + 30 Locale::Maketext::Simple Locale-Maketext-Simple-0.18.tar.gz 0 + 31 Parse::RecDescent Parse-RecDescent-1.94.tar.gz 1.94 + 32 Class::Accessor Class-Accessor-0.30.tar.gz 0.19 + 33 DateTime::Format::ISO8601 DateTime-Format-ISO8601-0.06.tar.gz 0.06 + 34 CGI CGI.pm-3.25.tar.gz 3 + 35 Test::Cmd Test-Cmd-1.05.tar.gz 1.05 + 36 Net::HTTPServer Net-HTTPServer-1.1.1.tar.gz 1.1.1 + 37 LWP libwww-perl-5.805.tar.gz 0 + 38 Digest::MD5::File Digest-MD5-File-0.05.tar.gz 0.03 + 39 File::Temp File-Temp-0.18.tar.gz 0.16 + 40 Data::Validate::URI Data-Validate-URI-0.01.tar.gz 0.01 + 41 Test::Warn Test-Warn-0.08.tar.gz 0 + 42 YAML YAML-0.62.tar.gz 0.58 y + 43 Module::Load Module-Load-0.10.tar.gz 0 + 44 Params::Check Params-Check-0.25.tar.gz 0 + 45 Template Template-Toolkit-2.16.tar.gz 0 n,n + 46 Statistics::Descriptive Statistics-Descriptive-2.6.tar.gz 2.6 + 47 Storable Storable-2.15.tar.gz 0 + 48 IO::String IO-String-1.08.tar.gz 0 + 49 Date::Parse TimeDate-1.16.tar.gz 0 + 50 Digest::SHA1 Digest-SHA1-2.11.tar.gz 0 + 51 DB_File DB_File-1.814.tar.gz 0 + 52 File::NFSLock File-NFSLock-1.20.tar.gz 0 + 53 Heap Heap-0.71.tar.gz 0 + 54 Module::Load::Conditional Module-Load-Conditional-0.16.tar.gz 0 + 55 IPC::Run IPC-Run-0.80.tar.gz 0 + 56 Cache Cache-2.04.tar.gz 0 + 57 IPC::Cmd IPC-Cmd-0.36.tar.gz 0.36 58 SOAP::Lite SOAP-Lite-0.69.tar.gz 0 yes,yes,no 59 Log::Log4perl Log-Log4perl-1.10.tar.gz 0 @@ -67,14 +67,14 @@ 63 File::Find::Rule File-Find-Rule-0.30.tar.gz 0.30 64 Astro::FITS::CFITSIO Astro-FITS-CFITSIO-1.05.tar.gz 0 - 65 Test::More Test-Simple-0.74.tar.gz 0.49 -# 66 Apache::DBI Apache-DBI-1.06.tar.gz 0 -# 67 Apache2::SOAP Apache2-SOAP-0.72.tar.gz 0 - 68 Test::URI Test-URI-1.08.tar.gz 0 + 65 Test::More Test-Simple-0.74.tar.gz 0.49 +# 66 Apache::DBI Apache-DBI-1.06.tar.gz 0 +# 67 Apache2::SOAP Apache2-SOAP-0.72.tar.gz 0 + 68 Test::URI Test-URI-1.08.tar.gz 0 # 69 Sys::Statistics::Linux::DiskUsage Sys-Statistics-Linux-0.26.tar.gz 0 -# 70 Config::YAML Config-YAML-1.42.tar.gz 0 -# 72 File::ExtAttr File-ExtAttr-1.07.tar.gz 0 - 73 DBI DBI-1.601.tar.gz 0 - 71 DBD::mysql DBD-mysql-4.006.tar.gz 0 -# 74 Net::Server::Daemonize Net-Server-0.97.tar.gz 0.05 +# 70 Config::YAML Config-YAML-1.42.tar.gz 0 +# 72 File::ExtAttr File-ExtAttr-1.07.tar.gz 0 + 73 DBI DBI-1.601.tar.gz 0 + 71 DBD::mysql DBD-mysql-4.006.tar.gz 0 +# 74 Net::Server::Daemonize Net-Server-0.97.tar.gz 0.05 75 File::Path File-Path-2.04.tar.gz 76 File::Mountpoint File-Mountpoint-0.01.tar.gz 0.01