strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS macosxmapfiles (1.108.70); FILE MERGED

Browse source 
2007/01/25 21:14:30 tra 1.108.70.6: #i69351# use strip -x on Mac OS X PPC too
2007/01/24 08:27:33 tra 1.108.70.5: #69351#Improve detection of executables and dylibs on Mac OS X
2007/01/21 13:55:46 tra 1.108.70.4: RESYNC: (1.110-1.111); FILE MERGED
2007/01/12 16:07:21 tra 1.108.70.3: #i69351# revert erroneously out commenting of line conaining  = 'strip'
2007/01/11 08:57:36 tra 1.108.70.2: RESYNC: (1.108-1.110); FILE MERGED
2007/01/11 08:36:10 tra 1.108.70.1: #69351#
This commit is contained in:
Rüdiger Timm 2007-01-31 07:41:55 +00:00
parent de7dcbce65
commit 81fc5ea28a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
solenv/bin/deliver.pl
View file

@ -7,9 +7,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
# $RCSfile: deliver.pl,v $
#
# $Revision: 1.112 $
# $Revision: 1.113 $
#
# last change: $Author: obo $ $Date: 2007-01-25 12:48:29 $
# last change: $Author: rt $ $Date: 2007-01-31 08:41:55 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -51,7 +51,7 @@ use File::Spec;
( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
$id_str = ' $Revision: 1.112 $ ';
$id_str = ' $Revision: 1.113 $ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
@ -147,6 +147,7 @@ if ( ! $opt_delete ) {
} else {
if ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq "")) {
$strip = 'strip';
$strip .= " -x" if ($ENV{OS} eq 'MACOSX');
$strip .= " -R '.comment' -s" if ($ENV{OS} eq 'LINUX');
}
}
@ -732,7 +733,7 @@ sub is_unstripped {
if (-f $file_name.$maybedot) {
my $file_type = `file $file_name`;
# OS X file command doesn't know if a file is stripped or not
if (($file_type =~ /not stripped/o) || ($file_type =~ /Mach-O executable/o)) {
if (($file_type =~ /not stripped/o) || ($file_type =~ /Mach-O/o)) {
return '1' if ($file_name =~ /\.bin$/o);
return '1' if ($file_name =~ /\.so\.*/o);
return '1' if ($file_name =~ /\.dylib\.*/o);