[pygccxml-commit] SF.net SVN: pygccxml:[1473] pyplusplus_dev
Brought to you by:
mbaas,
roman_yakovenko
|
From: <rom...@us...> - 2008-12-17 18:39:28
|
Revision: 1473
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1473&view=rev
Author: roman_yakovenko
Date: 2008-12-17 18:39:23 +0000 (Wed, 17 Dec 2008)
Log Message:
-----------
update testers to the boost svn
Modified Paths:
--------------
pyplusplus_dev/environment.py
pyplusplus_dev/unittests/algorithms_tester.py
pyplusplus_dev/unittests/already_exposed_tester.py
pyplusplus_dev/unittests/autoconfig.py
pyplusplus_dev/unittests/dwrapper_printer_tester.py
pyplusplus_dev/unittests/fundamental_tester_base.py
pyplusplus_dev/unittests/gui_wizard_tester.py
pyplusplus_dev/unittests/mdecl_wrapper_tester.py
pyplusplus_dev/unittests/ogre_generate_tester.py
pyplusplus_dev/unittests/particle_universe_generate_tester.py
pyplusplus_dev/unittests/unicode_bug.py
Modified: pyplusplus_dev/environment.py
===================================================================
--- pyplusplus_dev/environment.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/environment.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -37,7 +37,7 @@
if sys.platform == 'win32':
scons.suffix = '.pyd'
scons.ccflags = ['/MD', '/EHsc', '/GR', '/Zc:wchar_t', '/Zc:forScope', '-DBOOST_PYTHON_NO_PY_SIGNATURES' ]
- boost.libs = [ 'd:/dev/boost_svn/bin.v2/libs/python/build/msvc-7.1/release' ]
+ boost.libs = [ 'd:/dev/boost_svn/bin.v2/libs/python/build/msvc-7.1/release/threading-multi' ]
boost.include = 'd:/dev/boost_svn'
python.libs = 'e:/python25/libs'
python.include = 'e:/python25/include'
Modified: pyplusplus_dev/unittests/algorithms_tester.py
===================================================================
--- pyplusplus_dev/unittests/algorithms_tester.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/algorithms_tester.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -7,6 +7,7 @@
import sys
import unittest
import autoconfig
+import pygccxml
from pygccxml import parser
from pygccxml import declarations
from pyplusplus import code_creators
@@ -24,7 +25,8 @@
def test(self):
mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( 'namespace enums{ enum { OK=1 }; }' ) ]
- , gccxml_path=autoconfig.gccxml.executable )
+ , gccxml_path=autoconfig.gccxml.executable
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
mb.namespace( name='::enums' ).include()
mb.build_code_creator('dummy')
flatten = code_creators.make_flatten(mb.code_creator.creators)
@@ -34,7 +36,7 @@
def test_find_by_declaration(self):
mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( 'namespace enums{ enum color{ red = 1}; }' )]
- , gccxml_path=autoconfig.gccxml.executable )
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
mb.namespace( name='::enums' ).include()
enum_matcher = declarations.match_declaration_t( name='color' )
mb.build_code_creator( 'dummy' )
@@ -46,7 +48,7 @@
def test_find_by_class_instance(self):
mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( 'namespace enums{ enum color{ red = 1}; }' )]
- , gccxml_path=autoconfig.gccxml.executable )
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
mb.namespace( name='::enums' ).include()
mb.build_code_creator('dummy')
enum_found = code_creators.creator_finder.find_by_class_instance(
@@ -67,7 +69,7 @@
return answer
def test(self):
- config = parser.config_t( gccxml_path=autoconfig.gccxml.executable )
+ config = parser.config_t( gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
code = []
code.append('struct a{};')
code.append('struct b{};')
@@ -95,7 +97,7 @@
def test(self):
mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( 'namespace arr{ struct x{ x( int arr[3][3], int ){} x( const x arr[3][3], int ){} }; }' )]
- , gccxml_path=autoconfig.gccxml.executable )
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
arr = mb.namespace( name='arr' )
mem_funs = arr.calldefs( 'x', arg_types=[None,None] )
for x in mem_funs:
@@ -115,7 +117,7 @@
def test(self):
mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( self.CODE )]
- , gccxml_path=autoconfig.gccxml.executable )
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
xxx = mb.namespace( name='xxx' )
fun = xxx.calldef( 'do_smth' )
self.failUnless( fun.readme() == [] )
@@ -133,12 +135,12 @@
struct derived : public base {
void f(int i);
using base::f;
- };
+ };
"""
def test(self):
mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( self.CODE )]
- , gccxml_path=autoconfig.gccxml.executable )
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
d = mb.class_( 'derived' )
f = d.mem_fun( 'f' )
self.failUnless( f.create_with_signature == True )
@@ -172,11 +174,11 @@
int m_dummy;
struct x_nested{};
-
+
float* get_rate(){
return 0;
}
-
+
virtual void get_size( int& i, int& j ){
i = 0;
j = 0;
@@ -187,7 +189,7 @@
def test(self):
mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( self.CLASS_DEF ) ]
- , gccxml_path=autoconfig.gccxml.executable )
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
mb.namespace( name='::tester' ).include()
x = mb.class_( 'x' )
x.add_registration_code( '//hello world reg' )
@@ -223,77 +225,77 @@
escaped_doc = module_builder.doc_extractor_i.escape_doc('Hello "Py++"')
self.failUnless( escaped_doc == '"Hello \\"Py++\\""' )
-class exclude_erronious_tester_t( unittest.TestCase ):
+class exclude_erronious_tester_t( unittest.TestCase ):
def test(self):
-
+
code = """
namespace xyz{
-
+
struct good{};
-
+
typedef void (*ff1)( int, int );
-
+
void f_bad( ff1 );
-
+
}
"""
-
- mb = module_builder.module_builder_t(
+
+ mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( code ) ]
- , gccxml_path=autoconfig.gccxml.executable )
-
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
+
xyz = mb.namespace( name='xyz' )
xyz.include()
-
+
xyz.exclude(compilation_errors=True)
-
+
self.failUnless( xyz.ignore == False )
self.failUnless( xyz.class_( 'good' ).ignore == False )
self.failUnless( xyz.free_fun( 'f_bad' ).ignore == True )
-class exclude_ellipsis_tester_t( unittest.TestCase ):
+class exclude_ellipsis_tester_t( unittest.TestCase ):
def test(self):
-
+
code = """
namespace xyz{
void do_smth( int, ... );
}
"""
-
- mb = module_builder.module_builder_t(
+
+ mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( code ) ]
- , gccxml_path=autoconfig.gccxml.executable )
-
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
+
do_smth = mb.free_fun( 'do_smth' )
-
+
self.failUnless( do_smth.exportable == False )
print do_smth.why_not_exportable()
-class constructors_code_tester_t( unittest.TestCase ):
+class constructors_code_tester_t( unittest.TestCase ):
def test(self):
-
+
code = """
namespace xyz{
struct Y;
-
+
struct X{
X();
- X( const X& );
+ X( const X& );
X( Y* );
};
}
"""
-
- mb = module_builder.module_builder_t(
+
+ mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( code ) ]
- , gccxml_path=autoconfig.gccxml.executable )
-
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
+
x = mb.class_( 'X' )
x.include()
x.constructors().body = ' //all constructors body'
x.null_constructor_body = ' //null constructor body'
x.copy_constructor_body = ' //copy constructor body'
-
+
mb.build_code_creator( 'XXX' )
code = mb.code_creator.create()
tmp = code.split( x.null_constructor_body )
Modified: pyplusplus_dev/unittests/already_exposed_tester.py
===================================================================
--- pyplusplus_dev/unittests/already_exposed_tester.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/already_exposed_tester.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -7,46 +7,48 @@
import sys
import unittest
import autoconfig
+import pygccxml
from pyplusplus import utils
from pyplusplus import module_builder
import fundamental_tester_base
-class tester_t( unittest.TestCase ):
- def test(self):
+class tester_t( unittest.TestCase ):
+ def test(self):
fpath = os.path.join( autoconfig.data_directory, 'already_exposed_to_be_exported.hpp' )
mb = module_builder.module_builder_t( [module_builder.create_source_fc( fpath )]
- , gccxml_path=autoconfig.gccxml.executable )
-
+ , gccxml_path=autoconfig.gccxml.executable, compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
+
mb.global_ns.exclude()
mb.namespace( 'already_exposed' ).include()
mb.build_code_creator( 'already_exposed' )
-
+
already_exposed_dir = os.path.join( autoconfig.build_directory, 'already_exposed' )
mb.write_module( os.path.join( already_exposed_dir, 'already_exposed.cpp' ) )
-
+
#-----------------------------------------------------------------------
-
+
fpath = os.path.join( autoconfig.data_directory, 'already_exposed_2to_be_exported.hpp' )
mb = module_builder.module_builder_t( [module_builder.create_source_fc( fpath )]
- , gccxml_path=autoconfig.gccxml.executable )
-
+ , gccxml_path=autoconfig.gccxml.executable
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
+
mb.global_ns.exclude()
mb.namespace( 'to_be_exposed' ).include()
mb.build_code_creator( 'to_be_exposed' )
-
+
mb.register_module_dependency( already_exposed_dir )
mb.build_code_creator( 'to_be_exposed' )
to_be_exposed_dir = os.path.join( autoconfig.build_directory, 'to_be_exposed' )
mb.write_module( os.path.join( to_be_exposed_dir, 'to_be_exposed.cpp' ) )
-
+
body = mb.code_creator.body
self.failUnless( 2 == len( body.creators ) )
ae_derived_code = body.creators[0].create()
self.failUnless( mb.class_( 'ae_base' ).decl_string in ae_derived_code )
-
+
def create_suite():
- suite = unittest.TestSuite()
+ suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
return suite
Modified: pyplusplus_dev/unittests/autoconfig.py
===================================================================
--- pyplusplus_dev/unittests/autoconfig.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/autoconfig.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -21,8 +21,10 @@
from environment import scons, boost, python, gccxml, indexing_suite
+import pygccxml
+
class scons_config:
- libs = ['boost_python']
+ libs = []#['boost_python']
libpath = [ python.libs ] + boost.libs
cpppath = [ boost.include, python.include, indexing_suite.include ]
include_dirs = cpppath + [data_directory]
@@ -32,6 +34,10 @@
code = [
"import sys"
, "env = Environment()"
+ , "if 'linux' not in sys.platform:"
+ , " env['MSVS'] = {'VERSION': '%s'}" % str( pygccxml.utils.native_compiler.get_version()[1] )
+ , " env['MSVS_VERSION'] = '%s'" % str( pygccxml.utils.native_compiler.get_version()[1] )
+ , " Tool('msvc')(env)"
, "t = env.SharedLibrary( target=r'%(target)s'"
, " , source=[ %(sources)s ]"
, " , LIBS=[ %s ]" % ','.join( [ 'r"%s"' % lib for lib in scons_config.libs ] )
@@ -40,9 +46,9 @@
, " , CCFLAGS=[ %s ]" % ','.join( [ 'r"%s"' % flag for flag in scons.ccflags ] )
, " , SHLIBPREFIX=''"
, " , SHLIBSUFFIX='%s'" % scons.suffix #explicit better then implicit
- , ")"
- , "if 'linux' not in sys.platform:"
- , " env.AddPostAction(t, 'mt.exe -nologo -manifest %(target)s.pyd.manifest -outputresource:%(target)s.pyd;2' )" ]
+ , ")" ]
+ #~ , "if 'linux' not in sys.platform:"
+ #~ , " env.AddPostAction(t, 'mt.exe -nologo -manifest %(target)s.pyd.manifest -outputresource:%(target)s.pyd;2' )" ]
return os.linesep.join( code )
#I need this in order to allow Python to load just compiled modules
Modified: pyplusplus_dev/unittests/dwrapper_printer_tester.py
===================================================================
--- pyplusplus_dev/unittests/dwrapper_printer_tester.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/dwrapper_printer_tester.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -21,17 +21,18 @@
]
return map( lambda f: os.path.join( autoconfig.data_directory, f )
, files )
-
+
def test(self):
mb = module_builder.module_builder_t( self._get_files()
, gccxml_path=autoconfig.gccxml.executable
, include_paths=[autoconfig.boost.include]
- , undefine_symbols=['__MINGW32__'])
+ , undefine_symbols=['__MINGW32__']
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler())
writer = lambda decl: None
module_builder.print_declarations( mb.global_ns, writer=writer )
-
+
def create_suite():
- suite = unittest.TestSuite()
+ suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
return suite
@@ -39,4 +40,4 @@
unittest.TextTestRunner(verbosity=2).run( create_suite() )
if __name__ == "__main__":
- run_suite()
\ No newline at end of file
+ run_suite()
Modified: pyplusplus_dev/unittests/fundamental_tester_base.py
===================================================================
--- pyplusplus_dev/unittests/fundamental_tester_base.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/fundamental_tester_base.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -7,6 +7,7 @@
import sys
import unittest
import autoconfig
+import pygccxml
from pygccxml import parser
from pyplusplus import utils
from pygccxml import declarations
@@ -54,8 +55,8 @@
irrelevant_decl_types = ( declarations.typedef_t
, declarations.namespace_t
, declarations.free_operator_t )
- specially_exposed_decls = mb.code_creator.specially_exposed_decls
- for d in mb.decls():
+ specially_exposed_decls = mb.code_creator.specially_exposed_decls
+ for d in mb.decls():
if not d.exportable:
continue
elif isinstance( d, declarations.free_operator_t ):
@@ -64,13 +65,13 @@
if d in specially_exposed_decls:
continue
if exposed_db.is_exposed( d ):
- i = 0
+ i = 0
self.failUnless( not exposed_db.is_exposed( d )
, '''Declaration "%s" is NOT exposed, but for some reason it is marked as such.'''
% str( d ) )
#if d.ignore or not d.exportable or isinstance( d, irrelevant_decl_types ):
#continue
- #if d.parent and not d.parent.name:
+ #if d.parent and not d.parent.name:
#continue #unnamed classes
else:
self.failUnless( exposed_db.is_exposed( d )
@@ -95,17 +96,13 @@
def _create_extension_source_file(self):
global LICENSE
-
- #xml_file = os.path.split( self.__to_be_exported_header )[1]
- #xml_file = os.path.join( autoconfig.build_dir, xml_file + '.xml' )
- #xml_cached_fc = parser.create_cached_source_fc( self.__to_be_exported_header, xml_file )
- #mb = module_builder.module_builder_t( [xml_cached_fc]
mb = module_builder.module_builder_t( [self.__to_be_exported_header]
, gccxml_path=autoconfig.gccxml.executable
, include_paths=[autoconfig.boost.include]
, undefine_symbols=['__MINGW32__']
- , indexing_suite_version=self.__indexing_suite_version)
+ , indexing_suite_version=self.__indexing_suite_version
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler())
for decl in mb.decls():
decl.documentation = '"documentation"'
self.customize( mb )
Modified: pyplusplus_dev/unittests/gui_wizard_tester.py
===================================================================
--- pyplusplus_dev/unittests/gui_wizard_tester.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/gui_wizard_tester.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -11,12 +11,13 @@
#Configurating GCC-XML parser
#Basically you should copy here your makefile configuration
-parser_configuration = parser.config_t(
+parser_configuration = parser.config_t(
#path to GCC-XML binary
gccxml_path=r"c:/tools/gccxml/bin/gccxml.exe"
, working_directory=r"D:\pygccxml_sources\source\pyplusplus\unittests\data"
, include_paths=['D:/pygccxml_sources/source/pyplusplus/gui']
- , define_symbols=[] )
+ , define_symbols=[]
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
#Creating an instance of class that will help you to expose your declarations
mb = module_builder.module_builder_t( [r"D:\pygccxml_sources\source\pyplusplus\unittests\data\call_policies_to_be_exported.hpp"], parser_configuration )
@@ -28,4 +29,4 @@
mb.build_code_creator( module_name='pyplusplus' )
#Writing code to file.
-mb.write_module( './bindings.cpp' )
\ No newline at end of file
+mb.write_module( './bindings.cpp' )
Modified: pyplusplus_dev/unittests/mdecl_wrapper_tester.py
===================================================================
--- pyplusplus_dev/unittests/mdecl_wrapper_tester.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/mdecl_wrapper_tester.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -27,56 +27,58 @@
mb = module_builder.module_builder_t( self._get_files()
, gccxml_path=autoconfig.gccxml.executable
, include_paths=[autoconfig.boost.include]
- , undefine_symbols=['__MINGW32__'] )
+ , undefine_symbols=['__MINGW32__']
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler())
classes = filter( lambda d: isinstance( d, module_builder.class_t )
, declarations.make_flatten( mb.global_ns ) )
-
+
mdw = module_builder.mdecl_wrapper_t( classes )
#check set to property functionality
for d in mdw:
d.always_expose_using_scope = False
-
+
mdw.always_expose_using_scope = True
-
+
all_true = True
for d in mdw:
all_true &= d.always_expose_using_scope
-
+
self.failUnless( all_true )
-
- #check call method functionality
+
+ #check call method functionality
for d in mdw:
d.ignore = True
-
+
mdw.include()
-
+
all_false = False
for d in mdw:
all_true |= d.ignore
-
+
self.failUnless( not all_false )
-
+
#check for exception:
try:
mdw.call_policies = None
self.fail( "Runtime error has not been raised." )
except RuntimeError, err:
pass
-
+
def test__getitem__( self ):
mb = module_builder.module_builder_t( self._get_files()
, gccxml_path=autoconfig.gccxml.executable
, include_paths=[autoconfig.boost.include]
- , undefine_symbols=['__MINGW32__'] )
-
+ , undefine_symbols=['__MINGW32__']
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
+
public_bases = mb.classes( 'public_base_t' )
self.failUnless( 1 == len( public_bases ) )
public_bases.include()
self.failUnless( public_bases[0].ignore == False )
-
+
mb.global_ns[ 'public_base_t' ].exclude()
-
+
self.failUnless( public_bases[0].ignore == True )
#def test__getitem__2( self ):
@@ -84,7 +86,7 @@
#, gccxml_path=autoconfig.gccxml.executable
#, include_paths=[autoconfig.boost.include]
#, undefine_symbols=['__MINGW32__'] )
-
+
#mem_funs = mb.classes( 'public_base_t' ).member_functions('regular')
#print len(mem_funs)
##self.failUnless( 1 == len( public_bases ) )
@@ -92,15 +94,15 @@
#mem_funs.include()
#for mf in mem_funs:
#self.failUnless( mf.ignore == False )
-
+
#mb.global_ns[ 'public_base_t' ]['regular'].exclude()
-
+
#for mf in mem_funs:
#self.failUnless( mf.ignore == False )
def create_suite():
- suite = unittest.TestSuite()
+ suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
return suite
Modified: pyplusplus_dev/unittests/ogre_generate_tester.py
===================================================================
--- pyplusplus_dev/unittests/ogre_generate_tester.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/ogre_generate_tester.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -18,41 +18,42 @@
from pyplusplus import utils as pypp_utils
from pyplusplus import function_transformers as ft
-class ogre_generate_tester_t(unittest.TestCase):
+class ogre_generate_tester_t(unittest.TestCase):
def test(self):
module_builder.set_logger_level( logging.CRITICAL )
messages.disable( *messages.all_warning_msgs )
-
+
ogre_file = autoconfig.data_directory.replace( 'pyplusplus_dev', 'pygccxml_dev' )
ogre_file = parser.create_gccxml_fc( os.path.join( ogre_file, 'ogre.1.7.xml' ) )
mb = module_builder.module_builder_t(
[ ogre_file ]
- , gccxml_path=autoconfig.gccxml.executable
- , indexing_suite_version=2)
-
+ , gccxml_path=autoconfig.gccxml.executable
+ , indexing_suite_version=2
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler())
+
mb.global_ns.exclude()
mb.namespace('Ogre').include()
-
+
x = mb.global_ns.decls( lambda d: 'Animation*' in d.name and 'MapIterator' in d.name )
for y in x:
print y.name
print y.partial_name
print declarations.full_name( y, with_defaults=False )
-
+
target_dir = os.path.join( autoconfig.build_directory, 'ogre' )
#~ if os.path.exists( target_dir ):
#~ shutil.rmtree( target_dir )
#~ os.mkdir( target_dir )
-
+
mb.build_code_creator( 'Ogre3d' )
- mb.split_module( target_dir )
+ mb.split_module( target_dir )
def create_suite():
suite = unittest.TestSuite()
- suite.addTest( unittest.makeSuite(ogre_generate_tester_t))
+ suite.addTest( unittest.makeSuite(ogre_generate_tester_t))
return suite
def run_suite():
Modified: pyplusplus_dev/unittests/particle_universe_generate_tester.py
===================================================================
--- pyplusplus_dev/unittests/particle_universe_generate_tester.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/particle_universe_generate_tester.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -18,18 +18,19 @@
from pyplusplus import utils as pypp_utils
from pyplusplus import function_transformers as ft
-class ogre_generate_tester_t(unittest.TestCase):
+class ogre_generate_tester_t(unittest.TestCase):
def test(self):
module_builder.set_logger_level( logging.CRITICAL )
messages.disable( *messages.all_warning_msgs )
-
+
xml_file = parser.create_gccxml_fc( os.path.join( autoconfig.data_directory, 'particleuniverse.xml' ) )
mb = module_builder.module_builder_t(
[ xml_file ]
- , gccxml_path=autoconfig.gccxml.executable
- , indexing_suite_version=2)
-
+ , gccxml_path=autoconfig.gccxml.executable
+ , indexing_suite_version=2
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler())
+
mb.global_ns.exclude()
mb.namespace('ParticleUniverse').include()
mb.namespace('Ogre').include()
@@ -42,13 +43,13 @@
psp = mb.class_( '::ParticleUniverse::ParticleScriptParser' )
declarations.print_declarations( psp )
mb.build_code_creator( 'PU' )
- mb.split_module( target_dir )
+ mb.split_module( target_dir )
def create_suite():
suite = unittest.TestSuite()
- suite.addTest( unittest.makeSuite(ogre_generate_tester_t))
+ suite.addTest( unittest.makeSuite(ogre_generate_tester_t))
return suite
def run_suite():
Modified: pyplusplus_dev/unittests/unicode_bug.py
===================================================================
--- pyplusplus_dev/unittests/unicode_bug.py 2008-12-17 09:05:44 UTC (rev 1472)
+++ pyplusplus_dev/unittests/unicode_bug.py 2008-12-17 18:39:23 UTC (rev 1473)
@@ -3,6 +3,7 @@
import os
import unittest
import autoconfig
+import pygccxml
from pygccxml import parser
from pygccxml import declarations
from pyplusplus import code_creators
@@ -12,10 +13,11 @@
from pyplusplus import function_transformers as ft
-mb = module_builder.module_builder_t(
+mb = module_builder.module_builder_t(
[ module_builder.create_text_fc( 'struct x{};' ) ]
- , gccxml_path=autoconfig.gccxml.executable
- , encoding='UTF-8')
+ , gccxml_path=autoconfig.gccxml.executable
+ , encoding='UTF-8'
+ , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler())
mb.build_code_creator( module_name='unicode_bug' )
mb.code_creator.license = "//абвгдеёжзийклмнопрстуфхцчшщъыьэюя"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|