View | Details | Raw Unified | Return to issue 59477
Collapse All | Expand All

(-)solenv/bin/deliver.pl (-2 / +8 lines)
Lines 111-116 Link Here
111
$opt_link           = 0;            # hard link files into the solver to save disk space
111
$opt_link           = 0;            # hard link files into the solver to save disk space
112
$opt_deloutput      = 0;            # delete the output tree for the project once successfully delivered
112
$opt_deloutput      = 0;            # delete the output tree for the project once successfully delivered
113
113
114
if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
115
  $maybedot     = '';               # some .exe transformation magic.
116
} else {
117
  $maybedot     = '.';
118
}
119
114
if ( $ENV{GUI} eq 'WNT' ) {
120
if ( $ENV{GUI} eq 'WNT' ) {
115
    if ($ENV{COM} eq 'GCC') {
121
    if ($ENV{COM} eq 'GCC') {
116
        warn("Warning: do we need stripping for windows gcc? Nothing defined yet.");
122
        warn("Warning: do we need stripping for windows gcc? Nothing defined yet.");
Lines 701-707 Link Here
701
sub is_unstripped {
707
sub is_unstripped {
702
    my $file_name = shift;
708
    my $file_name = shift;
703
709
704
    if (-f $file_name && (( `file $file_name` ) =~ /not stripped/o)) {
710
    if (-f $file_name.$maybedot && (( `file $file_name` ) =~ /not stripped/o)) {
705
        return '1' if ($file_name =~ /\.bin$/o);
711
        return '1' if ($file_name =~ /\.bin$/o);
706
        return '1' if ($file_name =~ /\.so\.*/o);
712
        return '1' if ($file_name =~ /\.so\.*/o);
707
        return '1' if (basename($file_name) !~ /\./o);
713
        return '1' if (basename($file_name) !~ /\./o);
Lines 1099-1105 Link Here
1099
    return 0 if ( $opt_check );
1105
    return 0 if ( $opt_check );
1100
    return -1 if ( $#entry != 2 );
1106
    return -1 if ( $#entry != 2 );
1101
    if (( $entry[0] eq "COPY" ) || ( $entry[0] eq "HEDABU" )) {
1107
    if (( $entry[0] eq "COPY" ) || ( $entry[0] eq "HEDABU" )) {
1102
        return 0 if ( ! -e $entry[1] );
1108
        return 0 if ( ! -e $entry[1].$maybedot );
1103
        # make 'from' relative to source root
1109
        # make 'from' relative to source root
1104
        $entry[1] = $module . "/prj/" . $entry[1];
1110
        $entry[1] = $module . "/prj/" . $entry[1];
1105
        $entry[1] =~ s/^$module\/prj\/\.\./$module/;
1111
        $entry[1] =~ s/^$module\/prj\/\.\./$module/;

Return to issue 59477