On Sat, 28 Jul 2007, djames@tigris.org wrote:
> Author: djames
> Date: Sat Jul 28 21:37:30 2007
> New Revision: 25877
>
> Log:
> Restore the SWIG checkout system, which was deleted in r25740, because
> it is still needed for compatibility with SWIG 1.3.24 and SWIG 1.3.27.
> Instead, we will only remove the specific "long long" hacks which were
> obsoleted by r25740.
>
> * build.conf
> (swig-checkout-files): Restore.
>
> * build/generator/gen_make.py
> build/generator/gen_win.py:
> (Generator.write): Restore logic for calling swig_checkout_files.
>
> * build/generator/swig/__init__.py:
> (Generator.__init__): Restore logic for grabbing swig_checkout_files
> from build.conf.
>
> * build/generator/swig/checkout_swig_header.py:
> (): Restore deleted file.
> (checkout): Remove "long long" hacks which were obsoleted by r25740.
David, this commit breaks invocation of gen-make.py:
$ ./autogen.sh
buildcheck: checking installation...
buildcheck: autoconf version 2.59 (ok)
buildcheck: autoheader version 2.59 (ok)
buildcheck: libtool version 1.5 (ok)
Copying libtool helper: /usr/share/aclocal/libtool.m4
Creating build-outputs.mk...
Traceback (most recent call last):
File "./gen-make.py", line 265, in ?
main(conf, gentype, skip_depends=skip, other_options=rest.list)
File "./gen-make.py", line 33, in main
gen_module = __import__(gen_modules[gentype][0])
File "build/generator/gen_make.py", line 11, in ?
import generator.swig.checkout_swig_header
ImportError: No module named checkout_swig_header
rm: autogen-standalone.mk: No such file or directory
ERROR: gen-make.py failed
I haven't looked into the details, but reverting this commit removes this
error.
- Dan
- application/pgp-signature attachment: stored
Received on Sun Jul 29 08:12:50 2007