Fix bug 1944 - handle non-existant .i files when swig emitter is called. Make an...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4388 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index c5804cfc572f6f42c16be2f9ca9cfbafabce7561..5e8df41c752b5900732112f17f98f924566981e5 100644 (file)
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -67,11 +67,12 @@ TESTING_PACKAGES = [
     'gcc',
     'gcj',
     'ghostscript',
-    'libgcj7-dev',
+#    'libgcj7-dev',
     'm4',
     'openssh-client',
     'openssh-server',
     'python-profiler',
+    'python-all-dev',
     'rcs',
     'rpm',
     'sun-java5-jdk',

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6c16a4a102beffee8fc9faf68aa5a40e655171dd..5db7a66d1fb757afb7491bff9e243dcc154f00bf 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -28,6 +28,10 @@ RELEASE X.X.X - XXX
     - Add check for python >= 3.0.0 and exit gracefully.
       For 1.3 python >= 1.5.2 and < 3.0.0 are supported
 
+    - Fix bug 1944 - Handle non-existent .i file in swig emitter, previously
+      it would crash with an IOError exception. Now it will try to make an
+      educated guess on the module name based on the filename.
+
   From Lukas Erlinghagen:
 
     - Have AddOption() remove variables from the list of

diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py
index 92c93de2e2ca50f6c5c4dd681aac658764f14e9d..d8d032ccdf1a1675d4c75ade9cd011c8f3574729 100644 (file)
--- a/src/engine/SCons/Tool/swig.py
+++ b/src/engine/SCons/Tool/swig.py
@@ -63,7 +63,13 @@ def _find_modules(src):
        case.)"""
     directors = 0
     mnames = []
-    matches = _reModule.findall(open(src).read())
+    try:
+        matches = _reModule.findall(open(src).read())
+    except IOError:
+        # If the file's not yet generated, guess the module name from the filename
+        matches = []
+        mnames += [os.path.splitext(src)[0]]
+
     for m in matches:
         mnames.append(m[2])
         directors = directors or string.find(m[0], 'directors') >= 0
@@ -96,12 +102,12 @@ def _swigEmitter(target, source, env):
             # .py files should be generated in SWIGOUTDIR if specified,
             # otherwise in the same directory as the target
             if outdir:
-                 python_files = map(lambda j, o=outdir, e=env:
-                                       e.fs.File(os.path.join(o, j)),
-                                    python_files)
+                python_files = map(lambda j, o=outdir, e=env:
+                                   e.fs.File(os.path.join(o, j)),
+                                   python_files)
             else:
                 python_files = map(lambda m, d=target[0].dir:
-                                       d.File(m), python_files)
+                                   d.File(m), python_files)
             target.extend(python_files)
         if "-java" in flags:
             if mnames is None:

diff --git a/test/SWIG/generated_swigfile.py b/test/SWIG/generated_swigfile.py
new file mode 100644 (file)
index 0000000..844f786
--- /dev/null
+++ b/test/SWIG/generated_swigfile.py
@@ -0,0 +1,102 @@
+#!/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__"
+
+"""
+Verify that SCons realizes the -noproxy option means no .py file will
+be created.
+"""
+
+import os
+import sys
+
+import TestSCons
+
+# swig-python expects specific filenames.
+# the platform specific suffix won't necessarily work.
+if sys.platform == 'win32':
+    _dll = '.dll'
+else:
+    _dll   = '.so' 
+
+# swig-python expects specific filenames.
+# the platform specific suffix won't necessarily work.
+if sys.platform == 'win32':
+    _dll = '.dll'
+else:
+    _dll   = '.so' 
+
+test = TestSCons.TestSCons()
+test.verbose_set(1)
+
+swig = test.where_is('swig')
+if not swig:
+    test.skip_test('Can not find installed "swig", skipping test.\n')
+
+python, python_include, python_libpath, python_lib = \
+             test.get_platform_python_info()
+Python_h = os.path.join(python_include, 'Python.h')
+if not os.path.exists(Python_h):
+    test.skip_test('Can not find %s, skipping test.\n' % Python_h)
+
+# handle testing on other platforms:
+ldmodule_prefix = '_'
+
+
+test.write('SConstruct', """
+foo = Environment(CPPPATH=[r'%(python_include)s'],
+                  SWIG=[r'%(swig)s'],
+                  LIBPATH=[r'%(python_libpath)s'],
+                  )
+python_interface = foo.Command( 'test_py_swig.i', Value(1), "echo '%%module test_py_swig'  > test_py_swig.i" )
+python_c_file    = foo.CFile( target='python_swig_test',source=python_interface, SWIGFLAGS = '-python -c++' )
+java_interface  = foo.Command( 'test_java_swig.i', Value(1),"echo '%%module test_java_swig' > test_java_swig.i" )
+java_c_file     = foo.CFile( target='java_swig_test'  ,source=java_interface, SWIGFLAGS = '-java -c++' ) 
+
+""" % locals())
+
+expected_stdout = """scons: Reading SConscript files ...
+scons: done reading SConscript files.
+scons: Building targets ...
+echo '%module test_java_swig' > test_java_swig.i
+/usr/bin/swig -o java_swig_test_wrap.cc -java -c++ test_java_swig.i
+echo '%module test_py_swig' > test_py_swig.i
+/usr/bin/swig -o python_swig_test_wrap.cc -python -c++ test_py_swig.i
+scons: done building targets.
+"""
+test.run(arguments = '.',stdout=expected_stdout)
+
+
+# If we mistakenly depend on the .py file that SWIG didn't create
+# (suppressed by the -noproxy option) then the build won't be up-to-date.
+test.up_to_date(arguments = '.')
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: