pkgApp.pl   pkgApp.pl 
skipping to change at line 59 skipping to change at line 59
## a rooted Framework ## a rooted Framework
## an unrooted Framework ## an unrooted Framework
if ( $name =~ m,^([^/]+\.framework)/(\S+)$, ) { if ( $name =~ m,^([^/]+\.framework)/(\S+)$, ) {
my $fwname = $1; my $fwname = $1;
my $binary = $2; my $binary = $2;
my $absname = &locateFramework($fwname); my $absname = &locateFramework($fwname);
my $arch = &architecture("$absname/$binary"); my $arch = &architecture("$absname/$binary");
if ( $arch eq $current_arch ) { if ( $arch eq $current_arch || $arch eq 'fat' ) {
my $relPath = "\@executable_path/../Frameworks/$current_arch
/$fwname/$binary";
my $fwPath = "$frameworks_dir/$current_arch/$fwname/$binary"
;
my $not_existed = 1;
if ( ! -e $fwPath ) {
my $c = "cp -R -p $absname $frameworks_dir/$current_arch
/$fwname";
`$c`;
} else {
$not_existed = 0;
}
my $c = sprintf($id_inmt, $relPath, $fwPath);
`$c`;
$c = sprintf($ch_inmt, $name, $relPath, $main_executable);
`$c`;
if ( $not_existed ) {
&recurse($fwPath, $frameworks_dir, $current_arch);
}
} elsif ( $arch eq 'fat' ) {
my $relPath = "\@executable_path/../Frameworks/$fwname/$bina ry"; my $relPath = "\@executable_path/../Frameworks/$fwname/$bina ry";
my $fwPath = "$frameworks_dir/$fwname/$binary"; my $fwPath = "$frameworks_dir/$fwname/$binary";
my $not_existed = 1; my $not_existed = 1;
if ( ! -e $fwPath ) { if ( ! -e $fwPath ) {
my $c = "cp -R -p $absname $frameworks_dir"; my $c = "cp -R -p $absname $frameworks_dir/$fwname";
`$c`; `$c`;
} else { } else {
$not_existed = 0; $not_existed = 0;
} }
my $c = sprintf($id_inmt, $relPath, $fwPath); my $c = sprintf($id_inmt, $relPath, $fwPath);
`$c`; `$c`;
$c = sprintf($ch_inmt, $name, $relPath, $main_executable); $c = sprintf($ch_inmt, $name, $relPath, $main_executable);
`$c`; `$c`;
skipping to change at line 111 skipping to change at line 91
} }
next NAME_LOOP; next NAME_LOOP;
} }
## a rooted dylib ## a rooted dylib
if ( $name =~ m,^/.+?([^/]+\.dylib)$, ) { if ( $name =~ m,^/.+?([^/]+\.dylib)$, ) {
my $basename = $1; my $basename = $1;
my $absname = $name; my $absname = $name;
my $arch = &architecture($absname); my $arch = &architecture($absname);
if ( $arch eq $current_arch ) { if ( $arch eq $current_arch || $arch eq 'fat' ) {
my $relPath = "\@executable_path/../Frameworks/$arch/$basena my $relPath = "\@executable_path/../Frameworks/$current_arch
me"; /$basename";
my $fwPath = "$frameworks_dir/$arch/$basename"; my $fwPath = "$frameworks_dir/$current_arch/$basename";
my $not_existed = 1; my $not_existed = 1;
if ( ! -e $fwPath ) { if ( ! -e $fwPath ) {
my $c = "cp $absname $frameworks_dir/$arch"; my $c = "cp $absname $frameworks_dir/$current_arch";
`$c`; `$c`;
} else { } else {
$not_existed = 0; $not_existed = 0;
} }
my $c = sprintf($id_inmt, $relPath, $fwPath); my $c = sprintf($id_inmt, $relPath, $fwPath);
`$c`; `$c`;
$c = sprintf($ch_inmt, $absname, $relPath, $main_executable) ; $c = sprintf($ch_inmt, $absname, $relPath, $main_executable) ;
`$c`; `$c`;
skipping to change at line 150 skipping to change at line 130
if ( $name =~ m/\@executable/ ) { if ( $name =~ m/\@executable/ ) {
# we've been here already # we've been here already
next NAME_LOOP; next NAME_LOOP;
} }
my $basename = $name; my $basename = $name;
my $absname = "MacOS/" . $name; my $absname = "MacOS/" . $name;
my $arch = &architecture($absname); my $arch = &architecture($absname);
if ( $arch eq $current_arch ) { if ( $arch eq $current_arch || $arch eq 'fat') {
my $relPath = "\@executable_path/$basename"; my $relPath = "\@executable_path/$basename";
my $c = sprintf($id_inmt, $relPath, $absname); my $c = sprintf($id_inmt, $relPath, $absname);
`$c`; `$c`;
$c = sprintf($ch_inmt, $name, $relPath, $main_executable); $c = sprintf($ch_inmt, $name, $relPath, $main_executable);
`$c`; `$c`;
&recurse($absname, $frameworks_dir, $current_arch); &recurse($absname, $frameworks_dir, $current_arch);
} else { } else {
warn qq{$0: [4] for $main_executable: what to do about $name being '$arch'!!!\n}; warn qq{$0: [4] for $main_executable: what to do about $name being '$arch'!!!\n};
 End of changes. 5 change blocks. 
31 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/