Changeset 21932 for trunk/psconfig/psdist
- Timestamp:
- Feb 20, 2009, 10:49:49 AM (17 years ago)
- File:
-
- 1 edited
-
trunk/psconfig/psdist (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psconfig/psdist
r18806 r21932 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;
Note:
See TracChangeset
for help on using the changeset viewer.
