[pygccxml-commit] SF.net SVN: pygccxml: [138] pyplusplus_dev
Brought to you by:
mbaas,
roman_yakovenko
Menu
▾
▴
[pygccxml-commit] SF.net SVN: pygccxml: [138] pyplusplus_dev
|
From: <rom...@us...> - 2006-05-18 14:07:41
|
Revision: 138 Author: roman_yakovenko Date: 2006-05-18 07:07:18 -0700 (Thu, 18 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=138&view=rev Log Message: ----------- fixing bug in date time Modified Paths: -------------- pyplusplus_dev/environment.py pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py pyplusplus_dev/examples/pyboost_dev/dev/date_time/sconscript pyplusplus_dev/examples/pyboost_dev/sconstruct pyplusplus_dev/examples/pyboost_dev/unittestst/boost_random/test_all.py Modified: pyplusplus_dev/environment.py =================================================================== --- pyplusplus_dev/environment.py 2006-05-18 10:45:18 UTC (rev 137) +++ pyplusplus_dev/environment.py 2006-05-18 14:07:18 UTC (rev 138) @@ -5,7 +5,6 @@ class boost: libs = '' include = '' - include_linux = '' class python: libs = '' @@ -30,7 +29,6 @@ scons.ccflags = ['/MD', '/EHsc', '/GR', '/Zc:wchar_t', '/Zc:forScope' ] boost.libs = 'd:/boost_cvs/bin' boost.include = 'd:/boost_cvs' - boost.include_linux = '/home/roman/boost_cvs' python.libs = 'c:/python/libs' python.include = 'c:/python/include' gccxml.executable = 'd:/gccxml_cvs/gccxml-build/bin/release/gccxml.exe' Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py 2006-05-18 10:45:18 UTC (rev 137) +++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py 2006-05-18 14:07:18 UTC (rev 138) @@ -147,11 +147,13 @@ extmodule = mb.code_creator #beautifying include code generation extmodule.license = customization_data.license - extmodule.user_defined_directories.append( date_time_settings.boost.include ) + extmodule.user_defined_directories.append( date_time_settings.boost.include ) extmodule.user_defined_directories.append( date_time_settings.working_dir ) extmodule.user_defined_directories.append( date_time_settings.generated_files_dir ) extmodule.license = customization_data.license extmodule.precompiled_header = 'boost/python.hpp' + extmodule.replace_included_headers( customization_data.includes ) + self.beautify_code( mb ) def write_files( self, mb ): Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/sconscript =================================================================== --- pyplusplus_dev/examples/pyboost_dev/dev/date_time/sconscript 2006-05-18 10:45:18 UTC (rev 137) +++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/sconscript 2006-05-18 14:07:18 UTC (rev 138) @@ -21,6 +21,7 @@ source_files = filter( lambda s: s.endswith( '.cpp' ), os.listdir(date_time_settings.generated_files_dir) ) return map( lambda fname: os.path.join( date_time_settings.generated_files_dir, fname ), source_files ) + def get_libs(): libs = [] if sys.platform == 'linux2': @@ -39,4 +40,10 @@ _date_time_ = local_env.SharedLibrary( target=date_time_settings.module_name , source=get_source_files() ) -local_env.Install( '#pyboost/date_time', _date_time_ ) \ No newline at end of file +if sys.platform == 'win32': + boost_date_time_so_dll = os.path.join( date_time_settings.boost.libs, 'boost_date_time-vc71-mt-1_34.dll' ) +else: + boost_date_time_so_dll = os.path.join( date_time_settings.boost.libs, 'libboost_date_time-gcc-1_34.so' ) + + +local_env.Install( '#pyboost/date_time', [_date_time_, boost_date_time_so_dll ] ) \ No newline at end of file Modified: pyplusplus_dev/examples/pyboost_dev/sconstruct =================================================================== --- pyplusplus_dev/examples/pyboost_dev/sconstruct 2006-05-18 10:45:18 UTC (rev 137) +++ pyplusplus_dev/examples/pyboost_dev/sconstruct 2006-05-18 14:07:18 UTC (rev 138) @@ -13,9 +13,13 @@ , LIBPATH=[ environment.boost.libs, environment.python.libs ] , CPPPATH=[ environment.boost.include, environment.python.include ] , SHLIBPREFIX='' - , SHLIBSUFFIX=environment.scons.suffix - , no_import_lib=1 + , SHLIBSUFFIX=environment.scons.suffix ) + +if sys.platform == 'win32': + env.Replace( no_import_lib=1 ) +else: + env.Append( CCFLAGS=' -ggdb3 -DNDEBUG -O3' ) Export( 'env' ) env.SConscript( ['dev/date_time/sconscript'] ) Modified: pyplusplus_dev/examples/pyboost_dev/unittestst/boost_random/test_all.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittestst/boost_random/test_all.py 2006-05-18 10:45:18 UTC (rev 137) +++ pyplusplus_dev/examples/pyboost_dev/unittestst/boost_random/test_all.py 2006-05-18 14:07:18 UTC (rev 138) @@ -38,8 +38,7 @@ def instantiate_dist( self, urng, dist ): if not boost_random.variate_generator_exists( urng, dist ): - return - + return gen1 = boost_random.variate_generator( urng, dist) gen2 = boost_random.variate_generator( urng, dist) self.randomness_tester( gen1 ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
