Changeset 22419
- Timestamp:
- Feb 22, 2009, 10:26:32 PM (17 years ago)
- Location:
- branches/cnb_branch_20090215
- Files:
-
- 2 added
- 25 edited
-
DataStore/Todo (modified) (1 diff)
-
doc/design/remote.copy.txt (modified) (1 diff)
-
ippScripts/scripts/register_imfile.pl (modified) (5 diffs)
-
ippTests/buildtest/ippcheck.003 (modified) (4 diffs)
-
ppStack/src/ppStackArguments.c (modified) (1 diff)
-
ppSub/src/ppSub.h (modified) (1 diff)
-
ppSub/src/ppSubArguments.c (modified) (1 diff)
-
ppSub/src/ppSubCamera.c (modified) (1 diff)
-
ppSub/src/ppSubLoop.c (modified) (1 diff)
-
ppSub/src/ppSubMakePSF.c (modified) (1 diff)
-
ppSub/src/ppSubMatchPSFs.c (modified) (1 diff)
-
ppSub/src/ppSubReadout.c (modified) (1 diff)
-
ppSub/src/ppSubReadoutPhotometry.c (modified) (1 diff)
-
ppSub/src/ppSubReadoutSubtract.c (modified) (1 diff)
-
ppSub/src/ppSubReadoutUpdate.c (modified) (1 diff)
-
ppSub/src/ppSubSetMasks.c (modified) (1 diff)
-
ppSub/src/ppSubVarianceFactors.c (modified) (1 diff)
-
ppSub/src/ppSubVersion.c (modified) (1 diff)
-
psModules/src/extras/pmVisual.c (modified) (3 diffs)
-
psModules/src/imcombine/pmStackVisual.c (added)
-
psModules/src/imcombine/pmStackVisual.h (added)
-
psconfig/psbuild (modified) (8 diffs)
-
psconfig/pschecklibs (modified) (1 diff)
-
psconfig/pscheckperl (modified) (1 diff)
-
psconfig/psdist (modified) (9 diffs)
-
psconfig/tagsets/ipp-2.7.dist (modified) (1 diff)
-
psconfig/tagsets/ipp-2.7.perl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/cnb_branch_20090215/DataStore/Todo
r21495 r22419 2 2 3 3 - Nothing yet 4 5 -
branches/cnb_branch_20090215/doc/design/remote.copy.txt
r21536 r22419 55 55 rc_manifest: 56 56 57 STAGE: 58 ID: 57 STAGE: chip 58 ID: nnnnn 59 59 DB_VERSION : version number of source database 60 60 DB_DATA : filename.sql -
branches/cnb_branch_20090215/ippScripts/scripts/register_imfile.pl
r20118 r22419 17 17 use Storable qw(freeze thaw); 18 18 use File::Basename qw( basename); 19 use IPC:: Cmd 0.36 qw( can_runrun );19 use IPC::Run qw( harness run ); 20 20 use PS::IPP::Config 1.01 qw( :standard ); 21 21 use PS::IPP::Metadata::Config; 22 23 my $PI = 3.141592653589793238462643383279502; 22 use Math::Trig; 24 23 25 24 my $ipprc = PS::IPP::Config->new(); # IPP configuration … … 58 57 # Look for programs we need 59 58 my $missing_tools; 60 my $regtool = can_run('regtool') or (warn "Can't find regtool" and $missing_tools = 1); 61 my $ppStats = can_run('ppStats') or (warn "Can't find ppStats" and $missing_tools = 1); 62 my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1); 59 my $regtool = `which regtool` or (warn "Can't find regtool" and $missing_tools = 1); 60 my $ppStats = `which ppStats` or (warn "Can't find ppStats" and $missing_tools = 1); 61 my $ppStatsFromMetadata = `which ppStatsFromMetadata` or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1); 62 chomp $regtool; 63 chomp $ppStats; 64 chomp $ppStatsFromMetadata; 65 63 66 64 67 if ($missing_tools) { … … 80 83 # Run ppStats on the input file 81 84 { 82 my $command = "$ppStats $uri -recipe PPSTATS $RECIPE -level | $ppStatsFromMetadata - - REGISTER_IMFILE"; # Command to run ppStats and ppStatsFromMetadata 83 $command .= " -dbname $dbname" if defined $dbname; 84 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 85 cache_run(command => $command, verbose => $verbose); 86 unless ($success) { 87 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 88 &my_die ("Unable to perform ppStats on exposure id $exp_id: $error_code", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $error_code); 89 } 90 foreach my $line (@$stdout_buf) { 91 $cmdflags .= " $line"; 92 } 93 chomp $cmdflags; 85 my $command1 = "$ppStats $uri -recipe PPSTATS $RECIPE -level"; 86 my $command2 = "$ppStatsFromMetadata - - REGISTER_IMFILE"; 87 88 # Since there are no spaces in the arguments, we can get away with this: 89 my @command1 = split(/ /, $command1); 90 my @command2 = split(/ /, $command2); 91 92 # Run ppStats 93 my ($in1, $out1, $err1); # Buffers for ppStats 94 my $h1 = harness \@command1, \$in1, \$out1, \$err1; 95 print "[Running $command1]\n"; 96 my $result1 = run $h1; 97 print $out1; 98 print $err1; 99 &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; 100 101 print "[Running " . join(' ', @command2) . "]\n"; 102 my ($out2, $err2); # Buffers for ppStatsFromMetadata 103 my $h2 = harness \@command2, \$out1, \$out2, \$err2; 104 print "[Running $command2]\n"; 105 my $result2 = run $h2; 106 print $out2; 107 print $err2; 108 &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; 109 chomp $out2; 110 $cmdflags = $out2; 94 111 } 95 112 … … 123 140 # if the needed data is available, pass it to sunmoon: 124 141 if ($longitude && $latitude && $ra && $dec && $dateobs) { 125 126 $longitude *= 12.0 / $PI; # longitude is reported in West radians; sunmoon wants it in West Hours127 $latitude *= 180.0 / $PI; # latitude is reported in North radians; sunmoon wants it in North Degrees128 $ra *= 180.0 / $PI; # ra is reported in radians; sunmoon wants it in degrees129 $dec *= 180.0 / $PI; # dec is reported in radians; sunmoon wants it in degrees142 143 $longitude *= 12.0 / pi; # longitude is reported in West radians; sunmoon wants it in West Hours 144 $latitude *= 180.0 / pi; # latitude is reported in North radians; sunmoon wants it in North Degrees 145 $ra *= 180.0 / pi; # ra is reported in radians; sunmoon wants it in degrees 146 $dec *= 180.0 / pi; # dec is reported in radians; sunmoon wants it in degrees 130 147 131 148 my $sunmoon_cmd = "sunmoon -latitude $latitude -longitude $longitude -elevation $elevation $dateobs $ra $dec"; … … 137 154 138 155 if ($?) { 139 156 warn ("failure running $sunmoon_cmd, not supplying\n"); 140 157 } else { 141 158 $command .= " $sunmoon_data"; 142 159 } 143 160 } -
branches/cnb_branch_20090215/ippTests/buildtest/ippcheck.003
r20569 r22419 45 45 writeStatus "Remove old ipp build status: " $? 46 46 47 #cvs checkout 48 CVSROOT="giebink@cvs.pan-starrs.ifa.hawaii.edu:/cvsroot/pan-starrs" 49 export CVSROOT 50 echo "CVSROOT =" $CVSROOT >> $logfile 51 writeStep "Begin cvs co ipp" 52 cvs co ipp >> $buildfile 2>> $errorfile 53 writeStatus "CVS ipp checkout status: " $? 47 #svn checkout 48 writeStep "Begin svn co ipp" 49 svn co http://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/ ipp >> $buildfile 2>> $errorfile 50 writeStatus "SVN ipp checkout status: " $? 54 51 55 52 #remove old C libraries and Perl modules … … 63 60 writeStatus "Remove old extperl dir status: " $? 64 61 65 # cvscheckout extlibs66 writeStep "Begin cvsco extlibs"67 cvs co extlibs>> $buildfile 2>> $errorfile 68 writeStatus " CVSextlibs checkout status: " $?62 #svn checkout extlibs 63 writeStep "Begin svn co extlibs" 64 svn co http://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/extlibs/ ext >> $buildfile 2>> $errorfile 65 writeStatus "SVN extlibs checkout status: " $? 69 66 70 # cvscheckout extperl71 writeStep "Begin cvsco extperl"72 cvs co extperl>> $buildfile 2>> $errorfile 73 writeStatus " CVSextperl checkout status: " $?67 #svn checkout extperl 68 writeStep "Begin svn co extperl" 69 svn co http://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/extperl/ extperl >> $buildfile 2>> $errorfile 70 writeStatus "SVN extperl checkout status: " $? 74 71 75 72 #psconfig bootstrap … … 106 103 107 104 #check psbuild 108 writeStep "Running psbuild - profile -dev"109 psbuild - profile -dev >> $buildfile 2>> $errorfile105 writeStep "Running psbuild -dev" 106 psbuild -dev >> $buildfile 2>> $errorfile 110 107 writeStatus "Run psbuild status: " $? 111 108 … … 115 112 116 113 writeStep "Building ipp configuration: configure --prefix='/data/ipp003.0/ippTests/psconfig/default.lin64'" 117 configure --prefix='/data/ipp003.0/ippTests/psconfig/default.lin64' >> $buildfile 2>> $errorfile114 configure --prefix='/data/ipp003.0/ippTests/psconfig/default.lin64' --enable-tests >> $buildfile 2>> $errorfile 118 115 writeStatus "ipp configure status: " $? 119 116 -
branches/cnb_branch_20090215/ppStack/src/ppStackArguments.c
r22214 r22419 256 256 valueArgRecipeStr(arguments, recipe, "-psf-model", "PSF.MODEL", recipe); 257 257 258 if (psMetadataLookupBool(NULL, arguments, "-viusal") {258 if (psMetadataLookupBool(NULL, arguments, "-viusal")) { 259 259 pmVisualSetVisual(true); 260 260 } -
branches/cnb_branch_20090215/ppSub/src/ppSub.h
r21536 r22419 6 6 * 7 7 * @author IfA 8 <<<<<<< .working 8 9 * @version $Revision: 1.6.2.1 $ $Name: not supported by cvs2svn $ 9 10 * @date $Date: 2009-02-19 17:59:49 $ 11 ======= 12 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2009-02-18 00:31:20 $ 14 >>>>>>> .merge-right.r22214 10 15 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 16 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 <<<<<<< .working 8 9 * @version $Revision: 1.58.2.1 $ $Name: not supported by cvs2svn $ 9 10 * @date $Date: 2009-02-19 17:59:49 $ 11 ======= 12 * @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2009-02-18 00:31:20 $ 14 >>>>>>> .merge-right.r22214 10 15 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 16 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1.3 3.2.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:49$8 * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1.2 3.2.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:49$8 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 <<<<<<< .working 8 9 * @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $ 9 10 * @date $Date: 2009-02-19 17:59:49 $ 11 ======= 12 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2009-02-18 00:31:20 $ 14 >>>>>>> .merge-right.r22214 10 15 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 16 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 2.4.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:49$8 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1.11 2.2.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:49$8 * @version $Revision: 1.113 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 <<<<<<< .working 8 9 * @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $ 9 10 * @date $Date: 2009-02-19 17:59:49 $ 11 ======= 12 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2009-02-18 00:31:20 $ 14 >>>>>>> .merge-right.r22214 10 15 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 16 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 4.4.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:49$8 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 3.4.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:50 $8 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 2.4.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:50 $8 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 3.4.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:50 $8 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c
r21536 r22419 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 3.2.1$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-1 9 17:59:50 $8 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-18 00:31:20 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ -
branches/cnb_branch_20090215/psModules/src/extras/pmVisual.c
r21536 r22419 18 18 #include "pmHDU.h" 19 19 #include "pmFPA.h" 20 #include "pmFPAfile.h" 20 21 #include "pmAstrometryObjects.h" 22 #include "pmSubtractionStamps.h" 23 21 24 #include "pmFPAExtent.h" 22 25 … … 28 31 # define KAPAY 700 29 32 33 #include "pmAstrometryVisual.h" 34 #include "pmSubtractionVisual.h" 35 #include "pmStackVisual.h" 36 30 37 static bool isVisual = false; 31 38 … … 40 47 41 48 bool pmVisualClose(void) { 42 pmAstrom etryVisualClose();49 pmAstromVisualClose(); 43 50 pmSubtractionVisualClose(); 44 51 pmStackVisualClose(); -
branches/cnb_branch_20090215/psconfig/psbuild
r19883 r22419 218 218 219 219 $stop_now = 0; 220 for ($i = 0; !$stop_now && ($i < @ cvsname); $i++) {221 if (($stop ne "") && ($stop eq $ cvsname[$i])) { $stop_now = 1; }222 if (($start ne "") && ($start ne $ cvsname[$i])) { next; }220 for ($i = 0; !$stop_now && ($i < @module); $i++) { 221 if (($stop ne "") && ($stop eq $module[$i])) { $stop_now = 1; } 222 if (($start ne "") && ($start ne $module[$i])) { next; } 223 223 $start = ""; 224 224 … … 227 227 if ($do_build eq "N") { next; } 228 228 229 $workdir = "../$ cvsname[$i]";229 $workdir = "../$module[$i]"; 230 230 231 231 # XXX need to grab current value for cleanup 232 print "\n ** psbuild: $ cvsname[$i] ** \n";233 print "\033]0; ** psbuild: $ cvsname[$i] ** \007";232 print "\n ** psbuild: $module[$i] ** \n"; 233 print "\033]0; ** psbuild: $module[$i] ** \007"; 234 234 235 235 if (!-d $workdir || !-r $workdir || !-x $workdir) { 236 print STDERR "WARNING: no directory for component $ cvsname[$i], skipping\n";236 print STDERR "WARNING: no directory for component $module[$i], skipping\n"; 237 237 next; 238 238 } … … 248 248 if (-e "Build.PL") { 249 249 vsystem ("$psperlbuild"); 250 if ($?) { &failure($ cvsname[$i], "failure in perl Build.PL"); }250 if ($?) { &failure($module[$i], "failure in perl Build.PL"); } 251 251 252 252 vsystem ("./Build"); 253 if ($?) { &failure($ cvsname[$i], "failure in Build"); }253 if ($?) { &failure($module[$i], "failure in Build"); } 254 254 255 255 vsystem ("./Build install"); 256 if ($?) { &failure($ cvsname[$i], "failure in Build install"); }256 if ($?) { &failure($module[$i], "failure in Build install"); } 257 257 258 258 next; … … 273 273 $skip_configure = 1; 274 274 vsystem ("$psautogen $psopts"); 275 if ($?) { &failure($ cvsname[$i], "failure in psautogen"); }275 if ($?) { &failure($module[$i], "failure in psautogen"); } 276 276 } 277 277 278 278 if ($rebuild_this && -e "configure" && !$skip_configure) { 279 279 vsystem ("$psconfigure $psopts"); 280 if ($?) { &failure($ cvsname[$i], "failure in psconfigure"); }281 } 282 283 if (! -e "Makefile") { &failure($ cvsname[$i], "missing makefile: do you need to run the -dev developer build?"); }280 if ($?) { &failure($module[$i], "failure in psconfigure"); } 281 } 282 283 if (! -e "Makefile") { &failure($module[$i], "missing makefile: do you need to run the -dev developer build?"); } 284 284 285 285 if ($clean) { 286 286 vsystem ("make clean"); 287 if ($?) { &failure($ cvsname[$i], "failure in make clean"); }287 if ($?) { &failure($module[$i], "failure in make clean"); } 288 288 } 289 289 290 290 vsystem ("make"); 291 if ($?) { &failure($ cvsname[$i], "failure in make"); }291 if ($?) { &failure($module[$i], "failure in make"); } 292 292 293 293 vsystem ("make install"); 294 if ($?) { &failure($ cvsname[$i], "failure in make install"); }295 296 print "*** done with $ cvsname[$i] ***\n";294 if ($?) { &failure($module[$i], "failure in make install"); } 295 296 print "*** done with $module[$i] ***\n"; 297 297 298 298 success: … … 359 359 sub load_distfile { 360 360 # open and read the distribution file 361 # results go into @ cvsname, @branchtag, @branchver, @mode361 # results go into @module, @branchtag, @branchver, @mode 362 362 open (FILE, $distribution) || die "ERROR: can't open distribution file $distribution\n"; 363 363 @list = <FILE>; … … 365 365 366 366 @mode = (); 367 @ cvsname = ();367 @module = (); 368 368 @branchtag = (); 369 369 @branchver = (); … … 374 374 if ($line =~ m|^\s*\#|) { next; } 375 375 376 ($mode, $ cvsname, $branchtag, $branchver) = split (" ", $line);377 378 if ($ cvsname eq "") { die "missing module name\n"; }376 ($mode, $module, $branchtag, $branchver) = split (" ", $line); 377 378 if ($module eq "") { die "missing module name\n"; } 379 379 380 380 ($do_tag, $do_build, $do_package, $do_update) = $mode =~ m|(\S)(\S)(\S)(\S)|; … … 385 385 386 386 if ($verbose) { print "tag: $do_tag, build: $do_build, package: $do_package, update: $do_update "; } 387 if ($verbose) { print "module: $ cvsname, branchtag: $branchtag, branchver: $branchver \n"; }387 if ($verbose) { print "module: $module, branchtag: $branchtag, branchver: $branchver \n"; } 388 388 389 389 push @mode, $mode; 390 push @ cvsname, $cvsname;390 push @module, $module; 391 391 push @branchtag, $branchtag; 392 392 push @branchver, $branchver; -
branches/cnb_branch_20090215/psconfig/pschecklibs
r20298 r22419 232 232 print "psconfigure: $psconfigure"; 233 233 234 ## try to build the module from ../../extlibs/$tarball234 ## try to build the module ../extlibs/$tarball 235 235 236 236 # go to extlibs and unpack the tarball 237 chdir "../ ../extlibs";237 chdir "../extlibs"; 238 238 239 239 print "extract $name from $tarball\n"; -
branches/cnb_branch_20090215/psconfig/pscheckperl
r17490 r22419 90 90 } 91 91 92 # try to build the module from ../ ../extperl/Module.*.tar.gz93 chdir "../ ../extperl" or die "Unable to find ../../extperl directory.";92 # try to build the module from ../extperl/Module.*.tar.gz 93 chdir "../extperl" or die "Unable to find ../extperl directory."; 94 94 95 95 print "extract $module from $tarball\n"; -
branches/cnb_branch_20090215/psconfig/psdist
r18806 r22419 100 100 sub difflist { 101 101 102 for ($i = 0; $i < @ cvsname; $i++) {102 for ($i = 0; $i < @module; $i++) { 103 103 # the base component cannot be rdiffed 104 print STDERR "--- $ cvsname[$i] ---\n";105 if ($ cvsname[$i] eq "base") { next; }104 print STDERR "--- $module[$i] ---\n"; 105 if ($module[$i] eq "base") { next; } 106 106 if ($tag[$i] eq "") { next; } 107 &vsystem ("cvs -q rdiff -s -r $tag[$i] $ cvsname[$i]");107 &vsystem ("cvs -q rdiff -s -r $tag[$i] $module[$i]"); 108 108 print STDERR "\n\n"; 109 109 } … … 114 114 print STDERR "setting tags\n"; 115 115 if ($settag_mode eq "") { die "-tag mode is not set\n"; } 116 for ($i = 0; $i < @ cvsname; $i++) {117 if (($module ne "") && ($module ne $ cvsname[$i])) { next; }116 for ($i = 0; $i < @module; $i++) { 117 if (($module ne "") && ($module ne $module[$i])) { next; } 118 118 ## XXX make this backwards compatible with pre-ipp-2.4 releases (with four, not five, entries)? 119 119 ($do_tag, $do_build, $do_dist, $do_update, $dev_build) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)(\S)|; 120 120 if ($do_tag eq "N") { 121 push @remind, $ cvsname[$i];122 next; 123 } 124 if ($branchtag[$i] eq "") { die "branch tag missing for $ cvsname[$i]\n"; }121 push @remind, $module[$i]; 122 next; 123 } 124 if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; } 125 125 if ($branchver[$i] eq "") { die "branch tag version missing\n"; } 126 126 $tag = "$branchtag[$i]$branchver[$i]"; 127 127 if ($settag_mode eq "branch") { 128 &vsystem ("cvs -q rtag -b $branchtag[$i] $ cvsname[$i]");128 &vsystem ("cvs -q rtag -b $branchtag[$i] $module[$i]"); 129 129 next; 130 130 } 131 131 if ($settag_mode eq "dev") { 132 &vsystem ("cvs -q rtag $tag $ cvsname[$i]");132 &vsystem ("cvs -q rtag $tag $module[$i]"); 133 133 next; 134 134 } 135 135 if ($settag_mode eq "rev") { 136 &vsystem ("cvs -q rtag -r $branchtag[$i] $tag $ cvsname[$i]");136 &vsystem ("cvs -q rtag -r $branchtag[$i] $tag $module[$i]"); 137 137 next; 138 138 } … … 152 152 chdir ".."; 153 153 154 for ($i = 0; $i < @ cvsname; $i++) {155 if (($module ne "") && ($module ne $ cvsname[$i])) { next; }154 for ($i = 0; $i < @module; $i++) { 155 if (($module ne "") && ($module ne $module[$i])) { next; } 156 156 ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|; 157 157 if ($do_update eq "N") { 158 push @remind, $ cvsname[$i];158 push @remind, $module[$i]; 159 159 next; 160 160 } 161 161 # only update modules with tags 162 if ($branchtag[$i] eq "") { die "branch tag missing for $ cvsname[$i]\n"; }162 if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; } 163 163 if ($branchver[$i] eq "") { die "branch tag version missing\n"; } 164 164 $tag = "$branchtag[$i]$branchver[$i]"; 165 165 if ($update_mode eq "tags") { 166 &vsystem ("cvs -q co -r $tag $ cvsname[$i]");166 &vsystem ("cvs -q co -r $tag $module[$i]"); 167 167 next; 168 168 } 169 169 if ($update_mode eq "head") { 170 &vsystem ("cvs -q co -A $ cvsname[$i]");170 &vsystem ("cvs -q co -A $module[$i]"); 171 171 next; 172 172 } … … 187 187 mkdir $distribution; 188 188 chdir $distribution; 189 for ($i = 0; $i < @ cvsname; $i++) {190 if (($module ne "") && ($module ne $ cvsname[$i])) { next; }189 for ($i = 0; $i < @module; $i++) { 190 if (($module ne "") && ($module ne $module[$i])) { next; } 191 191 ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|; 192 192 if ($do_dist eq "N") { next; } 193 193 194 if ($branchtag[$i] eq "") { die "branch tag missing for $ cvsname[$i]\n"; }194 if ($branchtag[$i] eq "") { die "branch tag missing for $module[$i]\n"; } 195 195 if ($branchver[$i] eq "") { die "branch tag version missing\n"; } 196 196 $tag = "$branchtag[$i]$branchver[$i]"; 197 197 198 198 if ($mkdist_head) { 199 &vsystem ("cvs co $ cvsname[$i]");199 &vsystem ("cvs co $module[$i]"); 200 200 if ($status) { die "error running cvs"; } 201 201 } else { 202 &vsystem ("cvs co -r $tag $ cvsname[$i]");202 &vsystem ("cvs co -r $tag $module[$i]"); 203 203 if ($status) { die "error running cvs"; } 204 204 } … … 218 218 # run autogen.sh, if present, to build a configure script 219 219 chdir $distribution; 220 for ($i = 0; $i < @ cvsname; $i++) {221 if (($module ne "") && ($module ne $ cvsname[$i])) { next; }220 for ($i = 0; $i < @module; $i++) { 221 if (($module ne "") && ($module ne $module[$i])) { next; } 222 222 ($do_tag, $do_build, $do_dist, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|; 223 223 if ($do_dist eq "N") { next; } 224 224 225 if (! -e "$ cvsname[$i]/autogen.sh" || -e "$cvsname[$i]/Build.PL" ) { next; }226 chdir $ cvsname[$i];225 if (! -e "$module[$i]/autogen.sh" || -e "$module[$i]/Build.PL" ) { next; } 226 chdir $module[$i]; 227 227 228 228 vsystem ("./autogen.sh --no-configure"); … … 255 255 sub load_distfile { 256 256 # open and read the distribution file 257 # results go into @ cvsname, @branchtag, @branchver, @mode257 # results go into @module, @branchtag, @branchver, @mode 258 258 $file = "$tagsets/$ARGV[0].dist"; 259 259 open (FILE, $file) || die "ERROR: can't open distribution file $file\n"; … … 262 262 263 263 @mode = (); 264 @ cvsname = ();264 @module = (); 265 265 @branchtag = (); 266 266 @branchver = (); … … 271 271 if ($line =~ m|^\s*\#|) { next; } 272 272 273 ($mode, $ cvsname, $branchtag, $branchver) = split (" ", $line);274 275 if ($ cvsname eq "") { die "missing module name\n"; }273 ($mode, $my_module, $branchtag, $branchver) = split (" ", $line); 274 275 if ($my_module eq "") { die "missing module name\n"; } 276 276 277 277 ($do_tag, $do_build, $do_dist, $do_update) = $mode =~ m|(\S)(\S)(\S)(\S)|; … … 281 281 if (($do_update ne "Y") && ($do_update ne "N")) { die "invalid tag option $do_update\n"; } 282 282 283 # print "module: $ cvsname, branchtag: $branchtag, branchver: $branchver ";283 # print "module: $my_module, branchtag: $branchtag, branchver: $branchver "; 284 284 # print "tag: $do_tag, build: $do_build, dist: $do_dist, update: $do_update\n"; 285 285 286 286 push @mode, $mode; 287 push @ cvsname, $cvsname;287 push @module, $my_module; 288 288 push @branchtag, $branchtag; 289 289 push @branchver, $branchver; -
branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.dist
r21343 r22419 6 6 # |||||-- build for developer? 7 7 # ||||| 8 # ||||| CVS module CVS branch tag CVS branchversion8 # ||||| module branch name tag version 9 9 # ||||| 10 10 YYNNY Ohana ipp-2-7 -0 -
branches/cnb_branch_20090215/psconfig/tagsets/ipp-2.7.perl
r21536 r22419 1 1 # NN Name Tarball Version Optional Responses 2 2 00 Getopt::Long Getopt-Long-2.36.tar.gz 2.3 n 3 00 Module::Build Module-Build-0.2806.tar.gz 0.2806 4 01 ExtUtils::MakeMaker ExtUtils-MakeMaker-6.31.tar.gz 0 5 02 Params::Validate Params-Validate-0. 87-eam-v1.tar.gz 0.773 00 Module::Build Module-Build-0.2806.tar.gz 0.2806 4 01 ExtUtils::MakeMaker ExtUtils-MakeMaker-6.31.tar.gz 0 5 02 Params::Validate Params-Validate-0.91.tar.gz 0.77 6 6 # 02 Apache::Test Apache-Test-1.29.tar.gz 1.29 7 03 DateTime::TimeZone DateTime-TimeZone-0.59.tar.gz 0 8 04 DateTime::Locale DateTime-Locale-0.33.tar.gz 0 9 05 Time::Local Time-Local-1.17.tar.gz 0 10 06 DateTime DateTime-0.36.tar.gz 0 11 07 MIME::Base64 MIME-Base64-3.07.tar.gz 0 12 08 IO::Compress::Base IO-Compress-Base-2.003.tar.gz 0 13 09 Compress::Raw::Zlib Compress-Raw-Zlib-2.003.tar.gz 0 14 10 Class::Factory::Util Class-Factory-Util-1.6.tar.gz 0 15 11 DateTime::Format::Strptime DateTime-Format-Strptime-1.0700.tar.gz 0 16 12 Net::Domain::TLD Net-Domain-TLD-1.65.tar.gz 0 17 13 Sub::Uplevel Sub-Uplevel-0.14.tar.gz 0 18 14 HTML::Tagset HTML-Tagset-3.10.tar.gz 0 19 15 Digest Digest-1.15.tar.gz 0 20 16 IO::Compress::Zlib::Extra IO-Compress-Zlib-2.003.tar.gz 021 17 version version-0.70.tar.gz 22 18 Text::Balanced Text-Balanced-v2.0.0.tar.gz 023 19 DateTime::Format::Builder DateTime-Format-Builder-0.7807.tar.gz 024 20 ExtUtils::Manifest ExtUtils-Manifest-1.51.tar.gz 025 21 URI URI-1.35.tar.gz 1.3026 22 Data::Validate::Domain Data-Validate-Domain-0.05.tar.gz 027 23 Test::Exception Test-Exception-0.24.tar.gz 028 24 Tree::DAG_Node Tree-DAG_Node-1.05.tar.gz 029 25 Array::Compare Array-Compare-1.13.tar.gz 30 26 HTML::Parser HTML-Parser-3.56.tar.gz 031 27 Digest::MD5 Digest-MD5-2.36.tar.gz 032 28 Net::FTP libnet-1.19.tar.gz 033 29 Compress::Zlib Compress-Zlib-2.003.tar.gz 034 30 Locale::Maketext::Simple Locale-Maketext-Simple-0.18.tar.gz 035 31 Parse::RecDescent Parse-RecDescent-1.94.tar.gz 1.9436 32 Class::Accessor Class-Accessor-0.30.tar.gz 37 33 DateTime::Format::ISO8601 DateTime-Format-ISO8601-0.0 403.tar.gz 0.040238 34 CGI CGI.pm-3.25.tar.gz 339 35 Test::Cmd Test-Cmd-1.05.tar.gz 1.0540 36 Net::HTTPServer Net-HTTPServer-1.1.1.tar.gz 1.1.141 37 LWP libwww-perl-5.805.tar.gz 42 38 Digest::MD5::File Digest-MD5-File-0.05.tar.gz 43 39 File::Temp File-Temp-0.18.tar.gz 44 40 Data::Validate::URI Data-Validate-URI-0.01.tar.gz 45 41 Test::Warn Test-Warn-0.08.tar.gz 046 42 YAML YAML-0.62.tar.gz 0.58y47 43 Module::Load Module-Load-0.10.tar.gz 048 44 Params::Check Params-Check-0.25.tar.gz 049 45 Template Template-Toolkit-2.16.tar.gz 0n,n50 46 Statistics::Descriptive Statistics-Descriptive-2.6.tar.gz 51 47 Storable Storable-2.15.tar.gz 052 48 IO::String IO-String-1.08.tar.gz 053 49 Date::Parse TimeDate-1.16.tar.gz 054 50 Digest::SHA1 Digest-SHA1-2.11.tar.gz 055 51 DB_File DB_File-1.814.tar.gz 056 52 File::NFSLock File-NFSLock-1.20.tar.gz 057 53 Heap Heap-0.71.tar.gz 058 54 Module::Load::Conditional Module-Load-Conditional-0.16.tar.gz 059 55 IPC::Run IPC-Run-0.80.tar.gz 060 56 Cache Cache-2.04.tar.gz 61 57 IPC::Cmd IPC-Cmd-0.36.tar.gz 0.367 03 DateTime::TimeZone DateTime-TimeZone-0.59.tar.gz 0 8 04 DateTime::Locale DateTime-Locale-0.33.tar.gz 0 9 05 Time::Local Time-Local-1.17.tar.gz 0 10 06 DateTime DateTime-0.36.tar.gz 0 11 07 MIME::Base64 MIME-Base64-3.07.tar.gz 0 12 08 IO::Compress::Base IO-Compress-Base-2.003.tar.gz 0 13 09 Compress::Raw::Zlib Compress-Raw-Zlib-2.003.tar.gz 0 14 10 Class::Factory::Util Class-Factory-Util-1.6.tar.gz 0 15 11 DateTime::Format::Strptime DateTime-Format-Strptime-1.0700.tar.gz 0 16 12 Net::Domain::TLD Net-Domain-TLD-1.65.tar.gz 0 17 13 Sub::Uplevel Sub-Uplevel-0.14.tar.gz 0 18 14 HTML::Tagset HTML-Tagset-3.10.tar.gz 0 19 15 Digest Digest-1.15.tar.gz 0 20 16 IO::Compress::Zlib::Extra IO-Compress-Zlib-2.003.tar.gz 0 21 17 version version-0.70.tar.gz 0 22 18 Text::Balanced Text-Balanced-v2.0.0.tar.gz 0 23 19 DateTime::Format::Builder DateTime-Format-Builder-0.7807.tar.gz 0 24 20 ExtUtils::Manifest ExtUtils-Manifest-1.51.tar.gz 0 25 21 URI URI-1.35.tar.gz 1.30 26 22 Data::Validate::Domain Data-Validate-Domain-0.05.tar.gz 0 27 23 Test::Exception Test-Exception-0.24.tar.gz 0 28 24 Tree::DAG_Node Tree-DAG_Node-1.05.tar.gz 0 29 25 Array::Compare Array-Compare-1.13.tar.gz 0 30 26 HTML::Parser HTML-Parser-3.56.tar.gz 0 31 27 Digest::MD5 Digest-MD5-2.36.tar.gz 0 32 28 Net::FTP libnet-1.19.tar.gz 0 33 29 Compress::Zlib Compress-Zlib-2.003.tar.gz 0 34 30 Locale::Maketext::Simple Locale-Maketext-Simple-0.18.tar.gz 0 35 31 Parse::RecDescent Parse-RecDescent-1.94.tar.gz 1.94 36 32 Class::Accessor Class-Accessor-0.30.tar.gz 0.19 37 33 DateTime::Format::ISO8601 DateTime-Format-ISO8601-0.06.tar.gz 0.06 38 34 CGI CGI.pm-3.25.tar.gz 3 39 35 Test::Cmd Test-Cmd-1.05.tar.gz 1.05 40 36 Net::HTTPServer Net-HTTPServer-1.1.1.tar.gz 1.1.1 41 37 LWP libwww-perl-5.805.tar.gz 0 42 38 Digest::MD5::File Digest-MD5-File-0.05.tar.gz 0.03 43 39 File::Temp File-Temp-0.18.tar.gz 0.16 44 40 Data::Validate::URI Data-Validate-URI-0.01.tar.gz 0.01 45 41 Test::Warn Test-Warn-0.08.tar.gz 0 46 42 YAML YAML-0.62.tar.gz 0.58 y 47 43 Module::Load Module-Load-0.10.tar.gz 0 48 44 Params::Check Params-Check-0.25.tar.gz 0 49 45 Template Template-Toolkit-2.16.tar.gz 0 n,n 50 46 Statistics::Descriptive Statistics-Descriptive-2.6.tar.gz 2.6 51 47 Storable Storable-2.15.tar.gz 0 52 48 IO::String IO-String-1.08.tar.gz 0 53 49 Date::Parse TimeDate-1.16.tar.gz 0 54 50 Digest::SHA1 Digest-SHA1-2.11.tar.gz 0 55 51 DB_File DB_File-1.814.tar.gz 0 56 52 File::NFSLock File-NFSLock-1.20.tar.gz 0 57 53 Heap Heap-0.71.tar.gz 0 58 54 Module::Load::Conditional Module-Load-Conditional-0.16.tar.gz 0 59 55 IPC::Run IPC-Run-0.80.tar.gz 0 60 56 Cache Cache-2.04.tar.gz 0 61 57 IPC::Cmd IPC-Cmd-0.36.tar.gz 0.36 62 62 58 SOAP::Lite SOAP-Lite-0.69.tar.gz 0 yes,yes,no 63 63 59 Log::Log4perl Log-Log4perl-1.10.tar.gz 0 … … 67 67 63 File::Find::Rule File-Find-Rule-0.30.tar.gz 0.30 68 68 64 Astro::FITS::CFITSIO Astro-FITS-CFITSIO-1.05.tar.gz 0 69 65 Test::More 70 # 66 Apache::DBI 71 # 67 Apache2::SOAP 72 68 Test::URI 69 65 Test::More Test-Simple-0.74.tar.gz 0.49 70 # 66 Apache::DBI Apache-DBI-1.06.tar.gz 0 71 # 67 Apache2::SOAP Apache2-SOAP-0.72.tar.gz 0 72 68 Test::URI Test-URI-1.08.tar.gz 0 73 73 # 69 Sys::Statistics::Linux::DiskUsage Sys-Statistics-Linux-0.26.tar.gz 0 74 # 70 Config::YAML 75 # 72 File::ExtAttr 76 73 DBI 77 71 DBD::mysql 78 # 74 Net::Server::Daemonize 74 # 70 Config::YAML Config-YAML-1.42.tar.gz 0 75 # 72 File::ExtAttr File-ExtAttr-1.07.tar.gz 0 76 73 DBI DBI-1.601.tar.gz 0 77 71 DBD::mysql DBD-mysql-4.006.tar.gz 0 78 # 74 Net::Server::Daemonize Net-Server-0.97.tar.gz 0.05 79 79 75 File::Path File-Path-2.04.tar.gz 80 80 76 File::Mountpoint File-Mountpoint-0.01.tar.gz 0.01
Note:
See TracChangeset
for help on using the changeset viewer.
