diff options
author | Steven Knight <knight@baldmt.com> | 2009-12-31 00:45:19 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2009-12-31 00:45:19 (GMT) |
commit | 20a12bf165799f422fec4c6fda35f5c13f6fcdff (patch) | |
tree | e6029665b8c380454da1c9305e54bacaab4e2748 /test | |
parent | 2c3932a6303e7cb1052ad3632f5afcee67852747 (diff) | |
download | SCons-20a12bf165799f422fec4c6fda35f5c13f6fcdff.zip SCons-20a12bf165799f422fec4c6fda35f5c13f6fcdff.tar.gz SCons-20a12bf165799f422fec4c6fda35f5c13f6fcdff.tar.bz2 |
Avoid GCC 4.4 warnings from the code generated by our dummy QT
moc and uic utilities by using fputs() instead of printf().
Diffstat (limited to 'test')
-rw-r--r-- | test/QT/QTFLAGS.py | 78 |
1 files changed, 1 insertions, 77 deletions
diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py index 2537c80..62155fd 100644 --- a/test/QT/QTFLAGS.py +++ b/test/QT/QTFLAGS.py @@ -38,83 +38,7 @@ test = TestSCons.TestSCons() test.subdir( 'qt', ['qt', 'bin'], ['qt', 'include'], ['qt', 'lib'], 'work1', 'work2') -# create a dummy qt installation - -test.write(['qt', 'bin', 'mymoc.py'], """ -import getopt -import sys -import string -import re -cmd_opts, args = getopt.getopt(sys.argv[1:], 'wzio:', []) -output = None -impl = 0 -opt_string = '' -for opt, arg in cmd_opts: - if opt == '-o': output = open(arg, 'wb') - elif opt == '-i': impl = 1 - else: opt_string = opt_string + ' ' + opt -output.write( "/* mymoc.py%s */\\n" % opt_string) -for a in args: - contents = open(a, 'rb').read() - subst = r'{ my_qt_symbol( "' + a + '\\\\n" ); }' - if impl: - contents = re.sub( r'#include.*', '', contents ) - output.write(string.replace(contents, 'Q_OBJECT', subst)) -output.close() -sys.exit(0) -""" ) - -test.write(['qt', 'bin', 'myuic.py'], """ -import sys -import string -output_arg = 0 -impl_arg = 0 -impl = None -source = None -opt_string = '' -for arg in sys.argv[1:]: - if output_arg: - output = open(arg, 'wb') - output_arg = 0 - elif impl_arg: - impl = arg - impl_arg = 0 - elif arg == "-o": - output_arg = 1 - elif arg == "-impl": - impl_arg = 1 - elif arg[0:1] == "-": - opt_string = opt_string + ' ' + arg - else: - if source: - sys.exit(1) - source = open(arg, 'rb') -output.write("/* myuic.py%s */\\n" % opt_string) -if impl: - output.write( '#include "' + impl + '"\\n' ) -else: - output.write( '#include "my_qobject.h"\\n' + source.read() + " Q_OBJECT \\n" ) -output.close() -sys.exit(0) -""" ) - -test.write(['qt', 'include', 'my_qobject.h'], r""" -#define Q_OBJECT ; -void my_qt_symbol(const char *arg); -""") - -test.write(['qt', 'lib', 'my_qobject.cpp'], r""" -#include "../include/my_qobject.h" -#include <stdio.h> -void my_qt_symbol(const char *arg) { - printf( arg ); -} -""") - -test.write(['qt', 'lib', 'SConstruct'], r""" -env = Environment() -env.StaticLibrary( 'myqt', 'my_qobject.cpp' ) -""") +test.Qt_dummy_installation() test.run(chdir=test.workpath('qt','lib'), arguments = '.', stderr=TestSCons.noisy_ar, |