Revision: 207
Author: roman_yakovenko
Date: 2006-06-04 20:36:47 -0700 (Sun, 04 Jun 2006)
ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=207&view=rev
Log Message:
-----------
updating examples
Modified Paths:
--------------
pyplusplus_dev/docs/tutorials/module_builder/generate_code.html
pyplusplus_dev/docs/tutorials/module_builder/result.html
pyplusplus_dev/tutorials/module_builder/generate_code.py
pyplusplus_dev/tutorials/module_builder/hello_world.py.cpp
Removed Paths:
-------------
pyplusplus_dev/tutorials/module_builder/environment.py
Modified: pyplusplus_dev/docs/tutorials/module_builder/generate_code.html
===================================================================
--- pyplusplus_dev/docs/tutorials/module_builder/generate_code.html 2006-06-04 18:49:56 UTC (rev 206)
+++ pyplusplus_dev/docs/tutorials/module_builder/generate_code.html 2006-06-05 03:36:47 UTC (rev 207)
@@ -50,13 +50,14 @@
<span class="S1"># http://www.boost.org/LICENSE_1_0.txt)</span><br />
<br />
<span class="S5">import</span><span class="S0"> </span>os<br />
-<span class="S5">from</span><span class="S0"> </span>environment<span class="S0"> </span><span class="S5">import</span><span class="S0"> </span>settings<br />
+<span class="S5">import</span><span class="S0"> </span>sys<br />
+sys<span class="S10">.</span>path<span class="S10">.</span>append<span class="S10">(</span><span class="S0"> </span><span class="S4">'../..'</span><span class="S0"> </span><span class="S10">)</span><br />
+<span class="S5">from</span><span class="S0"> </span>environment<span class="S0"> </span><span class="S5">import</span><span class="S0"> </span>gccxml<br />
<span class="S5">from</span><span class="S0"> </span>pyplusplus<span class="S0"> </span><span class="S5">import</span><span class="S0"> </span>module_builder<br />
<br />
mb<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>module_builder<span class="S10">.</span>module_builder_t<span class="S10">(</span><br />
<span class="S0"> </span>files<span class="S10">=[</span><span class="S4">'hello_world.hpp'</span><span class="S10">]</span><br />
-<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span>gccxml_path<span class="S10">=</span>settings<span class="S10">.</span>gccxml_path<span class="S0"> </span><span class="S1">#path to gccxml executable</span><br />
-<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span>working_directory<span class="S10">=</span>settings<span class="S10">.</span>working_dir<span class="S0"> </span><span class="S10">)</span><span class="S0"> </span><span class="S1">#setting working directory for gccxml</span><br />
+<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span>gccxml_path<span class="S10">=</span>gccxml<span class="S10">.</span>executable<span class="S0"> </span><span class="S10">)</span><span class="S0"> </span><span class="S1">#path to gccxml executable</span><br />
<br />
<span class="S1">#rename enum Color to color</span><br />
Color<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>mb<span class="S10">.</span>enum<span class="S10">(</span><span class="S0"> </span><span class="S4">'color'</span><span class="S0"> </span><span class="S10">)</span><br />
@@ -92,9 +93,9 @@
mb<span class="S10">.</span>code_creator<span class="S10">.</span>license<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">'//Boost Software License( http://boost.org/more/license_info.html )'</span><br />
<br />
<span class="S1">#I don't want absolute includes within code</span><br />
-mb<span class="S10">.</span>code_creator<span class="S10">.</span>user_defined_directories<span class="S10">.</span>append<span class="S10">(</span><span class="S0"> </span>settings<span class="S10">.</span>working_dir<span class="S0"> </span><span class="S10">)</span><br />
+mb<span class="S10">.</span>code_creator<span class="S10">.</span>user_defined_directories<span class="S10">.</span>append<span class="S10">(</span><span class="S0"> </span>os<span class="S10">.</span>path<span class="S10">.</span>abspath<span class="S10">(</span><span class="S4">'.'</span><span class="S10">)</span><span class="S0"> </span><span class="S10">)</span><br />
<br />
<span class="S1">#And finally we can write code to the disk</span><br />
-mb<span class="S10">.</span>write_module<span class="S10">(</span><span class="S0"> </span>os<span class="S10">.</span>path<span class="S10">.</span>join<span class="S10">(</span><span class="S0"> </span>settings<span class="S10">.</span>working_dir<span class="S10">,</span><span class="S0"> </span><span class="S4">'hello_world.py.cpp'</span><span class="S0"> </span><span class="S10">)</span><span class="S0"> </span><span class="S10">)</span></span>
+mb<span class="S10">.</span>write_module<span class="S10">(</span><span class="S0"> </span>os<span class="S10">.</span>path<span class="S10">.</span>join<span class="S10">(</span><span class="S0"> </span>os<span class="S10">.</span>path<span class="S10">.</span>abspath<span class="S10">(</span><span class="S4">'.'</span><span class="S10">),</span><span class="S0"> </span><span class="S4">'hello_world.py.cpp'</span><span class="S0"> </span><span class="S10">)</span><span class="S0"> </span><span class="S10">)</span></span>
</body>
</html>
Modified: pyplusplus_dev/docs/tutorials/module_builder/result.html
===================================================================
--- pyplusplus_dev/docs/tutorials/module_builder/result.html 2006-06-04 18:49:56 UTC (rev 206)
+++ pyplusplus_dev/docs/tutorials/module_builder/result.html 2006-06-05 03:36:47 UTC (rev 207)
@@ -49,9 +49,6 @@
<br />
<span class="S2">//Boost Software License( http://boost.org/more/license_info.html )</span><br />
<br />
-<span class="S2">// std directories: []</span><br />
-<span class="S2">// user defined directories: ['d:\\pygccxml_sources\\source\\pyplusplus\\examples\\tutorials']</span><br />
-<br />
<span class="S9">#include "boost/python.hpp"</span><br />
<br />
<span class="S9">#include "hello_world.hpp"</span><br />
@@ -66,12 +63,12 @@
<span class="S0"> </span><span class="S10">.</span>export_values<span class="S10">()</span><br />
<span class="S0"> </span><span class="S10">;</span><br />
<br />
-<span class="S0"> </span>bp<span class="S10">::</span>class_<span class="S10"><</span><span class="S0"> </span>animal<span class="S0"> </span><span class="S10">>(</span><span class="S0"> </span><span class="S6">"animal"</span><span class="S10">,</span><span class="S0"> </span>bp<span class="S10">::</span>init<span class="S10"><</span><span class="S0"> </span>bp<span class="S10">::</span>optional<span class="S10"><</span><span class="S0"> </span>std<span class="S10">::</span>string<span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">&</span><span class="S0"> </span><span class="S10">></span><span class="S0"> </span><span class="S10">>((</span><span class="S0"> </span>bp<span class="S10">::</span>arg<span class="S10">(</span><span class="S6">"name"</span><span class="S10">)=</span><span class="S6">""</span><span class="S0"> </span><span class="S10">))</span><span class="S0"> </span><span class="S10">)</span><span class="S0"> </span><br />
-<span class="S0"> </span><span class="S10">.</span>def<span class="S10">(</span><span class="S0"> </span><span class="S6">"get_name_ptr"</span><br />
-<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span><span class="S10">&</span>animal<span class="S10">::</span>get_name_ptr<br />
+<span class="S0"> </span>bp<span class="S10">::</span>class_<span class="S10"><</span><span class="S0"> </span>animal<span class="S10">,</span><span class="S0"> </span>boost<span class="S10">::</span>noncopyable<span class="S0"> </span><span class="S10">>(</span><span class="S0"> </span><span class="S6">"animal"</span><span class="S10">,</span><span class="S0"> </span>bp<span class="S10">::</span>init<span class="S10"><</span><span class="S0"> </span>bp<span class="S10">::</span>optional<span class="S10"><</span><span class="S0"> </span>std<span class="S10">::</span>string<span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">&</span><span class="S0"> </span><span class="S10">></span><span class="S0"> </span><span class="S10">>((</span><span class="S0"> </span>bp<span class="S10">::</span>arg<span class="S10">(</span><span class="S6">"name"</span><span class="S10">)=</span><span class="S6">""</span><span class="S0"> </span><span class="S10">))</span><span class="S0"> </span><span class="S10">)</span><span class="S0"> </span><br />
+<span class="S0"> </span><span class="S10">.</span>def<span class="S10">(</span><span class="S6">"get_name_ptr"</span><br />
+<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span><span class="S10">&::</span>animal<span class="S10">::</span>get_name_ptr<br />
<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span>bp<span class="S10">::</span>return_internal_reference<span class="S10"><</span><span class="S0"> </span><span class="S4">1</span><span class="S10">,</span><span class="S0"> </span>bp<span class="S10">::</span>default_call_policies<span class="S0"> </span><span class="S10">>()</span><span class="S0"> </span><span class="S10">)</span><span class="S0"> </span><br />
-<span class="S0"> </span><span class="S10">.</span>def<span class="S10">(</span><span class="S0"> </span><span class="S6">"name"</span><br />
-<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span><span class="S10">&</span>animal<span class="S10">::</span>name<br />
+<span class="S0"> </span><span class="S10">.</span>def<span class="S10">(</span><span class="S6">"name"</span><br />
+<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span><span class="S10">&::</span>animal<span class="S10">::</span>name<br />
<span class="S0"> </span><span class="S10">,</span><span class="S0"> </span>bp<span class="S10">::</span>return_value_policy<span class="S10"><</span><span class="S0"> </span>bp<span class="S10">::</span>copy_const_reference<span class="S10">,</span><span class="S0"> </span>bp<span class="S10">::</span>default_call_policies<span class="S0"> </span><span class="S10">>()</span><span class="S0"> </span><span class="S10">);</span><br />
<br />
<span class="S0"> </span>bp<span class="S10">::</span>implicitly_convertible<span class="S10"><</span><span class="S0"> </span>std<span class="S10">::</span>string<span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">&,</span><span class="S0"> </span>animal<span class="S0"> </span><span class="S10">>();</span><br />
Deleted: pyplusplus_dev/tutorials/module_builder/environment.py
===================================================================
--- pyplusplus_dev/tutorials/module_builder/environment.py 2006-06-04 18:49:56 UTC (rev 206)
+++ pyplusplus_dev/tutorials/module_builder/environment.py 2006-06-05 03:36:47 UTC (rev 207)
@@ -1,29 +0,0 @@
-#! /usr/bin/python
-# Copyright 2004 Roman Yakovenko.
-# Distributed under the Boost Software License, Version 1.0. (See
-# accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-import sys
-
-class settings:
- gccxml_path = ''
- pygccxml_path = ''
- pyplusplus_path = ''
- working_dir = ''
-
- if sys.platform == 'linux2':
- gccxml_path = '/home/roman/gccxml/bin/gccxml'
- pygccxml_path = '/home/roman/pygccxml_sources/source'
- pyplusplus_path = '/home/roman/pygccxml_sources/source'
- working_dir = '/home/roman/pygccxml_sources/source/pyplusplus/examples/tutorials'
- elif sys.platform == 'win32':
- gccxml_path = 'c:/tools/gcc_xml/bin'
- pygccxml_path = 'd:/pygccxml_sources/source'
- pyplusplus_path = 'd:/pygccxml_sources/source'
- working_dir = 'd:/pygccxml_sources/source/pyplusplus/examples/tutorials'
- else:
- raise RuntimeError( 'There is no configuration for "%s" platform.' % sys.platform )
-
-sys.path.append( settings.pygccxml_path )
-sys.path.append( settings.pyplusplus_path )
Modified: pyplusplus_dev/tutorials/module_builder/generate_code.py
===================================================================
--- pyplusplus_dev/tutorials/module_builder/generate_code.py 2006-06-04 18:49:56 UTC (rev 206)
+++ pyplusplus_dev/tutorials/module_builder/generate_code.py 2006-06-05 03:36:47 UTC (rev 207)
@@ -11,13 +11,14 @@
#############################################################################
import os
-from environment import settings
+import sys
+sys.path.append( '../..' )
+from environment import gccxml
from pyplusplus import module_builder
mb = module_builder.module_builder_t(
files=['hello_world.hpp']
- , gccxml_path=settings.gccxml_path #path to gccxml executable
- , working_directory=settings.working_dir ) #setting working directory for gccxml
+ , gccxml_path=gccxml.executable ) #path to gccxml executable
#rename enum Color to color
Color = mb.enum( 'color' )
@@ -53,7 +54,7 @@
mb.code_creator.license = '//Boost Software License( http://boost.org/more/license_info.html )'
#I don't want absolute includes within code
-mb.code_creator.user_defined_directories.append( settings.working_dir )
+mb.code_creator.user_defined_directories.append( os.path.abspath('.') )
#And finally we can write code to the disk
-mb.write_module( os.path.join( settings.working_dir, 'hello_world.py.cpp' ) )
\ No newline at end of file
+mb.write_module( os.path.join( os.path.abspath('.'), 'hello_world.py.cpp' ) )
\ No newline at end of file
Modified: pyplusplus_dev/tutorials/module_builder/hello_world.py.cpp
===================================================================
--- pyplusplus_dev/tutorials/module_builder/hello_world.py.cpp 2006-06-04 18:49:56 UTC (rev 206)
+++ pyplusplus_dev/tutorials/module_builder/hello_world.py.cpp 2006-06-05 03:36:47 UTC (rev 207)
@@ -2,9 +2,6 @@
//Boost Software License( http://boost.org/more/license_info.html )
-// std directories: []
-// user defined directories: ['d:\\pygccxml_sources\\source\\pyplusplus\\examples\\tutorials']
-
#include "boost/python.hpp"
#include "hello_world.hpp"
@@ -19,12 +16,12 @@
.export_values()
;
- bp::class_< animal >( "animal", bp::init< bp::optional< std::string const & > >(( bp::arg("name")="" )) )
- .def( "get_name_ptr"
- , &animal::get_name_ptr
+ bp::class_< animal, boost::noncopyable >( "animal", bp::init< bp::optional< std::string const & > >(( bp::arg("name")="" )) )
+ .def("get_name_ptr"
+ , &::animal::get_name_ptr
, bp::return_internal_reference< 1, bp::default_call_policies >() )
- .def( "name"
- , &animal::name
+ .def("name"
+ , &::animal::name
, bp::return_value_policy< bp::copy_const_reference, bp::default_call_policies >() );
bp::implicitly_convertible< std::string const &, animal >();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|