X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2Fupdate-info-plist.pl;h=172996bd96d855f533a8000c3e251b174c863076;hb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;hp=c5233ae7a370afe3e3cee024a6b636f5f15a6c47;hpb=2762a7d7cf8d83e68b8f635941f6609119d630ae;p=xscreensaver

diff --git a/OSX/update-info-plist.pl b/OSX/update-info-plist.pl
index c5233ae7..172996bd 100755
--- a/OSX/update-info-plist.pl
+++ b/OSX/update-info-plist.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2006-2013 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2006-2014 Jamie Zawinski <jwz@jwz.org>
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -27,7 +27,7 @@ use IO::Compress::Gzip qw(gzip $GzipError);
 
 my ($exec_dir, $progname) = ($0 =~ m@^(.*?)/([^/]+)$@);
 
-my $version = q{ $Revision: 1.26 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my ($version) = ('$Revision: 1.38 $' =~ m/\s(\d[.\d]+)\s/s);
 
 $ENV{PATH} = "/usr/local/bin:$ENV{PATH}";   # for seticon
 
@@ -43,13 +43,24 @@ sub convert_plist($$) {
   if ($data && (!$is_binary_p) != (!$to_binary_p)) {
     print STDERR "$progname: converting plist\n" if ($verbose > 2);
     my $which = ($to_binary_p ? 'binary1' : 'xml1');
-    my $cmd = "plutil -convert $which -s -o - -";
-    my $pid = open3 (my $in, my $out, undef, $cmd) || error ("pipe: $cmd: $!");
+    my @cmd = ('plutil', '-convert', $which, '-s', '-o', '-', '-');
+    my $pid = open3 (my $in, my $out, undef, @cmd) ||
+      error ("pipe: $cmd[0]: $!");
+    error ("$cmd[0]: $!") unless $pid;
     print $in $data;
     close $in;
     local $/ = undef;  # read entire file
     $data = <$out>;
     close $out;
+    waitpid ($pid, 0);
+    if ($?) {
+      my $exit_value  = $? >> 8;
+      my $signal_num  = $? & 127;
+      my $dumped_core = $? & 128;
+      error ("$cmd[0]: core dumped!") if ($dumped_core);
+      error ("$cmd[0]: signal $signal_num!") if ($signal_num);
+      error ("$cmd[0]: exited with $exit_value!") if ($exit_value);
+    }
   }
   return $data;
 }
@@ -85,6 +96,7 @@ sub read_saver_xml($) {
 
   return () if ($name eq 'XScreenSaver');
   return () if ($name eq 'SaverTester');
+  return () if ($name eq 'XScreenSaverUpdater');
 
   my $file  = "$app_dir/Contents/Resources/" . lc($name) . ".xml";
   my $file2 = "$app_dir/" . lc($name) . ".xml";
@@ -137,8 +149,13 @@ sub update_saver_xml($$) {
        s/\nCopyright [^ \r\n\t]+ (\d{4})(-\d{4})? (.*)\.$/\nWritten $3; $1./s;
   $desc =~ s/^\n+//s;
 
-  error ("$filename: description contains bad characters")
-    if ($desc =~ m/([^\t\n -~]|[<>])/);
+  error ("$filename: description contains markup: $1")
+    if ($desc =~ m/([<>&][^<>&\s]*)/s);
+  error ("$filename: description contains ctl chars: $1")
+    if ($desc =~ m/([\000-\010\013-\037])/s);
+  error ("$filename: description contains non-ASCII and is not UTF-8: $1")
+    if ($body !~ m/\Q<?xml version="1.0" encoding="UTF-8"/s &&
+        $desc =~ m/([^\000-\176])/s);
 
   error ("$filename: can't extract authors")
     unless ($desc =~ m@^(.*)\nWritten by[ \t]+(.+)$@s);
@@ -178,7 +195,7 @@ sub update_saver_xml($$) {
                "\n" . 
                "From the XScreenSaver collection: " .
                "http://www.jwz.org/xscreensaver/\n" .
-               "Copyright \251 $year by $authors.\n");
+               "Copyright \302\251 $year by $authors.\n");
 
   my $desc2 = ("$name $vers,\n" .			# Info.plist
                "\302\251 $year $authors.\n" .
@@ -197,6 +214,10 @@ sub update_saver_xml($$) {
 
   $body =~ s@(<_description>)(.*?)(</_description>)@$1$desc1$3@s;
 
+  # NSXMLParser doesn't seem to work properly on Latin1 XML documents,
+  # so we convert these to UTF8 when embedding them in the .saver bundle.
+  $body =~ s@encoding="ISO-8859-1"@encoding="UTF-8"@gsi;
+
   if ($obody eq $body && $was_compressed_p) {
     print STDERR "$progname: $filename: unchanged\n" if ($verbose > 1);
   } else {
@@ -309,6 +330,53 @@ sub set_thumb($) {
 }
 
 
+sub enable_gc($) {
+  my ($app_dir) = @_;
+
+  return unless ($app_dir =~ m@\.saver/?$@s);
+  my ($dir, $name) = ($app_dir =~ m@^(.*)/([^/]+)\.saver$@s);
+  error ("unparsable: $app_dir") unless $name;
+  my $exe = "$app_dir/Contents/MacOS/$name";
+  my @cmd = ("$dir/enable_gc", $exe);
+  print STDERR "$progname: exec: " . join(' ', @cmd) . "\n"
+    if ($verbose > 1);
+  system (@cmd);
+  my $exit  = $? >> 8;
+  exit ($exit) if $exit;
+}
+
+
+sub fix_coretext($) {
+  my ($app_dir) = @_;
+
+  # In MacOS 10.8, they moved CoreText.framework from
+  # /System/Library/Frameworks/ApplicationServices.framework/Frameworks/
+  # to /System/Library/Frameworks/ which means that executables compiled
+  # on 10.8 and newer won't run on 10.7 and older because they can't find
+  # the library. Fortunately, 10.8 and later leave a symlink behind, so
+  # the old location still works. So we need our executables to contain
+  # an LC_LOAD_DYLIB pointing at the old directory instead of the new
+  # one.
+  # 
+  return if ($app_dir =~ m@-iphone@s);
+  my ($dir, $name) = ($app_dir =~ m@^(.*)/([^/]+)\.(app|saver)$@s);
+  error ("unparsable: $app_dir") unless $name;
+  my $exe = "$app_dir/Contents/MacOS/$name";
+
+  my $new = ("/System/Library/Frameworks/CoreText.framework/" .
+             "Versions/A/CoreText");
+  my $old = ("/System/Library/Frameworks/ApplicationServices.framework/" .
+             "Frameworks/CoreText.framework/Versions/A/CoreText");
+  my @cmd = ("install_name_tool", "-change", $new, $old, $exe);
+
+  print STDERR "$progname: exec: " . join(' ', @cmd) . "\n"
+    if ($verbose > 1);
+  system (@cmd);
+  my $exit  = $? >> 8;
+  exit ($exit) if $exit;
+}
+
+
 sub update($) {
   my ($app_dir) = @_;
 
@@ -370,6 +438,8 @@ sub update($) {
 
   set_icon ($app_dir);
   set_thumb ($app_dir);
+# enable_gc ($app_dir);
+  fix_coretext ($app_dir)
 }