pkgApp.pl   pkgApp.pl 
skipping to change at line 66 skipping to change at line 66
my $arch = &architecture("$absname/$binary"); my $arch = &architecture("$absname/$binary");
if ( $arch eq $current_arch || $arch eq 'fat' ) { if ( $arch eq $current_arch || $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 -RP -p $absname $frameworks_dir/$fwname"; my $c = "cp -RP -p $absname $frameworks_dir/$fwname";
`$c`; `$c`;
system('chmod', '-R', '755', "$frameworks_dir/$fwname");
} else { } else {
$not_existed = 0; $not_existed = 0;
} }
my $c = sprintf($id_inmt, $relPath, $fwPath); my $c = sprintf($id_inmt, $relPath, $fwPath);
print "$c\n";
`$c`; `$c`;
$c = sprintf($ch_inmt, $name, $relPath, $main_executable); $c = sprintf($ch_inmt, $name, $relPath, $main_executable);
print "$c\n";
`$c`; `$c`;
if ( $not_existed ) { if ( $not_existed ) {
&recurse($fwPath, $frameworks_dir, $current_arch); &recurse($fwPath, $frameworks_dir, $current_arch);
} }
} else { } else {
warn qq{$0: [1] for $main_executable: what to do about $absn ame being $arch!!!!!\n}; warn qq{$0: [1] for $main_executable: what to do about $absn ame being $arch!!!!!\n};
} }
next NAME_LOOP; next NAME_LOOP;
} }
skipping to change at line 100 skipping to change at line 103
my $arch = &architecture("$absname/$binary"); my $arch = &architecture("$absname/$binary");
if ( $arch eq $current_arch || $arch eq 'fat' ) { if ( $arch eq $current_arch || $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 -RP -p $absname $frameworks_dir/$fwname"; my $c = "cp -RP -p $absname $frameworks_dir/$fwname";
`$c`; `$c`;
system('chmod', '-R', '755', "$frameworks_dir/$fwname");
} else { } else {
$not_existed = 0; $not_existed = 0;
} }
my $c = sprintf($id_inmt, $relPath, $fwPath); my $c = sprintf($id_inmt, $relPath, $fwPath);
print "$c\n";
`$c`; `$c`;
$c = sprintf($ch_inmt, $name, $relPath, $main_executable); $c = sprintf($ch_inmt, $name, $relPath, $main_executable);
print "$c\n";
`$c`; `$c`;
if ( $not_existed ) { if ( $not_existed ) {
&recurse($fwPath, $frameworks_dir, $current_arch); &recurse($fwPath, $frameworks_dir, $current_arch);
} }
} else { } else {
warn qq{$0: [1] for $main_executable: what to do about $absn ame being $arch!!!!!\n}; warn qq{$0: [1] for $main_executable: what to do about $absn ame being $arch!!!!!\n};
} }
next NAME_LOOP; next NAME_LOOP;
} }
skipping to change at line 133 skipping to change at line 139
my $arch = &architecture($absname); my $arch = &architecture($absname);
if ( $arch eq $current_arch || $arch eq 'fat' ) { if ( $arch eq $current_arch || $arch eq 'fat' ) {
my $relPath = "\@executable_path/../Frameworks/$current_arch /$basename"; my $relPath = "\@executable_path/../Frameworks/$current_arch /$basename";
my $fwPath = "$frameworks_dir/$current_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 -P $absname $frameworks_dir/$current_arch"; my $c = "cp -P $absname $frameworks_dir/$current_arch";
`$c`; `$c`;
system('chmod', '-R', '755', "$frameworks_dir/$current_a rch");
} else { } else {
$not_existed = 0; $not_existed = 0;
} }
my $c = sprintf($id_inmt, $relPath, $fwPath); my $c = sprintf($id_inmt, $relPath, $fwPath);
print "$c\n";
`$c`; `$c`;
$c = sprintf($ch_inmt, $absname, $relPath, $main_executable) ; $c = sprintf($ch_inmt, $absname, $relPath, $main_executable) ;
print "$c\n";
`$c`; `$c`;
if ( $not_existed ) { if ( $not_existed ) {
&recurse($fwPath, $frameworks_dir, $current_arch); &recurse($fwPath, $frameworks_dir, $current_arch);
} }
} else { } else {
warn qq{$0: [2] for $main_executable: what to do about $name being $arch!!!\n}; warn qq{$0: [2] for $main_executable: what to do about $name being $arch!!!\n};
} }
next NAME_LOOP; next NAME_LOOP;
} }
skipping to change at line 169 skipping to change at line 178
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 || $arch eq 'fat') { 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);
print "$c\n";
`$c`; `$c`;
$c = sprintf($ch_inmt, $name, $relPath, $main_executable); $c = sprintf($ch_inmt, $name, $relPath, $main_executable);
print "$c\n";
`$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};
} }
next NAME_LOOP; next NAME_LOOP;
} }
## something else? ## something else?
skipping to change at line 225 skipping to change at line 236
elsif ( grep(m/x86_64/, @output) ) { elsif ( grep(m/x86_64/, @output) ) {
$retval = 'x86_64'; $retval = 'x86_64';
} }
# warn qq{$0: $file isa '$retval' arch\n}; # warn qq{$0: $file isa '$retval' arch\n};
return $retval; return $retval;
} }
sub locateFramework { sub locateFramework {
my $fname = shift; my $fname = shift;
my $lib; my $lib;
foreach $lib ( '~/Library/Frameworks', '/Library/Frameworks', '/usr/loc al/Trolltech/Qt-4.7.1/lib' ) { foreach $lib ( '/opt/local/Library/Frameworks', '~/Library/Frameworks', '/Library/Frameworks', '/usr/local/Trolltech/Qt-4.7.1/lib' ) {
if ( -e "$lib/$fname" ) { if ( -e "$lib/$fname" ) {
return "$lib/$fname"; return "$lib/$fname";
} }
} }
warn qq{$0: couldnt find $fname!!!!\n}; warn qq{$0: couldnt find $fname!!!!\n};
return undef; return undef;
} }
 End of changes. 12 change blocks. 
1 lines changed or deleted 12 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/