[SCM] Debian packaging for sketch 3D line drawing software branch, debian/Doc-make-pl, updated. upstream/0.2.89-11-g5184983

David Bremner bremner at unb.ca
Sun Jan 10 01:34:21 UTC 2010


The following commit has been merged in the debian/Doc-make-pl branch:
commit d1f41326db85447655ae5daeee120fb3fc8f2dfc
Author: David Bremner <bremner at unb.ca>
Date:   Tue Jan 5 08:06:51 2010 -0400

    Add a linux option to select correct executables, and deal with carriage returns in the info file.

diff --git a/Doc/make.pl b/Doc/make.pl
index b20aa9e..b786e79 100644
--- a/Doc/make.pl
+++ b/Doc/make.pl
@@ -4,7 +4,6 @@
 use strict;
 use File::Copy;
 
-our $GS = "gswin32.exe";
 our $MEM_OPTION = "--extra-mem-top=5000000"; # MikTeX 2.7
 # our $MEM_OPTION = ""; # MikTeX 2.6
 
@@ -13,8 +12,9 @@ sub make_example {
   die "missing example name" unless $ex;
   my %arg = map { $_ => 1 } @_;
   
+  my $GS=$arg{linux} ? "gs" :"gs.exe";
   unless ($arg{nosketch}) {
-    my $cmd = "../sketch -D $ex manexamples.sk > $ex.tex";
+    my $cmd = "../sketch -V 1.15 -D $ex manexamples.sk > $ex.tex";
     print STDERR "$cmd\n";
     system($cmd) == 0 or die "$!";
   }
@@ -48,6 +48,16 @@ sub make_all {
     }
     close(F);
   }
+  if ($arg{linux}){
+    rename("sketch.texi","sketch.texi.dist") || die "$!";
+    open (IN,"<sketch.texi.dist") || die "$!";
+    open (OUT,">sketch.texi") || die "$!";
+    while(<IN>){
+      tr/\r//d;
+      print OUT;
+    }
+  }
+
   unless ($arg{notypeset}) {
     print "info:\n";
     system("makeinfo sketch.texi") == 0 or die "$!";
@@ -82,6 +92,11 @@ sub make_all {
       copy("sketch/$_", $_);
     }
   }
+  if ($arg{linux}){
+    unlink "sketch.texi" || die "$!";
+    rename "sketch.texi.dist","sketch.texi" || die "$!";
+  }
+
 }
 
 if (grep { /help/ } @ARGV) {

-- 
Debian packaging for sketch 3D line drawing software



More information about the debian-science-commits mailing list