pmx (9oct12)

git-svn-id: svn://tug.org/texlive/trunk@28297 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 34 insertions, 18 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 240bb9d4f88..44fbe0345f2 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1065,7 +1065,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'mp3d'			=> '&PREHOOK_mp3d',
  'pgf-blur'             => '&PREHOOK_pgfblur',
  'pictex'		=> '&PREHOOK_pictex',
- 'pmx'			=> '&PREHOOK_flatten1',
+ 'pmx'			=> '&PREHOOK_pmx',
  'skb'			=> '&PREHOOK_flatten1',
  'suftesi'		=> '&PREHOOK_suftesi',
  'tui'			=> '&PREHOOK_tui',
@@ -1109,6 +1109,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'niceframe'		=> '&POST_rmsymlink',
  'pedigree-perl'	=> '&POSTpedigreeperl',
  'pgf'			=> '&POSTpgf',
+ 'pmx'			=> '&POSTpmx',
  'prerex'		=> '&POSTprerex',
  'pst-cox'		=> '&POSTpstcox',
  'pst-geo'		=> '&POSTpstgeo',
@@ -2272,7 +2273,7 @@ $standardxmt='\.xmt';
  'perltex'		=> '\.pl$',
  'pkfix'		=> '\.pl$',
  'pkfix-helper'		=> 'pkfix-helper$',
-# 'pmx'			=> '\.lua$', # also has real binaries, so cannot do
+ 'pmx'			=> '\.lua$',
  'pst2pdf'		=> 'pst2pdf$',
  'purifyeps'		=> 'purifyeps$',
  'sty2dtx'		=> '\.pl$',
@@ -2526,7 +2527,6 @@ sub xmkdir {
   &SYSTEM ("mkdir -p @dirs");
 }
 
-
 # run a shell command.
 # 
 sub SYSTEM {
@@ -2539,6 +2539,13 @@ sub SYSTEM {
  }
 }
 
+# Return .exe or empty string, as required by PLATFORM.
+# 
+sub exeext {
+  my ($platform) = @_;
+  my $ext = $platform =~ /^(win32|i386-cygwin)$/ ? ".exe" : "";
+  return $ext;
+}
 
 # copy man pages from runtime to new stage directory,
 # so they won't appear to be deleted.
@@ -2966,6 +2973,7 @@ sub doscripts {
     for my $p (@platforms) {
       my $platdir = "$TOPDEST/bin/$p";
       &xmkdir ($platdir);
+      #
       if ($p ne "win32") {
         my $linktarget = "../../$DEST_TREE/scripts/$package/$s";
         &SYSTEM ("ln -s $linktarget $platdir/$linkname");
@@ -2974,7 +2982,7 @@ sub doscripts {
         &SYSTEM ("ln -s $linkname $platdir/r$linkname")
           if $linkname =~ /pdfcrop|epstopdf/; # rpdfcrop -> pdfcrop
         &SYSTEM ("ln -s $linkname $platdir/lua2dox_filter")
-          if $linkname =~ /lua2dox_lua/;
+          if $linkname =~ /lua2dox_lua/;      # lua2dox_filter -> lua2dox_lua
       } else {
         # Windows.  If a shell script, skip.  Else copy the wrapper.
         next if $s =~ /\.sh$|lua2dox/ && $s !~ /-sys\.sh$/;
@@ -4644,25 +4652,18 @@ sub PREHOOK_pgfblur {
   &SYSTEM ("pdflatex pgf-blur.dtx");
 }
 
-sub PREHOOK_pmx {  # only difference is location of .1's
-  print "YOU-MUST-DO! update Build/source/utils/$package\n";
-  print "PREHOOK_$package - unzip, mans\n";
-  # must unzip first so we can find the scripts.
-  &PREHOOK_unzip ();
-  #
-  &SYSTEM ("$RM -rf $package*.tar.gz Windows"); # leave OSX binaries
-  #
-  my $mandest = "$TOPDEST/texmf/doc/man/man1/";
-  &xmkdir ($mandest);
-  &SYSTEM ("$CP $DEST/doc/generic/$package/*.1 $mandest/");
-  &tl_man_to_pdf ();
-}
-
 sub PREHOOK_pictex {
   print "PREHOOK_$package - rm autoarea\n";
   &SYSTEM ("$RM -rf addon/autoarea*");
 }
 
+sub PREHOOK_pmx {
+  print "PREHOOK_$package - sources\n";
+  print "YOU-MUST-DO! update Build/source/utils/$package\n";
+  &SYSTEM ("$RM -rf OSX Windows pmx-*.tar.gz");  
+  &PREHOOK_flatten1 ();
+}
+
 sub PREHOOK_suftesi {
   print "PREHOOK_$package - move doc/latex subdirs\n";
   # not example/, then get logo.png clash
@@ -5037,6 +5038,21 @@ sub POSTpgf {
   &SYSTEM ("$RM $DEST/README");
 }
 
+sub POSTpmx {
+  print "POST$package - preserve binaries\n";
+  # the pmx package includes binaries made from Build, and normal
+  # scripts and support files.  The latter can get updated without
+  # needing to update the former, so we support it.  Which means
+  # preserving the binaries from the Build.
+  chomp (my @platforms = `cd $Master/bin && ls`);
+  for my $p (@platforms) {
+    my $platdir = "$TOPDEST/bin/$p";
+    my $exeext = &exeext ($p);
+    &SYSTEM ("$CP $Master/bin/$p/scor2prt$exeext $platdir/");
+    &SYSTEM ("$CP $Master/bin/$p/pmxab$exeext $platdir/");
+  }
+}
+
 sub POSTprerex {
   print "POST$package - rm dup prerex subdir\n";
   &SYSTEM ("$RM -rf prerex");