Support converting PostScript to PDF files using ghostview. (Stefan Reichor)

8 files changed, 323 insertions, 3 deletions

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 09de821..a778c38 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -868,6 +868,7 @@ dvipdf
 dvips
 g++
 g77
+gs
 icc
 ifl
 ilink
@@ -2137,6 +2138,9 @@ The TeX DVI file to PDF file converter.
 .IP DVIPDFFLAGS
 General options passed to the TeX DVI file to PDF file converter.
 
+.IP DVIPDFCOM
+The command line used to convert TeX DVI files into a PDF file.
+
 .IP DVIPS
 The TeX DVI file to PostScript converter.
 
@@ -2266,6 +2270,16 @@ are included on this command line.
 A function that converts a file name into a File instance relative to the
 target being built. 
 
+.IP GS
+The Ghostscript program used to convert PostScript to PDF files.
+
+.IP GSFLAGS
+General options passed to the Ghostscript program
+when converting PostScript to PDF files.
+
+.IP GSCOM
+The Ghostscript command line used to convert PostScript to PDF files.
+
 .IP INCPREFIX
 The prefix used to specify an include directory on the C compiler command
 line.
@@ -2550,7 +2564,7 @@ env['PDB'] = 'hello.pdb'
 .EE
 
 .IP PDFCOM
-The command line used to convert TeX DVI files into a PDF file.
+A deprecated synonym for $DVIPDFCOM.
 
 .IP PDFPREFIX
 The prefix used for PDF file names.
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6bc2cc8..76ac21f 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -45,6 +45,10 @@ RELEASE 0.14 - XXX
     Node's state, allowing it to be re-evaluated by continuous
     integration build interfaces.
 
+  From Stefan Reichor:
+
+  - Add support for using Ghostscript to convert Postscript to PDF files.
+
 
 
 RELEASE 0.13 - Mon, 31 Mar 2003 20:22:00 -0600
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index 8bed06f..02646ac 100644
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -43,6 +43,7 @@ SCons/Tool/g77.py
 SCons/Tool/gas.py
 SCons/Tool/gcc.py
 SCons/Tool/gnulink.py
+SCons/Tool/gs.py
 SCons/Tool/javac.py
 SCons/Tool/jar.py
 SCons/Tool/icc.py
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 9e6d450..27ef3e1 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -201,7 +201,7 @@ def tool_list(platform, env):
             cxx_compiler = FindTool(['g++'], env)
         
     other_tools = FindAllTools(['BitKeeper', 'CVS',
-                                'dvipdf', 'dvips',
+                                'dvipdf', 'dvips', 'gs',
                                 'jar', 'javac',
                                 'latex', 'lex',
                                 'pdflatex', 'pdftex', 'Perforce',
diff --git a/src/engine/SCons/Tool/dvipdf.py b/src/engine/SCons/Tool/dvipdf.py
index 3f4198f..b4da3c7 100644
--- a/src/engine/SCons/Tool/dvipdf.py
+++ b/src/engine/SCons/Tool/dvipdf.py
@@ -46,7 +46,10 @@ def generate(env):
 
     env['DVIPDF']      = 'dvipdf'
     env['DVIPDFFLAGS'] = ''
-    env['PDFCOM']      = '$DVIPDF $DVIPDFFLAGS $SOURCES $TARGET'
+    env['DVIPDFCOM']   = '$DVIPDF $DVIPDFFLAGS $SOURCES $TARGET'
+
+    # Deprecated synonym.
+    env['PDFCOM']      = '$DVIPDFCOM'
 
 def exists(env):
     return env.Detect('dvipdf')
diff --git a/src/engine/SCons/Tool/gs.py b/src/engine/SCons/Tool/gs.py
new file mode 100644
index 0000000..5aa83d5
--- /dev/null
+++ b/src/engine/SCons/Tool/gs.py
@@ -0,0 +1,69 @@
+"""SCons.Tool.gs
+
+Tool-specific initialization for Ghostscript.
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import SCons.Defaults
+import SCons.Platform
+
+# Ghostscript goes by different names on different platforms...
+platform = SCons.Platform.platform_default()
+
+if platform == 'os2':
+    gs = 'gsos2'
+elif platform == 'cygwin' or platform == 'win32':
+    gs = 'gswin32c'
+else:
+    gs = 'gs'
+
+def generate(env):
+    """Add Builders and construction variables for Ghostscript to an
+    Environment."""
+    try:
+        bld = env['BUILDERS']['PDF']
+    except KeyError:
+        bld = SCons.Defaults.PDF()
+        env['BUILDERS']['PDF'] = bld
+
+    bld.add_action('.ps', '$GSCOM')
+
+    env['GS']      = gs
+    env['GSFLAGS'] = '-dNOPAUSE -dBATCH -sDEVICE=pdfwrite'
+    env['GSCOM']   = '$GS $GSFLAGS -sOutputFile=$TARGET $SOURCES'
+
+
+def exists(env):
+    if env.has_key('PS2PDF'):
+        return env.Detect(env['PS2PDF'])
+    else:
+        return env.Detect(gs) or SCons.Util.WhereIs(gs)
diff --git a/test/GS.py b/test/GS.py
new file mode 100644
index 0000000..a836cf6
--- /dev/null
+++ b/test/GS.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import os.path
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mygs.py', r"""
+import os
+import sys
+outfile = open(sys.argv[1], 'wb')
+infile = open(sys.argv[2], 'rb')
+for l in infile.readlines():
+    if l[:3] != '#ps':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(GS = r'%s mygs.py',
+                  GSCOM = r'$GS $TARGET $SOURCE',
+                  tools=['gs'])
+env.PDF(target = 'test1.pdf', source = 'test1.ps')
+""" % (python))
+
+test.write('test1.ps', r"""This is a .ps test.
+#ps
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1.pdf') != "This is a .ps test.\n")
+
+
+
+if sys.platform == 'win32':
+    gs_executable = 'gswin32c'
+elif sys.platform == 'os2':
+    gs_executable = 'gsos2'
+else:
+    gs_executable = 'gs'
+gs = test.where_is(gs_executable)
+
+if gs:
+
+    test.write("wrapper.py", """\
+import os
+import string
+import sys
+cmd = string.join(sys.argv[1:], " ")
+open('%s', 'ab').write("%%s\\n" %% cmd)
+os.system(cmd)
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """\
+import os
+foo = Environment(ENV = { 'PATH' : os.environ['PATH'] })
+gs = foo.Dictionary('GS')
+bar = Environment(ENV = { 'PATH' : os.environ['PATH'] },
+                  GS = r'%s wrapper.py ' + gs)
+foo.PDF(target = 'foo.pdf', source = 'foo.ps')
+bar.PDF(target = 'bar.pdf', source = 'bar.ps')
+""" % python)
+
+    input = """\
+%!PS-Adobe
+100 100 moveto /Times-Roman findfont 24 scalefont (Hello, world!) show showpage
+"""
+
+    test.write('foo.ps', input)
+
+    test.write('bar.ps', input)
+
+    test.run(arguments = 'foo.pdf', stderr = None)
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.fail_test(not os.path.exists(test.workpath('foo.pdf')))
+
+    test.run(arguments = 'bar.pdf', stderr = None)
+
+    test.fail_test(test.read('wrapper.out') != "%s -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=bar.pdf bar.ps\n" % gs_executable)
+
+    test.fail_test(not os.path.exists(test.workpath('bar.pdf')))
+
+test.pass_test()
diff --git a/test/GSFLAGS.py b/test/GSFLAGS.py
new file mode 100644
index 0000000..a28d374
--- /dev/null
+++ b/test/GSFLAGS.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import os.path
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mygs.py', r"""
+import getopt
+import os
+import sys
+cmd_opts, args = getopt.getopt(sys.argv[1:], 's:x', [])
+opt_string = ''
+for opt, arg in cmd_opts:
+    if opt == '-s':
+        if arg[:11] == 'OutputFile=':
+            out_file = open(arg[11:], 'wb')
+    else:
+        opt_string = opt_string + ' ' + opt
+infile = open(args[0], 'rb')
+out_file.write(opt_string + "\n")
+for l in infile.readlines():
+    if l[:3] != '#ps':
+        out_file.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(GS = r'%s mygs.py', GSFLAGS = '-x',
+                  tools = ['gs'])
+env.PDF(target = 'test1.pdf', source = 'test1.ps')
+""" % (python))
+
+test.write('test1.ps', """\
+This is a .ps test.
+#ps
+""")
+
+test.run(arguments = '.', stderr = None)
+
+print test.read('test1.pdf')
+test.fail_test(test.read('test1.pdf') != " -x\nThis is a .ps test.\n")
+
+
+
+if sys.platform == 'win32':
+    gs_executable = 'gswin32c'
+elif sys.platform == 'os2':
+    gs_executable = 'gsos2'
+else:
+    gs_executable = 'gs'
+gs = test.where_is(gs_executable)
+
+if gs:
+
+    test.write("wrapper.py", """import os
+import string
+import sys
+cmd = string.join(sys.argv[1:], " ")
+open('%s', 'ab').write("%%s\\n" %% cmd)
+os.system(cmd)
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """\
+foo = Environment()
+foo.Append(GSFLAGS = ' -q')
+foo.PDF(target = 'foo.pdf', source = 'foo.ps')
+""")
+
+    input = """\
+%!PS-Adobe
+100 100 moveto /Times-Roman findfont 24 scalefont (Hello, world!) show showpage
+"""
+
+    test.write('foo.ps', input)
+
+    test.run(arguments = 'foo.pdf', stderr = None)
+
+    test.fail_test(not os.path.exists(test.workpath('foo.pdf')))
+
+test.pass_test()