← Back to branch summary

~georg-zotti/stellarium/refraction

« back to all changes in this revision

Viewing changes to util/pkgApp.pl

  • Committer: Georg Zotti
  • Date: 2011-02-18 12:37:55 UTC
  • mfrom: (4821.1.54 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20110218123755-9wcuyyah7g0m1qs7
Merge-update from Trunk R4875

Show diffs side-by-side

added added

removed removed

Lines of Context:
util/pkgApp.pl
43
43
 
44
44
        ## leave sys libraries alone and dont include them
45
45
        if ( $name =~ m,^(/System/Library|/usr/lib|\@executable_name), &&
46
 
             $name !~ m,^(/usr/lib/libiconv), ){ 
 
46
             $name !~ m,^(/usr/lib/libiconv), && $name !~ m,^(/usr/lib/libintl),){ 
47
47
            next NAME_LOOP; 
48
48
        }
49
49
 
50
50
        ## a rooted Framework
 
51
        if ( $name =~ m,([^/]+\.framework)/(\S+)$, ) {
 
52
            my $fwname = $1;
 
53
            my $binary = $2;
 
54
 
 
55
            my $absname = &locateFramework($fwname);
 
56
            my $arch = &architecture("$absname/$binary");
 
57
 
 
58
            if ( $arch eq $current_arch || $arch eq 'fat' ) {
 
59
                my $relPath = "\@executable_path/../Frameworks/$fwname/$binary";
 
60
                my $fwPath = "$frameworks_dir/$fwname/$binary";
 
61
 
 
62
                my $not_existed = 1;
 
63
                if ( ! -e $fwPath ) {
 
64
                    my $c = "cp -RP -p $absname $frameworks_dir/$fwname";
 
65
                    `$c`;
 
66
                } else {
 
67
                    $not_existed = 0;
 
68
                }
 
69
 
 
70
                my $c = sprintf($id_inmt, $relPath, $fwPath);
 
71
                `$c`;
 
72
                $c = sprintf($ch_inmt, $name, $relPath, $main_executable);
 
73
                `$c`;
 
74
 
 
75
                if ( $not_existed ) {
 
76
                    &recurse($fwPath, $frameworks_dir, $current_arch);
 
77
                }
 
78
            } else {
 
79
                warn qq{$0: [1] for $main_executable: what to do about $absname being $arch!!!!!\n};
 
80
            }
 
81
            next NAME_LOOP;
 
82
        }
51
83
 
52
84
        ## an unrooted Framework
53
85
        if ( $name =~ m,^([^/]+\.framework)/(\S+)$, ) {
189
221
sub locateFramework {
190
222
    my $fname = shift;
191
223
    my $lib;
192
 
    foreach $lib ( '~/Library/Frameworks', '/Library/Frameworks', '/usr/local/Trolltech/Qt-4.5.0/lib' ) {
 
224
    foreach $lib ( '~/Library/Frameworks', '/Library/Frameworks', '/usr/local/Trolltech/Qt-4.7.1/lib' ) {
193
225
        if ( -e "$lib/$fname" ) {
194
226
            return "$lib/$fname";
195
227
        }