diff options
author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
---|---|---|
committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
commit | 3bedf8846f4d7a5cb38276b274662d62a36dcd52 (patch) | |
tree | 9d51de8b0f3d06ba6549a5a1958e52f592343140 /infrastructure/makeparcels.pl | |
parent | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (diff) |
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Diffstat (limited to 'infrastructure/makeparcels.pl')
-rwxr-xr-x | infrastructure/makeparcels.pl | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/infrastructure/makeparcels.pl b/infrastructure/makeparcels.pl index 1c0b0ead..55e64976 100755 --- a/infrastructure/makeparcels.pl +++ b/infrastructure/makeparcels.pl @@ -26,7 +26,7 @@ open PARCELS,"parcels.txt" or die "Can't open parcels file"; next if m/\AEND-OMIT/; if(m/\AOMIT:(.+)/) { - if($1 eq $build_os) + if($1 eq $build_os or $1 eq $target_os) { while(<PARCELS>) { @@ -35,6 +35,21 @@ open PARCELS,"parcels.txt" or die "Can't open parcels file"; } next; } + + if (m'\AONLY:(.+)') + { + my @only_targets = split m'\,', $1; + + if (not grep {$_ eq $build_os or $_ eq $target_os} + @only_targets) + { + while (<PARCELS>) + { + last if m'\AEND-ONLY'; + } + next; + } + } # new parcel, or a new parcel definition? if(m/\A\s+(.+)\Z/) @@ -100,7 +115,7 @@ for my $parcel (@parcels) if($type eq 'bin') { - my $exeext = ($build_os eq 'CYGWIN')?'.exe':''; + my $exeext = $platform_exe_ext; print MAKE "\t(cd bin/$name; \$(MAKE) $release_flag)\n"; print MAKE "\tcp release/bin/$name/$name$exeext $dir\n"; } |