|
From: <and...@us...> - 2008-06-28 01:46:41
|
Revision: 622
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=622&view=rev
Author: andy_miller
Date: 2008-06-27 18:46:50 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Fixes to get CEGUI to work under Linux. Instead of patching CEGUI source we now
use a fix from Tim (Mithro) to force loading CEGUIBase correctly
Also further documentation parsing fixes for CEGUI
Modified Paths:
--------------
trunk/python-ogre/code_generators/common_utils/extract_documentation.py
trunk/python-ogre/demos/cegui/CEGUI_framework.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/code_generators/common_utils/extract_documentation.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2008-06-27 23:35:13 UTC (rev 621)
+++ trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2008-06-28 01:46:50 UTC (rev 622)
@@ -190,6 +190,8 @@
_str = clean(_str, "\\Return", "@return")
# _str = clean(_str, "@note", "Note: ")
_str = clean(_str, "@remarks", "@see")
+ _str = clean(_str, "\\remarks", "@see")
+ _str = clean(_str, "\\Remarks", "@see")
# _str = clean(_str, "@see", "See: ")
_str = clean(_str, "\\see", "@see")
_str = clean(_str, "@ref", "@see")
@@ -220,7 +222,13 @@
_str = clean(_str, "\\image", "Image: ") ## nxPhysics
_str = clean(_str, "\\examples", "Examples: ") ## nxOgre
- _str = clean(_str, "\\default", "Default: ") ## nxOgre
+ _str = clean(_str, "\\default", "Default: ") ## nxOgre
+
+ _str = clean(_str, "\\version", "@version ") ## cegui
+ _str = clean(_str, "\\date", "@date ") #
+ _str = clean(_str, "\\todo", "@todo ") ##
+ _str = clean(_str, "\\bug", "@Bug ") ##
+ _str = clean(_str, "\\author", "@Author ") ##
## now clean up the rest
Modified: trunk/python-ogre/demos/cegui/CEGUI_framework.py
===================================================================
--- trunk/python-ogre/demos/cegui/CEGUI_framework.py 2008-06-27 23:35:13 UTC (rev 621)
+++ trunk/python-ogre/demos/cegui/CEGUI_framework.py 2008-06-28 01:46:50 UTC (rev 622)
@@ -1,4 +1,17 @@
+import ctypes
+
+# The follow patch from Tim (Mithro) fixes a loder issue with CEGUI - previously we'd patched CEGUI to
+# ensure the CEGUIBase was linked to every module to solve the issue with Python dynamically loading
+# the _cegui_.so module without RTLD_GLOBAL set - then when CEGUI opened it's dynamic modules it
+# couldn't find all the symbols.
+
+print ctypes.CDLL("../../../root/usr/lib/libCEGUIBase.so", ctypes.RTLD_GLOBAL )
+
import ogre.gui.CEGUI as CEGUI
+
+# Another fix for CEGUI to ensure we get a working parser..
+CEGUI.System.setDefaultXMLParserName("TinyXMLParser")
+
import ogre.io.OIS as OIS
import SampleFramework
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-06-27 23:35:13 UTC (rev 621)
+++ trunk/python-ogre/environment.py 2008-06-28 01:46:50 UTC (rev 622)
@@ -769,10 +769,10 @@
source=[
[wget, "http://downloads.sourceforge.net/crayzedsgui/CEGUI-0.6.0.tar.gz", downloadPath]
]
-
+
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
- [0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
+# [0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./INSTALL", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./NEWS", os.path.join(os.getcwd(),base)],
[0, "aclocal", os.path.join(os.getcwd(),base)],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-06-28 08:40:51
|
Revision: 623
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=623&view=rev
Author: andy_miller
Date: 2008-06-28 01:40:57 -0700 (Sat, 28 Jun 2008)
Log Message:
-----------
Add 'Tree' support to CEGUI
Force bjam location for building boost
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2008-06-28 01:46:50 UTC (rev 622)
+++ trunk/python-ogre/ChangeLog.txt 2008-06-28 08:40:57 UTC (rev 623)
@@ -1,3 +1,10 @@
+???? ?? 2008 : SVN Updates..
+============================
+Added CEGUI::Tree to handmadewrapper (Thanks Dermont)
+Change to CEGUI_framework.py to force loading of CEGUIBase lib in the correct mode under Linux - means we don't need to
+patch the CEGUI source...
+
+
June 20 2008: Release 1.2 RC2
============================='
OK, so it's been a while -- what can I say, I have to live in the real world as well as the opensource one :)
Modified: trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-06-28 01:46:50 UTC (rev 622)
+++ trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-06-28 08:40:57 UTC (rev 623)
@@ -62,6 +62,8 @@
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
EventSet_exposer.def( "subscribeEvent", &EventSet_subscribeEventSet,
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
+EventSet_exposer.def( "subscribeEvent", &EventSet_subscribeTree,
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
{ //EventConnection
typedef bp::class_< EventConnection > EventConnection_exposer_t;
@@ -173,7 +175,16 @@
static_cast<const CEGUI::WindowEventArgs&>(args) );
else
boost::python::call<void>(mSubscriber,
- static_cast<const CEGUI::WindowEventArgs&>(args) );
+ static_cast<const CEGUI::WindowEventArgs&>(args) );
+
+ else if (dynamic_cast<CEGUI::TreeEventArgs *>((CEGUI::EventArgs *)&args))
+ if (mMethod.length() > 0 )
+ boost::python::call_method<void>(mSubscriber, mMethod.c_str(),
+ static_cast<const CEGUI::TreeEventArgs&>(args) );
+ else
+ boost::python::call<void>(mSubscriber,
+ static_cast<const CEGUI::TreeEventArgs&>(args) );
+
else
boost::python::call_method<void>(mSubscriber, mMethod.c_str(), args );
return true;
@@ -337,6 +348,13 @@
{
EventConnection *connect = new EventConnection(self->subscribeEvent(name, EventCallback(subscriber, method)));
return connect;
+}
+
+EventConnection * EventSet_subscribeTree(CEGUI::Tree *self , CEGUI::String const & name,
+ PyObject* subscriber, CEGUI::String const & method="")
+{
+ EventConnection *connect = new EventConnection(self->subscribeEvent(name, EventCallback(subscriber, method)));
+ return connect;
}
"""
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-06-28 01:46:50 UTC (rev 622)
+++ trunk/python-ogre/environment.py 2008-06-28 08:40:57 UTC (rev 623)
@@ -448,7 +448,7 @@
[0, sed_ + " 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' "+base+"/configure", '' ],
[0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ "+base+"/boost/python/detail/preprocessor.hpp", ''],
[0, sed_ + ' s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
- [0,"./configure --with-libraries=python --prefix=%s --without-icu" % PREFIX, os.path.join(os.getcwd(), base )],
+ [0,"./configure --with-libraries=python --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam" % PREFIX, os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-06-28 09:06:22
|
Revision: 624
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=624&view=rev
Author: andy_miller
Date: 2008-06-28 02:06:31 -0700 (Sat, 28 Jun 2008)
Log Message:
-----------
Inital set of files from Tim to create Debian Deb's - not yet complete
Added Paths:
-----------
trunk/python-ogre/boost/debian/
trunk/python-ogre/boost/debian/README.Debian
trunk/python-ogre/boost/debian/changelog
trunk/python-ogre/boost/debian/compat
trunk/python-ogre/boost/debian/control
trunk/python-ogre/boost/debian/copyright
trunk/python-ogre/boost/debian/files
trunk/python-ogre/boost/debian/rules
trunk/python-ogre/debian/
trunk/python-ogre/debian/changelog
trunk/python-ogre/debian/compat
trunk/python-ogre/debian/control
trunk/python-ogre/debian/copyright
trunk/python-ogre/debian/files
trunk/python-ogre/debian/python-ogre.postinst.debhelper
trunk/python-ogre/debian/python-ogre.preinst.debhelper
trunk/python-ogre/debian/python-ogre.prerm.debhelper
trunk/python-ogre/debian/python-ogre.substvars
trunk/python-ogre/debian/rules
trunk/python-ogre/debs/
trunk/python-ogre/debs/bjam-debian/
trunk/python-ogre/debs/bjam-debian/changelog
trunk/python-ogre/debs/bjam-debian/compat
trunk/python-ogre/debs/bjam-debian/control
trunk/python-ogre/debs/bjam-debian/copyright
trunk/python-ogre/debs/bjam-debian/docs
trunk/python-ogre/debs/bjam-debian/jam.1
trunk/python-ogre/debs/bjam-debian/jam.man.sgml
trunk/python-ogre/debs/bjam-debian/rules
trunk/python-ogre/debs/gccxml-debian/
trunk/python-ogre/debs/gccxml-debian/Notes
trunk/python-ogre/debs/gccxml-debian/changelog
trunk/python-ogre/debs/gccxml-debian/compat
trunk/python-ogre/debs/gccxml-debian/control
trunk/python-ogre/debs/gccxml-debian/copyright
trunk/python-ogre/debs/gccxml-debian/makeSource.sh
trunk/python-ogre/debs/gccxml-debian/rules
trunk/python-ogre/debs/gccxml-debian/watch
trunk/python-ogre/debs/ogreode-debian/
trunk/python-ogre/debs/ogreode-debian/changelog
trunk/python-ogre/debs/ogreode-debian/compat
trunk/python-ogre/debs/ogreode-debian/control
trunk/python-ogre/debs/ogreode-debian/copyright
trunk/python-ogre/debs/ogreode-debian/dirs
trunk/python-ogre/debs/ogreode-debian/docs
trunk/python-ogre/debs/ogreode-debian/ogreode-dev.dirs
trunk/python-ogre/debs/ogreode-debian/ogreode-dev.install
trunk/python-ogre/debs/ogreode-debian/ogreode1.dirs
trunk/python-ogre/debs/ogreode-debian/ogreode1.install
trunk/python-ogre/debs/ogreode-debian/rules
trunk/python-ogre/debs/pygccxml-debian/
trunk/python-ogre/debs/pygccxml-debian/changelog
trunk/python-ogre/debs/pygccxml-debian/compat
trunk/python-ogre/debs/pygccxml-debian/control
trunk/python-ogre/debs/pygccxml-debian/copyright
trunk/python-ogre/debs/pygccxml-debian/rules
trunk/python-ogre/debs/pyplusplus-debian/
trunk/python-ogre/debs/pyplusplus-debian/changelog
trunk/python-ogre/debs/pyplusplus-debian/compat
trunk/python-ogre/debs/pyplusplus-debian/control
trunk/python-ogre/debs/pyplusplus-debian/copyright
trunk/python-ogre/debs/pyplusplus-debian/rules
Added: trunk/python-ogre/boost/debian/README.Debian
===================================================================
--- trunk/python-ogre/boost/debian/README.Debian (rev 0)
+++ trunk/python-ogre/boost/debian/README.Debian 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,8 @@
+boost-python-index for Debian
+-----------------------------
+
+This package is the extra index stuff needed by python-ogre (and possibly
+others). It does not refer to a real upstream object, we expect this to go way
+once boot-python is updated.
+
+ -- Tim Ansell <mi...@mi...> Fri, 18 Apr 2008 15:37:15 +0930
Added: trunk/python-ogre/boost/debian/changelog
===================================================================
--- trunk/python-ogre/boost/debian/changelog (rev 0)
+++ trunk/python-ogre/boost/debian/changelog 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,6 @@
+boost-python1.34.1-index (0.0.0-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Tim Ansell <mi...@mi...> Fri, 18 Apr 2008 15:37:15 +0930
+
Added: trunk/python-ogre/boost/debian/compat
===================================================================
--- trunk/python-ogre/boost/debian/compat (rev 0)
+++ trunk/python-ogre/boost/debian/compat 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1 @@
+5
Added: trunk/python-ogre/boost/debian/control
===================================================================
--- trunk/python-ogre/boost/debian/control (rev 0)
+++ trunk/python-ogre/boost/debian/control 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,24 @@
+Source: boost-python1.34.1-index
+Priority: extra
+Maintainer: Tim Ansell <tim@unknown>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+Section: libs
+
+Package: libboost-python1.34.1-index-dev
+Section: libdevel
+Architecture: any
+Depends: libboost-python1.34.1-index (= ${Source-Version})
+Description: Extra index stuff for boost-python
+ This package is the extra index stuff needed by python-ogre (and possibly
+ others). It does not refer to a real upstream object, we expect this to go way
+ once boot-python is updated.
+
+Package: libboost-python1.34.1-index
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Extra index stuff for boost-python
+ This package is the extra index stuff needed by python-ogre (and possibly
+ others). It does not refer to a real upstream object, we expect this to go way
+ once boot-python is updated.
Added: trunk/python-ogre/boost/debian/copyright
===================================================================
--- trunk/python-ogre/boost/debian/copyright (rev 0)
+++ trunk/python-ogre/boost/debian/copyright 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,24 @@
+This package was debianized by Tim Ansell <tim@unknown> on
+Fri, 18 Apr 2008 15:37:15 +0930.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+ <put author's name and email here>
+ <likewise for another author>
+
+Copyright:
+
+ <Copyright (C) YYYY Name OfAuthor>
+ <likewise for another author>
+
+License:
+
+ <Put the license of the package here indented by 4 spaces>
+
+The Debian packaging is (C) 2008, Tim Ansell <tim@unknown> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
Added: trunk/python-ogre/boost/debian/files
===================================================================
--- trunk/python-ogre/boost/debian/files (rev 0)
+++ trunk/python-ogre/boost/debian/files 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,12 @@
+libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
+libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
+libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
+libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
+libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
+libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
+libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
+libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
+libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
+libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
+libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
+libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
Added: trunk/python-ogre/boost/debian/rules
===================================================================
--- trunk/python-ogre/boost/debian/rules (rev 0)
+++ trunk/python-ogre/boost/debian/rules 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,114 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+
+
+
+# shared library versions, option 1
+#version=2.0.5
+#major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
+ g++ \
+ ./libs/python/src/indexing/indexing_slice.cpp \
+ ./libs/python/src/indexing/python_iterator.cpp \
+ -I . \
+ -I /usr/include/python2.5 \
+ -shared -Wl,-soname,libboost_python_index-gcc42-1_34_1.so -o libboost_python_index-gcc42-1_34_1.so -fPIC \
+ -lboost_python \
+ -lpython2.5
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+ rm *.so || true
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/tmp
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib
+ cp libboost_python_index-gcc42-1_34_1.so $(CURDIR)/debian/tmp/usr/lib
+ ln -sf /usr/lib/libboost_python_index-gcc42-1_34_1.so $(CURDIR)/debian/tmp/usr/lib/libboost_python_index.so
+
+ mkdir -p $(CURDIR)/debian/tmp/usr/include
+ cp -rvf boost $(CURDIR)/debian/tmp/usr/include
+ rm -rf `find $(CURDIR)/debian/tmp/usr/include -name .svn -type d`
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+
+ dh_movefiles -plibboost-python1.34.1-index-dev /usr/include/boost
+ dh_movefiles -plibboost-python1.34.1-index /usr/lib
+
+# dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Added: trunk/python-ogre/debian/changelog
===================================================================
--- trunk/python-ogre/debian/changelog (rev 0)
+++ trunk/python-ogre/debian/changelog 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,5 @@
+python-ogre (0.0.0-0) unstable; urgency=low
+
+ * First testing version.
+
+ -- Tim 'Mithro' Ansell <mi...@mi...>
Added: trunk/python-ogre/debian/compat
===================================================================
--- trunk/python-ogre/debian/compat (rev 0)
+++ trunk/python-ogre/debian/compat 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1 @@
+5
Added: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control (rev 0)
+++ trunk/python-ogre/debian/control 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,15 @@
+Source: python-ogre
+Section: python
+XS-Python-Version: >=2.4
+Priority: optional
+Maintainer: Tim 'Mithro' Ansell <mi...@mi...>
+Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
+Build-Depends: debhelper (>= 5.0.38)
+Standards-Version: 3.7.2
+
+Package: python-ogre
+Architecture: all
+Depends: ${python:Depends}
+XB-Python-Version: ${python:Versions}
+Description: Python Ogre.
+ Python Ogre.
Added: trunk/python-ogre/debian/copyright
===================================================================
--- trunk/python-ogre/debian/copyright (rev 0)
+++ trunk/python-ogre/debian/copyright 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,30 @@
+This package was debianized by Tim 'Mithro' Ansell <mi...@mi...>.
+
+License:
+
+ Boost Software License - Version 1.0 - August 17th, 2003
+
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is (C) 2008, Tim Ansell <mi...@mi...> and is
+licensed under the GPL, see above.
Added: trunk/python-ogre/debian/files
===================================================================
--- trunk/python-ogre/debian/files (rev 0)
+++ trunk/python-ogre/debian/files 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,2 @@
+python-ogre_0.0.0-0_all.deb python optional
+python-ogre_0.0.0-0_all.deb python optional
Added: trunk/python-ogre/debian/python-ogre.postinst.debhelper
===================================================================
--- trunk/python-ogre/debian/python-ogre.postinst.debhelper (rev 0)
+++ trunk/python-ogre/debian/python-ogre.postinst.debhelper 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,8 @@
+# Automatically added by dh_pycentral
+if which pycentral >/dev/null 2>&1; then
+ pycentral pkginstall python-ogre
+ if grep -qs '^python-ogre$' /var/lib/pycentral/delayed-pkgs; then
+ sed -i '/^python-ogre$/d' /var/lib/pycentral/delayed-pkgs
+ fi
+fi
+# End automatically added section
Added: trunk/python-ogre/debian/python-ogre.preinst.debhelper
===================================================================
--- trunk/python-ogre/debian/python-ogre.preinst.debhelper (rev 0)
+++ trunk/python-ogre/debian/python-ogre.preinst.debhelper 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,68 @@
+# Automatically added by dh_pycentral
+if which pycentral >/dev/null 2>&1 && pycentral --help 2>/dev/null | grep -q pkgprepare; then
+ pycentral pkgprepare python-ogre <<PYEOF
+[python-package]
+format = 1
+python-version = 2.5
+[pycentral]
+version = 0.6.1
+[files]
+/usr/lib/python2.5/site-packages/ogre=d
+/usr/lib/python2.5/site-packages/ogre/gui=d
+/usr/lib/python2.5/site-packages/ogre/gui/CEGUI=d
+/usr/lib/python2.5/site-packages/ogre/gui/CEGUI/_cegui_.so=f
+/usr/lib/python2.5/site-packages/ogre/io=d
+/usr/lib/python2.5/site-packages/ogre/io/OIS=d
+/usr/lib/python2.5/site-packages/ogre/io/OIS/_ois_.so=f
+/usr/lib/python2.5/site-packages/ogre/renderer=d
+/usr/lib/python2.5/site-packages/ogre/renderer/OGRE=d
+/usr/lib/python2.5/site-packages/ogre/renderer/OGRE/_ogre_.so=f
+/usr/share/pyshared/ogre=d
+/usr/share/pyshared/ogre/__init__.py=f
+/usr/share/pyshared/ogre/gui=d
+/usr/share/pyshared/ogre/gui/__init__.py=f
+/usr/share/pyshared/ogre/gui/navi=d
+/usr/share/pyshared/ogre/gui/navi/__init__.py=f
+/usr/share/pyshared/ogre/gui/QuickGUI=d
+/usr/share/pyshared/ogre/gui/QuickGUI/__init__.py=f
+/usr/share/pyshared/ogre/gui/CEGUI=d
+/usr/share/pyshared/ogre/gui/CEGUI/__init__.py=f
+/usr/share/pyshared/ogre/gui/betagui=d
+/usr/share/pyshared/ogre/gui/betagui/__init__.py=f
+/usr/share/pyshared/ogre/io=d
+/usr/share/pyshared/ogre/io/__init__.py=f
+/usr/share/pyshared/ogre/io/OIS=d
+/usr/share/pyshared/ogre/io/OIS/__init__.py=f
+/usr/share/pyshared/ogre/renderer=d
+/usr/share/pyshared/ogre/renderer/OGRE=d
+/usr/share/pyshared/ogre/renderer/OGRE/__init__.py=f
+/usr/share/pyshared/ogre/renderer/OGRE/sf_OIS.py=f
+/usr/share/pyshared/ogre/renderer/OGRE/sf_utils.py=f
+/usr/share/pyshared/ogre/renderer/OGRE/named_tuple.py=f
+/usr/share/pyshared/ogre/renderer/OGRE/_ogre_exceptions_.py=f
+/usr/share/pyshared/ogre/renderer/__init__.py=f
+/usr/share/pyshared/ogre/addons=d
+/usr/share/pyshared/ogre/addons/__init__.py=f
+/usr/share/pyshared/ogre/addons/ofusion=d
+/usr/share/pyshared/ogre/addons/ofusion/__init__.py=f
+/usr/share/pyshared/ogre/addons/theora=d
+/usr/share/pyshared/ogre/addons/theora/__init__.py=f
+/usr/share/pyshared/ogre/addons/plib=d
+/usr/share/pyshared/ogre/addons/plib/__init__.py=f
+/usr/share/pyshared/ogre/addons/cadunetree=d
+/usr/share/pyshared/ogre/addons/cadunetree/__init__.py=f
+/usr/share/pyshared/ogre/addons/particleuniverse=d
+/usr/share/pyshared/ogre/addons/particleuniverse/__init__.py=f
+/usr/share/pyshared/ogre/addons/watermesh=d
+/usr/share/pyshared/ogre/addons/watermesh/__init__.py=f
+/usr/share/pyshared/ogre/sound=d
+/usr/share/pyshared/ogre/sound/__init__.py=f
+/usr/share/pyshared/ogre/sound/OgreAL=d
+/usr/share/pyshared/ogre/sound/OgreAL/__init__.py=f
+/usr/share/pyshared/Python_Ogre-1.1.a.egg-info=f
+PYEOF
+else
+ mkdir -p /var/lib/pycentral
+ echo python-ogre >> /var/lib/pycentral/delayed-pkgs
+fi
+# End automatically added section
Added: trunk/python-ogre/debian/python-ogre.prerm.debhelper
===================================================================
--- trunk/python-ogre/debian/python-ogre.prerm.debhelper (rev 0)
+++ trunk/python-ogre/debian/python-ogre.prerm.debhelper 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,38 @@
+# Automatically added by dh_pycentral
+if [ "$1" = remove ]; then
+if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
+ pycentral pkgremove python-ogre
+else
+ flist=$(tempfile)
+ slist=$(tempfile)
+ dpkg -L python-ogre | tee $flist | \
+ while read n; do
+ case "$n" in
+ /usr/share/pyshared/*)
+ n2=${n#/usr/share/pyshared/*}
+ case "$n" in
+ *.py) echo "p $n";;
+ *) [ -d "$n" ] && echo "d $n2" || echo "f $n2"
+ esac
+ ;;
+ *) continue
+ esac
+ done > $slist
+ if [ -s $slist ]; then
+ for d in /usr/lib/python[0-9].[0-9]/????-packages; do
+ case "$d" in */python2.1/*|*/python2.2/*) continue; esac
+ while read t n; do
+ case "$t" in
+ p) rm -f $d/$n $d/${n}[co];;
+ d) rmdir $d/$n 2>/dev/null || true;;
+ *) rm -f $d/$n
+ esac
+ done < $slist
+ done
+ fi
+ awk '/\/usr\/share\/pyshared/ {next} /\.py$/ {print $0"c\n" $0"o"}' $flist \
+ | xargs -r rm -f >&2
+ rm -f $flist $slist
+fi
+fi
+# End automatically added section
Added: trunk/python-ogre/debian/python-ogre.substvars
===================================================================
--- trunk/python-ogre/debian/python-ogre.substvars (rev 0)
+++ trunk/python-ogre/debian/python-ogre.substvars 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,3 @@
+python:Versions=2.5
+python:Provides=python2.5-ogre
+python:Depends=python-central (>= 0.6.1), python (>= 2.5), python (<< 2.6)
Added: trunk/python-ogre/debian/rules
===================================================================
--- trunk/python-ogre/debian/rules (rev 0)
+++ trunk/python-ogre/debian/rules 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,70 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+PYTHON := /usr/bin/python
+#PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+PYVERS = 2.5 #$(shell pyversions -vr)
+
+build:
+# touch $@
+# python BuildModule.py -g -c ois
+# python BuildModule.py -g -c cegui
+# python BuildModule.py -g -c noise
+# python BuildModule.py -g -c ogre
+# python BuildModule.py -g -c ogreode
+
+build-python%:
+ dh_testdir
+ python$* setup.py build
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-python*
+ rm -rf build
+ -find . -name '*.py[co]' | xargs rm -f
+ dh_clean
+
+install: build $(PYVERS:%=install-python%)
+
+install-python%:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ python$* setup.py install --root=$(CURDIR)/debian/python-ogre
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs README ChangeLog.txt
+ dh_pycentral
+ dh_compress -X.py
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+prep:
+ # Build and install the lastest gccxml
+ cd ..; python python-ogre/BuildModule.py -r -b gccxml
+ # Build and install the lastest pygccxml
+ cd ..; python python-ogre/BuildModule.py -r -b pygccxml
+ # Build and install the extra boost stuff we need
+ cd boost; fakeroot ./debian/rules binary-arch
+ sudo dpkg --install libboost-python1.34.1-index*.deb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure prep build-python2.5
Added: trunk/python-ogre/debs/bjam-debian/changelog
===================================================================
--- trunk/python-ogre/debs/bjam-debian/changelog (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/changelog 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,111 @@
+boost-jam (3.1.16-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Tim 'Mithro' Ansell <mi...@mi...> Fri, 18 Apr 2008 23:34:17 +0200
+
+boost-jam (3.1.14-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Domenico Andreoli <ca...@de...> Sun, 13 May 2007 23:34:17 +0200
+
+boost-jam (3.1.13-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Domenico Andreoli <ca...@de...> Tue, 7 Nov 2006 15:21:50 +0100
+
+boost-jam (3.1.12-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Rene Rivera <gr...@re...> Sat, 01 Oct 2005 00:00:00 +0000
+
+boost-jam (3.1.11-1) unstable; urgency=low
+
+ * New upstream release.
+
+ * The Debian Boost Team now maintains the package.
+
+ -- Domenico Andreoli <ca...@de...> Thu, 22 Dec 2005 12:55:20 +0100
+
+boost-jam (3.1.10-1) unstable; urgency=low
+
+ * New upstream release.
+
+ * debian/copyright: Add location of upstream sources.
+ Closes: #257871.
+
+ * Install as alternative for "jam". Closes: #256735.
+
+ -- Steve M. Robbins <sm...@de...> Wed, 7 Jul 2004 20:03:13 -0400
+
+boost-jam (3.1.9-3) unstable; urgency=low
+
+ * First upload to Debian from separate boost-jam package (formerly,
+ bjam was built from the boost source package).
+
+ * Changes from upstream's debian build:
+ - change source package to boost-jam, to match upstream tarball name
+ - update build-depends to debhelper v4
+ - update standards-version to 3.6.1
+ - replace content of debian/copyright with LICENSE_1_0.txt
+ - install "bjam.1" (not "jam.1") as manual page
+ - remove x86 assumption in build process
+
+ -- Steve M. Robbins <sm...@de...> Sat, 29 May 2004 11:14:05 -0400
+
+bjam (3.1.9-2) unstable; urgency=low
+
+ * Use default value of BOOST_BUILD_PATH is not is set in environment.
+
+ -- Vladimir Prus <gh...@zi...> Wed, 17 Dec 2003 16:44:35 +0300
+
+bjam (3.1.9-1) unstable; urgency=low
+
+ * Implement NATIVE_FILE builtin and several native rules.
+
+ -- Vladimir Prus <gh...@zi...> Thu, 11 Dec 2003 13:15:26 +0300
+
+bjam (3.1.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Vladimir Prus <gh...@zi...> Tue, 4 Nov 2003 20:50:43 +0300
+
+bjam (3.1.7-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Vladimir Prus <gh...@zi...> Thu, 11 Sep 2003 10:45:44 +0400
+
+bjam (3.1.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Vladimir Prus <gh...@zi...> Tue, 1 Jul 2003 09:12:18 +0400
+
+bjam (3.1.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Vladimir Prus <gh...@zi...> Mon, 19 May 2003 14:05:13 +0400
+
+bjam (3.1.3-2) unstable; urgency=low
+
+ * Changed Debian package to be similar to Jam's package.
+
+ -- Vladimir Prus <gh...@cs...> Thu, 10 Oct 2002 18:43:26 +0400
+
+bjam (3.1.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Vladimir Prus <gh...@zi...> Fri, 4 Oct 2002 18:16:54 +0400
+
+bjam (3.1.2-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Vladimir Prus <gh...@cs...> Wed, 14 Aug 2002 14:08:00 +0400
Added: trunk/python-ogre/debs/bjam-debian/compat
===================================================================
--- trunk/python-ogre/debs/bjam-debian/compat (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/compat 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1 @@
+4
Added: trunk/python-ogre/debs/bjam-debian/control
===================================================================
--- trunk/python-ogre/debs/bjam-debian/control (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/control 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,20 @@
+Source: boost-jam
+Section: devel
+Priority: optional
+Maintainer: Debian Boost Team <pkg...@li...>
+Uploaders: Steve M. Robbins <sm...@de...>, Domenico Andreoli <ca...@de...>, Christophe Prud'homme <pru...@mi...>
+Build-Depends: debhelper (>= 4), docbook-to-man, bison
+Standards-Version: 3.7.2
+
+Package: bjam
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: jam (<< 2.3.2-3)
+Description: Software build tool
+ Boost.Jam (BJam) is a portable build tool with its own interpreted language,
+ which allows to implement rather complex logic in a readable way and without
+ resorting to external programs. It is a descendant of Jam/MR tool modified to
+ suit the needs of Boost.Build. In particular, modules and rule parameters
+ were added, as well as several new builtins.
+ .
+ Homepage: http://www.boost.org/tools/build/jam_src/
Added: trunk/python-ogre/debs/bjam-debian/copyright
===================================================================
--- trunk/python-ogre/debs/bjam-debian/copyright (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/copyright 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,51 @@
+Upstream boost-jam sources obtained from the Boost SourceForge project page
+ http://sourceforge.net/project/showfiles.php?group_id=7586
+
+This package was debianized by Vladimir Prus <gh...@cs...> on
+Wed, 17 July 2002, 19:27:00 +0400.
+
+Copyright:
+
+ /+\
+ +\ Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc.
+ \+/
+
+ This is Release 2.4 of Jam/MR, a make-like program.
+
+ License is hereby granted to use this software and distribute it
+ freely, as long as this copyright notice is retained and modifications
+ are clearly marked.
+
+ ALL WARRANTIES ARE HEREBY DISCLAIMED.
+
+Some portions are also:
+
+ Copyright 2001-2006 David Abrahams.
+ Copyright 2002-2006 Rene Rivera.
+ Copyright 2003-2006 Vladimir Prus.
+
+ Distributed under the Boost Software License, Version 1.0.
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
Added: trunk/python-ogre/debs/bjam-debian/docs
===================================================================
--- trunk/python-ogre/debs/bjam-debian/docs (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/docs 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,2 @@
+index.html
+jam
Added: trunk/python-ogre/debs/bjam-debian/jam.1
===================================================================
--- trunk/python-ogre/debs/bjam-debian/jam.1 (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/jam.1 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,109 @@
+.TH "JAM" "1"
+.SH "NAME"
+Jam/MR \(em Make(1) Redux
+.SH "SYNOPSIS"
+.PP
+\fBjam\fR [\fB-a\fP] [\fB-n\fP] [\fB-v\fP] [\fB-d \fIdebug\fR\fP] [\fB-f \fIjambase\fR\fP] [\fB-j \fIjobs\fR\fP] [\fB-o \fIactionsfile\fR\fP] [\fB-s \fIvar\fR=\fIvalue\fR\fP] [\fB-t \fItarget\fR\fP] [\fB\fItarget\fR\fP \&...]
+.SH "DESCRIPTION"
+.PP
+Jam is a program construction tool, like make(1).
+.PP
+Jam recursively builds target files from source files, using
+dependency information and updating actions expressed in the
+Jambase file, which is written in jam's own interpreted language.
+The default Jambase is compiled into jam and provides a
+boilerplate for common use, relying on a user-provide file
+"Jamfile" to enumerate actual targets and sources.
+.SH "OPTIONS"
+.IP "\fB-a\fP" 10
+Build all targets anyway, even if they are up-to-date.
+.IP "\fB-d \fIn\fR\fP" 10
+Enable cummulative debugging levels from 1 to
+\fIn\fR. Interesting values are:
+
+
+.RS
+.IP "1" 10
+.PP
+Show
+actions (the default)
+.IP "2" 10
+.PP
+Show
+"quiet" actions and display all action
+text
+.IP "3" 10
+.PP
+Show
+dependency analysis, and target/source
+timestamps/paths
+.IP "4" 10
+.PP
+Show shell
+arguments
+.IP "5" 10
+.PP
+Show rule
+invocations and variable
+expansions
+.IP "6" 10
+.PP
+Show
+directory/header file/archive
+scans
+.IP "7" 10
+.PP
+Show
+variable settings
+.IP "8" 10
+.PP
+Show
+variable fetches
+.IP "9" 10
+.PP
+Show
+variable manipulation, scanner
+tokens
+.RE
+
+.IP "\fB-d +\fIn\fR\fP" 10
+Enable debugging level \fIn\fR.
+.IP "\fB-d 0\fP" 10
+Turn off all debugging levels. Only errors are not
+suppressed.
+.IP "\fB-f \fIjambase\fR\fP" 10
+Read \fIjambase\fR instead of using the
+built-in Jambase. Only one \fB-f\fP flag is permitted,
+but the \fIjambase\fR may explicitly include other
+files.
+.IP "\fB-j \fIn\fR\fP" 10
+Run up to \fIn\fR shell commands concurrently
+(UNIX and NT only). The default is 1.
+.IP "\fB-n\fP" 10
+Don't actually execute the updating actions, but do
+everything else. This changes the debug level default to
+\fB-d2\fP.
+.IP "\fB-o \fIfile\fR\fP" 10
+Write the updating actions to the specified file
+instead of running them (or outputting them, as on the
+Mac).
+.IP "\fB-s \fIvar\fR=\fIvalue\fR\fP" 10
+Set the variable \fIvar\fR to
+\fIvalue\fR, overriding both internal variables and
+variables imported from the environment.
+.IP "\fB-t \fItarget\fR\fP" 10
+Rebuild \fItarget\fR and everything that
+depends on it, even if it is up-to-date.
+.IP "\fB-v\fP" 10
+Print the version of jam and exit.
+.SH "SEE ALSO"
+.PP
+Jam is documented fully in HTML pages available on Debian
+systems from
+\fB/usr/share/doc/jam/Jam.html\fP.
+.SH "AUTHOR"
+.PP
+This manual page was created by Yann Dirson di...@de... from
+the \fBJam.html\fP documentation, for the \fBDebian GNU/Linux\fP system
+(but may be used by others).
+.\" created by instant / docbook-to-man, Fri 18 Apr 2008, 13:59
Added: trunk/python-ogre/debs/bjam-debian/jam.man.sgml
===================================================================
--- trunk/python-ogre/debs/bjam-debian/jam.man.sgml (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/jam.man.sgml 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,236 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+ -->
+
+ <!ENTITY dhfirstname "<firstname>Yann</firstname>">
+ <!ENTITY dhsurname "<surname>Dirson</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>mai 23, 2001</date>">
+ <!ENTITY dhemail "<email>di...@de...</email>">
+ <!ENTITY dhusername "Yann Dirson">
+ <!ENTITY dhpackage "jam">
+
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2001</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>JAM</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>Jam/MR</refname>
+ <refpurpose>Make(1) Redux</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>jam</command>
+
+ <arg><option>-a</option></arg>
+ <arg><option>-n</option></arg>
+ <arg><option>-v</option></arg>
+
+ <arg><option>-d <replaceable/debug/</option></arg>
+ <arg><option>-f <replaceable/jambase/</option></arg>
+ <arg><option>-j <replaceable/jobs/</option></arg>
+ <arg><option>-o <replaceable/actionsfile/</option></arg>
+ <arg><option>-s <replaceable/var/=<replaceable/value/</option></arg>
+ <arg><option>-t <replaceable/target/</option></arg>
+
+ <arg repeat><option><replaceable/target/</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>Jam is a program construction tool, like make(1).</para>
+
+ <para>Jam recursively builds target files from source files, using
+ dependency information and updating actions expressed in the
+ Jambase file, which is written in jam's own interpreted language.
+ The default Jambase is compiled into jam and provides a
+ boilerplate for common use, relying on a user-provide file
+ "Jamfile" to enumerate actual targets and sources.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><option/-a/</term>
+ <listitem>
+ <para>Build all targets anyway, even if they are up-to-date.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-d <replaceable/n/</option></term>
+ <listitem>
+ <para>Enable cummulative debugging levels from 1 to
+ <replaceable/n/. Interesting values are:
+
+ <glosslist>
+ <glossentry><glossterm/1/ <glossdef><simpara/Show
+ actions (the default)/</glossdef></glossentry>
+
+ <glossentry><glossterm/2/ <glossdef><simpara/Show
+ "quiet" actions and display all action
+ text/</glossdef></glossentry>
+
+ <glossentry><glossterm/3/ <glossdef><simpara>Show
+ dependency analysis, and target/source
+ timestamps/paths</simpara></glossdef></glossentry>
+
+ <glossentry><glossterm/4/ <glossdef><simpara/Show shell
+ arguments/</glossdef></glossentry>
+
+ <glossentry><glossterm/5/ <glossdef><simpara/Show rule
+ invocations and variable
+ expansions/</glossdef></glossentry>
+
+ <glossentry><glossterm/6/ <glossdef><simpara>Show
+ directory/header file/archive
+ scans</simpara></glossdef></glossentry>
+
+ <glossentry><glossterm/7/ <glossdef><simpara/Show
+ variable settings/</glossdef></glossentry>
+
+ <glossentry><glossterm/8/ <glossdef><simpara/Show
+ variable fetches/</glossdef></glossentry>
+
+ <glossentry><glossterm/9/ <glossdef><simpara/Show
+ variable manipulation, scanner
+ tokens/</glossdef></glossentry>
+ </glosslist>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-d +<replaceable/n/</option></term>
+ <listitem>
+ <para>Enable debugging level <replaceable/n/.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option/-d 0/</term>
+ <listitem>
+ <para>Turn off all debugging levels. Only errors are not
+ suppressed.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-f <replaceable/jambase/</option></term>
+ <listitem>
+ <para>Read <replaceable/jambase/ instead of using the
+ built-in Jambase. Only one <option/-f/ flag is permitted,
+ but the <replaceable/jambase/ may explicitly include other
+ files.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-j <replaceable/n/</option></term>
+ <listitem>
+ <para>Run up to <replaceable/n/ shell commands concurrently
+ (UNIX and NT only). The default is 1.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option/-n/</term>
+ <listitem>
+ <para>Don't actually execute the updating actions, but do
+ everything else. This changes the debug level default to
+ <option/-d2/.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-o <replaceable/file/</option></term>
+ <listitem>
+ <para>Write the updating actions to the specified file
+ instead of running them (or outputting them, as on the
+ Mac).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-s <replaceable/var/=<replaceable/value/</option></term>
+ <listitem>
+ <para>Set the variable <replaceable/var/ to
+ <replaceable/value/, overriding both internal variables and
+ variables imported from the environment. </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-t <replaceable/target/</option></term>
+ <listitem>
+ <para>Rebuild <replaceable/target/ and everything that
+ depends on it, even if it is up-to-date.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option/-v/</term>
+ <listitem>
+ <para>Print the version of jam and exit.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>Jam is documented fully in HTML pages available on Debian
+ systems from
+ <filename>/usr/share/doc/jam/Jam.html</filename>.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This manual page was created by &dhusername; &dhemail; from
+ the <filename/Jam.html/ documentation, for the &debian; system
+ (but may be used by others).</para>
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+sgml-omittag:t
+sgml-shorttag:t
+End:
+-->
Added: trunk/python-ogre/debs/bjam-debian/rules
===================================================================
--- trunk/python-ogre/debs/bjam-debian/rules (rev 0)
+++ trunk/python-ogre/debs/bjam-debian/rules 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,64 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# TODO: figure out how to get debugging symbols into "bjam" executable.
+# (Debian Policy, 10.1)
+
+build: build-stamp
+build-stamp: debian/bjam.1
+ dh_testdir
+
+ sh build.sh gcc && mv bin.*/bjam .
+
+ touch build-stamp
+
+%.1: %.man.sgml
+ docbook-to-man $< > $@
+
+debian/bjam.1: debian/jam.1
+ sed -e 's#doc/jam/Jam.html#__HTMLDOCLOCATION__#' \
+ -e 's/\<J\([aA][mM]\)\>/BJ\1/g' \
+ -e 's/\<j\([aA][mM]\)\>/bj\1/g' \
+ -e 's#__HTMLDOCLOCATION__#doc/bjam/Jam.html#' \
+ $< > $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ rm -rf bin.* bootstrap
+ rm -f jam0 bjam debian/jam.1 debian/bjam.1
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install -pbjam bjam usr/bin
+ dh_install -pbjam debian/bjam.1 usr/share/man/man1
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs Jambase
+ dh_installchangelogs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Added: trunk/python-ogre/debs/gccxml-debian/Notes
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/Notes (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/Notes 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,9 @@
+Build from upstream CVS snapshot
+
+ sh debian/makeSource.sh
+
+Build
+
+ cd ../gccxml-0.7.0+cvs20060311
+ debuild
+
Added: trunk/python-ogre/debs/gccxml-debian/changelog
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/changelog (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/changelog 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,39 @@
+gccxml (0.7.0+%%SHORTDATE%%-0) unstable; urgency=low
+
+ * New cvs snapshot.
+
+ -- Tim 'Mithro' Ansell <mi...@mi...> %%LONGDATE%%
+
+gccxml (0.7.0+cvs20070318-1) unstable; urgency=low
+
+ * New cvs snapshot.
+
+ * debian/control: Update Standards-Version to 3.7.2.2 (no changes
+ required).
+
+ * GCC/config.guess:
+ * GCC/config.sub: Replace with current version from package
+ autotools-dev. Closes: #370294.
+
+ -- Steve M. Robbins <sm...@de...> Sun, 18 Mar 2007 22:33:51 -0500
+
+gccxml (0.7.0+cvs20060311-2) unstable; urgency=low
+
+ * GCC/config_cmake/gcc_platform.sh: quote value of ${target_cpu_default}
+ as it may contain parentheses. Closes: #358467.
+
+ -- Steve M. Robbins <sm...@de...> Tue, 28 Mar 2006 23:13:09 -0500
+
+gccxml (0.7.0+cvs20060311-1) unstable; urgency=low
+
+ * Initial upload. Closes: #189927.
+
+ * Build from CVS (snapshot as of 2006-03-11) for GCC 4 support;
+ c.f. http://public.kitware.com/pipermail/gccxml/2005-October/000681.html
+
+ * Source in .orig.tar.gz is modified from upstream: removed file
+ GCC/libiberty/xatexit.c and directory GCC_XML/Support/Borland as
+ there is no clear permission to distribute all these files.
+
+ -- Steve M. Robbins <sm...@de...> Sun, 12 Mar 2006 17:01:48 -0500
+
Added: trunk/python-ogre/debs/gccxml-debian/compat
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/compat (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/compat 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1 @@
+5
Added: trunk/python-ogre/debs/gccxml-debian/control
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/control (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/control 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,17 @@
+Source: gccxml
+Section: devel
+Priority: optional
+Maintainer: Steve M. Robbins <sm...@de...>
+Build-Depends: debhelper (>= 5), cmake, chrpath
+Standards-Version: 3.7.2.2
+
+Package: gccxml
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, g++
+Description: XML output extension to GCC
+ There is one open-source C++ parser, the C++ front-end to GCC, which
+ is currently able to deal with the language in its entirety. The
+ purpose of the GCC-XML extension is to generate an XML description of
+ a C++ program from GCC's internal representation. Since XML is easy to
+ parse, other development tools will be able to work with C++ programs
+ without the burden of a complicated C++ parser.
Added: trunk/python-ogre/debs/gccxml-debian/copyright
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/copyright (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/copyright 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,267 @@
+GCCXML was Debianized on 2006-03-12 by Steven Robbins <sm...@de...>,
+building on previous work by Maciej Dems.
+
+Source may be obtained from http://www.gccxml.org/HTML/Download.html.
+
+GCCXML comprises a modified version of the GNU GCC front end, together
+with some extra logic from Kitware, Inc. In addition to that, there
+are several pieces of platform-support code from other sources.
+
+This file lists all copyright and license notices found in the sources
+with two exceptions: the entire directory GCC_XML/Support/Borland has
+been removed from the original sources, as it contains some files that
+are not redistributable under the Debian Free Software Guidelines.
+The copyright notices from this directory are not reported here.
+Similarly, GCC/libiberty/xatexit.c is removed as it has no explicit
+permission to distribute.
+
+
+
+ Directory GCC -- Modified Gnu GCC
+ ---------------------------------
+
+Most of the contents here is copyrighted by Free Software Foundation,
+Inc. and available under the terms of the GNU GPL; either version 2,
+or (at your option) any later version. On Debian systems, the full
+text of the GNU GPL version 2 may be found in file
+/usr/share/common-licenses/GPL-2.
+
+The exceptions are: (1) modifications done by Kitware Inc, covered
+under the Kitware license (below), and (2) the following files (paths
+relative to GCC):
+
+
+ gcc/config/i386/gmon-sol2.c
+ gcc/config/sparc/gmon-sol2.c
+ ----------------------------
+
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+
+BSD license [see /usr/share/common-licenses/BSD], but with clause 3
+rescinded on 22 July 1999.
+
+
+ gcc/gmon.c
+ ----------
+
+ * Copyright (c) 1991, 1998 The Regents of the University of California.
+ * All rights reserved.
+
+BSD license [see /usr/share/common-licenses/BSD], but with clause 3
+rescinded on 22 July 1999.
+
+
+ libiberty/bsearch.c
+ -------------------
+
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+
+BSD license [see /usr/share/common-licenses/BSD], but with clause 3
+rescinded on 22 July 1999.
+
+
+ libiberty/random.c
+ ------------------
+
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+
+BSD license [see /usr/share/common-licenses/BSD], but with clause 3
+rescinded on 22 July 1999.
+
+
+ libiberty/strcasecmp.c
+ libiberty/strncasecmp.c
+ -----------------------
+
+ * Copyright (c) 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific written prior permission. This software
+ * is provided ``as is'' without express or implied warranty.
+
+
+ libiberty/strtol.c
+ libiberty/strtoul.c
+ -------------------
+
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+
+BSD license [see /usr/share/common-licenses/BSD], but with clause 3
+rescinded on 22 July 1999.
+
+
+ gcc/config/m68k/fpgnulib.c
+ gcc/floatlib.c
+ --------------------------
+
+** Copyright (C) 1991 by Pipeline Associates, Inc. All rights reserved.
+** Permission is granted to do *anything* you want with this file,
+** commercial or otherwise, provided this message remains intact. So there!
+
+
+ gcc/config/m68k/math-68881.h
+ ----------------------------
+
+* <math-68881.h> last modified: 23 May 1992. *
+* *
+* Copyright (C) 1989 by Matthew Self. *
+* You may freely distribute verbatim copies of this software *
+* provided that this copyright notice is retained in all copies. *
+* You may distribute modifications to this software under the *
+* conditions above if you also clearly note such modifications *
+* with their author and date. *
+
+
+ gcc/cp/xml.c
+ ------------
+
+ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
+ See Copyright.txt for details.
+
+The content of Copyright.txt is reproduced below.
+
+
+
+ Directory GCC_XML -- Kitware Sources
+ ------------------------------------
+
+Most of the contents here is copyrighted by Kitware Inc. and available
+under the following terms:
+
+-------------------------- Copyright.txt --------------------------------
+GCC-XML version 0.7.0
+Copyright (c) 2002-2004 Kitware, Inc., Insight Consortium.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ * The names of Kitware, Inc., the Insight Consortium, or the names of any
+ consortium members, or of any contributors, may not be used to endorse or
+ promote products derived from this software without specific prior written
+ permission.
+
+ * Modified source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-------------------------- Copyright.txt --------------------------------
+
+The exceptions are the following files (paths relative to GCC_XML):
+
+
+ KWSys/RegularExpression.cxx
+ KWSys/RegularExpression.hxx
+ ---------------------------
+
+// Copyright (C) 1991 Texas Instruments Incorporated.
+//
+// Permission is granted to any individual or institution to use, copy, modify
+// and distribute this software, provided that this complete copyright and
+// permission notice is maintained, intact, in all copies and supporting
+// documentation.
+
+
+ * Copyright (c) 1986 by University of Toronto.
+ * Written by Henry Spencer. Not derived from licensed software.
+ *
+ * Permission is granted to anyone to use this software for any
+ * purpose on any computer system, and to redistribute it freely,
+ * subject to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of
+ * this software, no matter how awful, even if they arise
+ * from defects in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either
+ * by explicit claim or by omission.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not
+ * be misrepresented as being the original software.
+
+
+ KWSys/hash_fun.hxx.in
+ KWSys/hash_map.hxx.in
+ KWSys/hash_set.hxx.in
+ KWSys/hashtable.hxx.in
+ ----------------------
+
+ * Copyright (c) 1996
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation. Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose. It is provided "as is" without express or implied warranty.
+ *
+ *
+ * Copyright (c) 1994
+ * Hewlett-Packard Company
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation. Hewlett-Packard Company makes no
+ * representations about the suitability of this software for any
+ * purpose. It is provided "as is" without express or implied warranty.
+
+
+ Support/Borland
+ ---------------
+
+This entire directory is completely removed from the dfsg tar file
+since it contains files with no license or no permission to distribute.
+
+
+ Support/GCC
+ -----------
+
+Contains some files copyrighted by Free Software Foundation, Inc. and
+available under the terms of the GNU GPL; either version 2, or (at
+your option) any later version. On Debian systems, the full text of
+the GNU GPL version 2 may be found in file
+/usr/share/common-licenses/GPL-2.
+
+
+ Support/MIPSpro/7.3/iomanip
+ ---------------------------
+
+ * Copyright (c) 1998
+ * Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation. Silicon Graphics makes no
+ * representations about the suitability of this software for any
+ * purpose. It is provided "as is" without express or implied warranty.
+
Added: trunk/python-ogre/debs/gccxml-debian/makeSource.sh
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/makeSource.sh (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/makeSource.sh 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+set -e
+
+VERSION=0.7.0
+DATE=`date +%Y%m%d`
+
+cvsdirname=`pwd`
+dirname=gccxml-${VERSION}+cvs${DATE}.orig
+tarname=gccxml_${VERSION}+cvs${DATE}.orig.tar.gz
+
+cvs -z3 export -D ${DATE} -d ${dirname} gccxml
+
+# Remove files with (a) no license, or (b) non-free license.
+#
+rm -rf ${dirname}/GCC_XML/Support/Borland
+rm -f ${dirname}/GCC/libiberty/xatexit.c
+
+# Build tarball
+#
+rm -rf ../${dirname}
+mv ${dirname} ..
+cd ..
+tar czf ${tarname} ${dirname}
+
Added: trunk/python-ogre/debs/gccxml-debian/rules
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/rules (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/rules 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,99 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+BUILDDIR=build
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+ dh_installdirs
+ test -d $(BUILDDIR) || mkdir $(BUILDDIR)
+ cd $(BUILDDIR); cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=../debian/gccxml/usr -DGCCXML_DOC_DIR:STRING=/share/doc/gccxml
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
+ cd $(BUILDDIR); $(MAKE)
+ chrpath -d build/bin/gccxml build/bin/gccxml_cc1plus
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+ #-$(MAKE) clean
+ rm -rf $(BUILDDIR)
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+ # Add here commands to install the package into debian/gccxml.
+ cd $(BUILDDIR); $(MAKE) install
+ ln -s gccxml.1 $(CURDIR)/debian/gccxml/usr/share/man/man1/gccxml_cc1plus.1
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs README
+ dh_installexamples
+# dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Added: trunk/python-ogre/debs/gccxml-debian/watch
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/watch (rev 0)
+++ trunk/python-ogre/debs/gccxml-debian/watch 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,2 @@
+version=2
+http://www.gccxml.org/HTML/Download.html (?:.*/)?gccxml-([\d\.]*)\.tar\.gz debian uupdate
Added: trunk/python-ogre/debs/ogreode-debian/changelog
===================================================================
--- trunk/python-ogre/debs/ogreode-debian/changelog (rev 0)
+++ trunk/python-ogre/debs/ogreode-debian/changelog 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1,6 @@
+ogreode (1.2.0+$$SHORTDATE$$) unstable; urgency=low
+
+ * Initial release
+
+ -- Tim Ansell <mi...@mi...> $$LONGDATE$$
+
Added: trunk/python-ogre/debs/ogreode-debian/compat
===================================================================
--- trunk/python-ogre/debs/ogreode-debian/compat (rev 0)
+++ trunk/python-ogre/debs/ogreode-debian/compat 2008-06-28 09:06:31 UTC (rev 624)
@@ -0,0 +1 @@
+5
Added: trunk/python-ogre/debs/ogreode-debian/control
=================================================...
[truncated message content] |
|
From: <and...@us...> - 2008-07-01 07:26:50
|
Revision: 627
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=627&view=rev
Author: andy_miller
Date: 2008-07-01 00:26:57 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Few tweaks for latest Ogre SVN R7695
Modified Paths:
--------------
trunk/python-ogre/PythonOgreInstallCreator.iss
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
trunk/python-ogre/demos/caelum/Demo_Caelum01.py
Modified: trunk/python-ogre/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.iss 2008-06-28 23:57:01 UTC (rev 626)
+++ trunk/python-ogre/PythonOgreInstallCreator.iss 2008-07-01 07:26:57 UTC (rev 627)
@@ -3,19 +3,19 @@
;
[Setup]
AppName=Python-Ogre
-AppVerName=Python-Ogre 1.2 RC1
+AppVerName=Python-Ogre 1.2 RC2
DefaultDirName=C:\PythonOgre
DefaultGroupName=Python-Ogre
OutputBaseFilename=PythonOgreInstaller
OutputDir=C:\temp
SourceDir=C:\Development\PythonOgreRelease
-VersionInfoDescription=Release 1.2 RC1 of Python-Ogre
+VersionInfoDescription=Release 1.2 RC2 of Python-Ogre
AllowNoIcons=true
AppPublisher=OpenSource (Andy and Team)
AppPublisherURL=http://www.python-ogre.org
AppSupportURL=http://www.python-ogre.org
AppUpdatesURL=http://www.python-ogre.org
-AppVersion=1.2.0
+AppVersion=1.2.1
LicenseFile=LICENSE.GPL
Compression=lzma
InfoBeforeFile=InstallWarning.rtf
@@ -23,13 +23,13 @@
SolidCompression=true
AppCopyright=LPGL
VersionInfoCompany=OpenSource (Andy and Team)
-VersionInfoTextVersion=1.2.0
+VersionInfoTextVersion=1.2.1
VersionInfoCopyright=PythonOgre Development Team
RestartIfNeededByRun=false
UninstallDisplayName=PythonOgre
WizardImageFile=compiler:WizModernImage-IS.bmp
WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp
-VersionInfoVersion=1.2.0
+VersionInfoVersion=1.2.1
[Files]
; base files, demos and tools
Source: *; DestDir: {app}
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-06-28 23:57:01 UTC (rev 626)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-07-01 07:26:57 UTC (rev 627)
@@ -115,7 +115,10 @@
# functions that take pointers to pointers
main_ns.class_( 'VertexElement').member_functions('baseVertexPointerToElement').exclude() ## now as a transformed funct
- mb.global_ns.mem_fun('::Ogre::InstancedGeometry::BatchInstance::getObjectsAsArray').exclude()
+
+ if environment.ogre.version =="1.4":
+ mb.global_ns.mem_fun('::Ogre::InstancedGeometry::BatchInstance::getObjectsAsArray').exclude()
+
#all constructors in this class are private, also some of them are public.
main_ns.free_functions ('any_cast').exclude () #not relevant for Python
@@ -227,14 +230,14 @@
if func.virtuality == declarations.VIRTUALITY_TYPES.PURE_VIRTUAL:
continue
func.exclude()
- print '{*} function "%s" is marked as internal' % declarations.full_name( func )
+ print '{*} function "%s" is marked as internal' % declarations.full_name( func )
# this change was for 1.7 but also needed for 1.4
noncopy=['Camera','Frustum', 'Log']
for c in noncopy:
- main_ns.class_(c).noncopyable = True
-
+ main_ns.class_(c).noncopyable = True
+
# changes for Ogre 1.7
if environment.ogre.version =="1.7":
# main_ns.class_("ResourceBackgroundQueue").exclude() # Ogre::ResourceBackgroundQueue::_fireBackgroundLoadingComplete isn't implemented
Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2008-06-28 23:57:01 UTC (rev 626)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2008-07-01 07:26:57 UTC (rev 627)
@@ -3,6 +3,8 @@
// sizeof ( Ogre::ConstVectorIterator );
// sizeof ( Ogre::ConstMapIterator );
+
+
sizeof ( Ogre::MapIterator< std::multimap<Ogre::String, Ogre::String> > );
sizeof ( Ogre::MapIterator< std::map<Ogre::String, std::multimap<Ogre::String, Ogre::String>*> > );
sizeof ( Ogre::MaterialPtr );
@@ -18,6 +20,19 @@
#else
sizeof ( Ogre::ResourceBackgroundQueue );
+ sizeof ( Ogre::AllocatedObject );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)0> > );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)1> > );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)2> > );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)3> > );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)4> > );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)5> > );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)6> > );
+ sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)7> > );
+ sizeof ( Ogre::ConstVectorIterator<std::vector<Ogre::Technique::GPUVendorRule, std::allocator<Ogre::Technique::GPUVendorRule> > > );
+ sizeof ( Ogre::MapIterator<std::map<int, Ogre::InstancedGeometry::InstancedObject*, std::less<int>, std::allocator<std::pair<const int, Ogre::InstancedGeometry::InstancedObject*> > > > );
+ sizeof ( Ogre::ConstVectorIterator<std::vector<Ogre::Technique::GPUDeviceNameRule, std::allocator<Ogre::Technique::GPUDeviceNameRule> > > );
+
#endif
Modified: trunk/python-ogre/demos/caelum/Demo_Caelum01.py
===================================================================
--- trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2008-06-28 23:57:01 UTC (rev 626)
+++ trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2008-07-01 07:26:57 UTC (rev 627)
@@ -234,13 +234,13 @@
0 )
print componentMask
## Initialise Caelum
- self.caelumSystem = caelum.CaelumSystem(self.root.getSingletonPtr(), self.sceneManager,componentMask )
+ self.caelumSystem = caelum.CaelumSystem(self.root.getSingletonPtr(), self.sceneManager ) ##,componentMask )
self.caelumSystem.setManageSceneFog(True)
self.caelumSystem.setSceneFogDensityMultiplier(0.0015)
- self.caelumSystem.setManageAmbientLight (true)
-
-
+ self.caelumSystem.setManageAmbientLight (True)
+ self.caelumSystem.setMinimumAmbientLight (ogre.ColourValue (0, 0, 0.5))
+
## This is how you switch the sun implementation.
## This here is a no-op; but it's useful to test caelum doesn't crash when the second sun is created.
self.spheresun = caelum.SphereSun(self.sceneManager, self.caelumSystem.getRootNode ())
@@ -253,38 +253,22 @@
self.caelumSystem.getSun ().setSpecularMultiplier (ogre.ColourValue (5, 5, 5))
self.caelumSystem.getSun ().setAutoDisable (True)
self.caelumSystem.getSun ().setAutoDisableThreshold (0.1)
-
- ## Setup fog options.
- if self.caelumSystem.getGroundFog():
- self.caelumSystem.getGroundFog().findFogPassesByName()
-
- ## Setup cloud options.
- ## Tweak these settings to make the demo look pretty.
+ if (self.caelumSystem.getMoon ()):
+ self.caelumSystem.getMoon ().setAutoDisable (True)
+ self.caelumSystem.getMoon ().setAutoDisableThreshold (0.1)
+
+# ## Setup cloud options.
+# ## Tweak these settings to make the demo look pretty.
if self.caelumSystem.getClouds ():
self.caelumSystem.getClouds ().setCloudSpeed(ogre.Vector2(0.000005, -0.000009))
self.caelumSystem.getClouds ().setCloudBlendTime(3600 * 24)
self.caelumSystem.getClouds ().setCloudCover(0.3)
- ## Setup starfield options
- if self.caelumSystem.getStarfield ():
- self.caelumSystem.getStarfield ().setInclination (ogre.Degree (13))
-
- ## Set time acceleration.
- self.caelumSystem.getUniversalClock ().setTimeScale (512)
-
- ## Winter dawn in the southern hemisphere, looking north
- self.caelumSystem.getUniversalClock ().setGregorianDateTime (2008, 7, 4, 20, 33, 0)
- self.caelumSystem.getSolarSystemModel ().setObserverLongitude (ogre.Degree(103 + 48 / 60))
-
- ## Singapore
- self.caelumSystem.getSolarSystemModel ().setObserverLatitude (ogre.Degree(1 + 22 / 60))
- ## Beyond the southern polar circle, no sunrise
- ##mCaelumSystem.getSolarSystemModel ().setObserverLatitude (ogre.Degree(-70))
- ## Beyond the northern polar circle, no sunset
- ##mCaelumSystem.getSolarSystemModel ().setObserverLatitude (ogre.Degree(70))
-
+
+
## Register caelum to the render target
self.renderWindow.addListener (self.caelumSystem)
+ ogre.Root.getSingletonPtr().addFrameListener( self.caelumSystem )
## Put some terrain in the scene
self.sceneManager.setWorldGeometry ("CaelumDemoTerrain.cfg")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-01 11:55:50
|
Revision: 628
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=628&view=rev
Author: andy_miller
Date: 2008-07-01 04:55:56 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Removed fault entry in ogre_sizeof.h
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
trunk/python-ogre/demos/ogreal/Demo_AL_01.py
Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2008-07-01 07:26:57 UTC (rev 627)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2008-07-01 11:55:56 UTC (rev 628)
@@ -20,7 +20,6 @@
#else
sizeof ( Ogre::ResourceBackgroundQueue );
- sizeof ( Ogre::AllocatedObject );
sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)0> > );
sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)1> > );
sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)2> > );
Modified: trunk/python-ogre/demos/ogreal/Demo_AL_01.py
===================================================================
--- trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-07-01 07:26:57 UTC (rev 627)
+++ trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-07-01 11:55:56 UTC (rev 628)
@@ -122,8 +122,8 @@
self.soundManager = OgreAL.SoundManager() ## "Generic Software")
dl = self.soundManager.getDeviceList()
- for dev in dl:
- print "Device available:", dev
+# for dev in dl:
+# print "Device available:", dev
node = rootNode.createChildSceneNode( "Head" )
node.attachObject( ogreHead )
sound = self.soundManager.createSound("Roar", "roar.wav", True) ## "6chan.ogg", True) ## "roar.wav", True)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-02 08:10:41
|
Revision: 629
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=629&view=rev
Author: andy_miller
Date: 2008-07-02 01:10:50 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
Updated Patch for ogre as base directory name has changed... (from ogrenew to ogre)
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/patch/ogre.patch
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-07-01 11:55:56 UTC (rev 628)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-07-02 08:10:50 UTC (rev 629)
@@ -27,7 +27,7 @@
# We need to know where to find gccxml......
gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin')
-gccxml_bin = os.path.join(ROOT_DIR,'bin')
+gccxml_bin = os.path.join(ROOT_DIR,'usr/bin')
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch 2008-07-01 11:55:56 UTC (rev 628)
+++ trunk/python-ogre/patch/ogre.patch 2008-07-02 08:10:50 UTC (rev 629)
@@ -1,6 +1,6 @@
---- ogrenew/configure.in 2007-05-15 22:43:31.000000000 +0800
-+++ ogrenew/configure.in 2007-05-15 22:43:18.000000000 +0800
+--- ogre/configure.in 2007-05-15 22:43:31.000000000 +0800
++++ ogre/configure.in 2007-05-15 22:43:18.000000000 +0800
@@ -59,6 +58,7 @@
;;
esac
@@ -9,8 +9,8 @@
AC_SUBST(CFLAGS_VISIBILITY)
AC_LANG_POP
---- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
-+++ ogrenew/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
+--- ogre/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
++++ ogre/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
@@ -33,6 +33,7 @@
#include "OgreString.h"
#include "OgreSharedPtr.h"
@@ -38,8 +38,8 @@
/** Close the stream; this makes further operations invalid. */
virtual void close(void) = 0;
---- ogrenew/OgreMain/include/OgreHardwareBuffer.h 23 Aug 2006 08:18:33 -0000 1.17
-+++ ogrenew/OgreMain/include/OgreHardwareBuffer.h 24 Nov 2007 00:37:00 -0000
+--- ogre/OgreMain/include/OgreHardwareBuffer.h 23 Aug 2006 08:18:33 -0000 1.17
++++ ogre/OgreMain/include/OgreHardwareBuffer.h 24 Nov 2007 00:37:00 -0000
@@ -31,6 +31,8 @@
// Precompiler options
@@ -59,8 +59,8 @@
ensure that your buffer is big enough.
@param offset The byte offset from the start of the buffer to start writing
---- ogrenew/OgreMain/include/OgreRenderQueueListener.h 23 Aug 2006 08:18:35 -0000 1.10
-+++ ogrenew/OgreMain/include/OgreRenderQueueListener.h 24 Nov 2007 00:34:52 -0000
+--- ogre/OgreMain/include/OgreRenderQueueListener.h 23 Aug 2006 08:18:35 -0000 1.10
++++ ogre/OgreMain/include/OgreRenderQueueListener.h 24 Nov 2007 00:34:52 -0000
@@ -31,6 +31,8 @@
#include "OgrePrerequisites.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-14 06:32:22
|
Revision: 632
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=632&view=rev
Author: mithro
Date: 2008-07-13 23:32:30 -0700 (Sun, 13 Jul 2008)
Log Message:
-----------
Added ability to build debian packages using BuildModule.py
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/boost/debian/control
trunk/python-ogre/boost/debian/files
trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
trunk/python-ogre/debian/changelog
trunk/python-ogre/debian/control
trunk/python-ogre/debian/rules
trunk/python-ogre/debs/gccxml-debian/changelog
trunk/python-ogre/debs/pygccxml-debian/control
trunk/python-ogre/debs/pyplusplus-debian/changelog
trunk/python-ogre/debs/pyplusplus-debian/control
trunk/python-ogre/demos/PythonOgreConfig.py
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/gui/CEGUI/__init__.py
Added Paths:
-----------
trunk/python-ogre/PythonOgreConfig_system.py
trunk/python-ogre/scripts/build-deb.sh
Removed Paths:
-------------
trunk/python-ogre/debian/files
trunk/python-ogre/debian/python-ogre.postinst.debhelper
trunk/python-ogre/debian/python-ogre.preinst.debhelper
trunk/python-ogre/debian/python-ogre.prerm.debhelper
trunk/python-ogre/debian/python-ogre.substvars
Property Changed:
----------------
trunk/python-ogre/
trunk/python-ogre/boost/
trunk/python-ogre/boost/debian/
trunk/python-ogre/code_generators/cache/
trunk/python-ogre/debian/
trunk/python-ogre/demos/ogre/
trunk/python-ogre/generated/
trunk/python-ogre/packages_2.5/
trunk/python-ogre/packages_2.5/ogre/addons/
trunk/python-ogre/packages_2.5/ogre/addons/cadunetree/
trunk/python-ogre/packages_2.5/ogre/addons/caelum/
trunk/python-ogre/packages_2.5/ogre/addons/et/
trunk/python-ogre/packages_2.5/ogre/addons/noise/
trunk/python-ogre/packages_2.5/ogre/addons/ofusion/
trunk/python-ogre/packages_2.5/ogre/addons/ogredshow/
trunk/python-ogre/packages_2.5/ogre/addons/ogreforests/
trunk/python-ogre/packages_2.5/ogre/addons/ogrevideoffmpeg/
trunk/python-ogre/packages_2.5/ogre/addons/particleuniverse/
trunk/python-ogre/packages_2.5/ogre/addons/plib/
trunk/python-ogre/packages_2.5/ogre/addons/theora/
trunk/python-ogre/packages_2.5/ogre/addons/watermesh/
trunk/python-ogre/packages_2.5/ogre/gui/CEGUI/
trunk/python-ogre/packages_2.5/ogre/gui/QuickGUI/
trunk/python-ogre/packages_2.5/ogre/gui/betagui/
trunk/python-ogre/packages_2.5/ogre/gui/navi/
trunk/python-ogre/packages_2.5/ogre/io/OIS/
trunk/python-ogre/packages_2.5/ogre/physics/NxOgre/
trunk/python-ogre/packages_2.5/ogre/physics/ODE/
trunk/python-ogre/packages_2.5/ogre/physics/OgreBulletC/
trunk/python-ogre/packages_2.5/ogre/physics/OgreBulletD/
trunk/python-ogre/packages_2.5/ogre/physics/OgreNewt/
trunk/python-ogre/packages_2.5/ogre/physics/OgreOde/
trunk/python-ogre/packages_2.5/ogre/physics/OgreRefApp/
trunk/python-ogre/packages_2.5/ogre/physics/Opcode/
trunk/python-ogre/packages_2.5/ogre/physics/PhysX/
trunk/python-ogre/packages_2.5/ogre/physics/bullet/
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/
trunk/python-ogre/packages_2.5/ogre/sound/OgreAL/
Property changes on: trunk/python-ogre
___________________________________________________________________
Name: svn:ignore
- python-ogre.sln
python-ogre.suo
python-ogre.ncb
Release
+ python-ogre.sln
python-ogre.suo
python-ogre.ncb
Release
*.pyc
log.out
build_dir_2.5
downloads
build
build-stamp
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/BuildModule.py 2008-07-14 06:32:30 UTC (rev 632)
@@ -63,13 +63,14 @@
# # export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
-def spawnTask ( task, cwdin = '' ):
+def spawnTask ( task, cwdin = '', getoutput=None ):
"""Execute a command line task and manage the return code etc
"""
global ENV_SET
PREFIX = environment.PREFIX
PATH = os.environ["PATH"]
env = os.environ
+ env["USESYSTEM"] = str(environment.UseSystem)
if not ENV_SET: # this actually changes the environment so we shouldn't do it more than once
env["PKG_CONFIG_PATH"]=os.path.join(PREFIX,"lib/pkgconfig")
env["LD_LIBRARY_PATH"]=os.path.join(PREFIX,"lib")
@@ -95,7 +96,12 @@
returncode = process.returncode
except:
returncode = -1
-
+
+ if getoutput is not None:
+ if returncode != -1:
+ getoutput.write(out)
+ getoutput.write(err)
+
if returncode != 0:
logger.warning ( "Task Failed" )
logger.debug ( out )
@@ -113,6 +119,16 @@
for cmd,args,cwd in module.source:
logger.info ("Retrieving %s" % args )
ret = spawnTask ( cmd+ " " + args, cwd )
+
+ if not hasattr(module, "extractCmds"):
+ return
+
+ for type_,cmd,path in module.extractCmds:
+ logger.info ("Extracting and patching %s" % args )
+ if path =='':
+ path = os.getcwd()
+ ret = spawnTask ( cmd, path )
+
def buildModule ( module ):
""" Execute the build commands for the module
@@ -129,13 +145,73 @@
logger.debug ("executing codeblock " )
exec code
logger.debug ( "Exec done")
+
+from cStringIO import StringIO
+def buildDeb ( module, install = False ):
+ """ Create a debian package for the module
+ """
+ logger.info("Trying to build a debain package for module %s" % module.base)
+ srcdir = os.path.join(os.getcwd(), module.base)
+ if not os.path.exists(srcdir):
+ exit("You need to get the src first, use -r")
+
+ # Check if the module already has debian rules to create a package
+ debiandir = os.path.join(srcdir, "debian")
+ debianour = os.path.join("python-ogre", "debs", "%s-debian" % module.base)
+
+ if not os.path.exists(debiandir):
+ logger.info("Package does not come with a debian dir, seeing if we have our own..")
+
+ # Do we have a debian rules we can copy into the package?
+ if not os.path.exists(debianour):
+ logger.error("We do not have a debian dir!?")
+ exit("Can not build debian packages for this module.")
+ else:
+ # Do the copy
+ ret = spawnTask("cp -rvf %s %s" % (debianour, debiandir), os.getcwd())
+ if ret != 0:
+ exit("Was not able to copy the debian directory over")
+
+ # Rewrite any place holders
+ ret = spawnTask( "sed --in-place "+debiandir+"/changelog -e \"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e \"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\"", srcdir)
+ if ret != 0:
+ exit("Was not able to update the debian change log.")
+ ret = spawnTask( "sed --in-place "+debiandir+"/control -e \"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e \"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\"", srcdir)
+ if ret != 0:
+ exit("Was not able to update the debian control file.")
+ # Check that all the dependencies for this package are avaliable
+ c = StringIO()
+ ret = spawnTask("dpkg-checkbuilddeps", srcdir, c)
+ if ret != 0:
+ c = c.getvalue().strip()
+ c = c.split(':')[-1].strip().split()
+ logger.info ("Please install the following dependencies %r " % c)
+ exit("The package's dependencies have not been installed.")
+
+ os.chmod(os.path.join(debiandir, "rules"), 0755)
+
+ ret = spawnTask("fakeroot ./debian/rules binary", srcdir, c)
+ if ret != 0:
+ exit("Was not able to build package")
+ logger.info("Package successfully built!")
+
+def buildInstall ( module ):
+ """ Create a debian package for the module
+ """
+ logger.info("Trying to install the debian package (make sure you run sudo before this command)")
+ srcdir = os.path.join(os.getcwd(), module.base)
+ ret = spawnTask("sudo dpkg --install %s*.deb" % module.base, os.path.split(srcdir)[0])
+ if ret != 0:
+ exit("Was not able to the install package!")
+ logger.info("Package installed.")
+
def generateCode ( module ):
""" Generate the C++ wrapper code
"""
logger.info ( "Building Source code for " + module.name )
### AJM -- note the assumption that environment.py is sitting in the 'python-ogre' directory...
- ret = spawnTask ( 'python generate_code.py', os.path.join(environment.root_dir, 'code_generators', module.name) )
+ ret = spawnTask ( 'python generate_code.py'+('', ' --usesystem')[environment.UseSystem], os.path.join(environment.root_dir, 'code_generators', module.name) )
def compileCode ( module ):
""" Compile the wrapper code and make the modules
@@ -155,6 +231,8 @@
parser.add_option("-r", "--retrieve", action="store_true", default=False,dest="retrieve", help="Retrieve the appropiate source before building")
parser.add_option("-b", "--build", action="store_true", default=False ,dest="build", help="Build the appropiate module")
parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module")
+ parser.add_option("-d", "--build-deb", action="store_true", default=False ,dest="builddeb", help="Build a debian package for the module")
+ parser.add_option("", "--install-deb", action="store_true", default=False ,dest="installdeb", help="Install the debian packages after building")
parser.add_option("-c", "--compile", action="store_true", default=False ,dest="compilecode", help="Compile Source Code for the module")
parser.add_option("-l", "--logfilename", default="log.out" ,dest="logfilename", help="Override the default log file name")
parser.add_option("-G", "--genall", action="store_true", default=False ,dest="gencodeall", help="Generate Source Code for all possible modules")
@@ -169,13 +247,16 @@
(options, args) = parseInput()
if len(args) == 0 and not (options.compilecodeall or options.gencodeall):
exit("The module to build wasn't specified. Use -h for help")
+
+ setupLogging(options.logfilename)
+ logger = logging.getLogger('PythonOgre.BuildModule')
if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False\
- and options.compilecodeall==False and options.gencodeall==False:
+ and options.compilecodeall==False and options.gencodeall==False and options.builddeb==False\
+ and options.installdeb==False:
exit ( "You need to specific at least one option. Use -h for help")
-
- setupLogging(options.logfilename)
- logger = logging.getLogger('PythonOgre.BuildModule')
+ if options.builddeb and options.build:
+ exit ( "You can only specify build or builddeb, not both!" )
if not os.path.exists( environment.downloadPath ):
os.mkdir ( environment.downloadPath )
@@ -198,6 +279,11 @@
exit("Module specificed was not found (%s is not in environment.py) " % moduleName )
if options.retrieve:
retrieveSource ( classList[ moduleName ] )
+ if options.builddeb:
+ buildDeb( classList[ moduleName ] )
+ if options.installdeb:
+ buildInstall( classList[ moduleName ] )
+
if options.build :
buildModule ( classList[ moduleName ] )
if options.gencode :
Added: trunk/python-ogre/PythonOgreConfig_system.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_system.py (rev 0)
+++ trunk/python-ogre/PythonOgreConfig_system.py 2008-07-14 06:32:30 UTC (rev 632)
@@ -0,0 +1,165 @@
+import sys,os
+
+## The root directory is where this module is located
+module_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
+## lets assume that the base development directory is one level higher
+BASE_DIR = "/usr"
+
+# the base of the /usr/... dircetory structure that we are using
+ROOT_DIR = '/'
+LOCAL_LIB = '/usr/lib'
+LOCAL_INCLUDE = '/usr/include'
+
+## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
+PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost')
+## Path to your boost_pythonxxxx lib file
+PATH_LIB_Boost = LOCAL_LIB
+## and the name of the boost python library
+LIB_Boost = 'libboost_python-gcc42-mt-1_34_1'
+
+# in Linux we need to code in the Relative path for the library
+RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''
+
+# We need to know where to find gccxml......
+gccxml_bin = os.path.join(ROOT_DIR,'usr/bin')
+# and the Py++ directory as sometimes we need access to the code repository there
+pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
+
+# # ## Parent directories of the libraries
+PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
+PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
+PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons')
+PATH_CEGUI = os.path.join(BASE_DIR, 'include/CEGUI' )
+PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
+
+PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
+PATH_ODE = os.path.join(BASE_DIR)
+PATH_OGG = os.path.join(BASE_DIR, 'libogg-1.1.3')
+PATH_VORBIS= os.path.join(BASE_DIR, 'libvorbis-1.2.0')
+PATH_OPENAL= os.path.join(BASE_DIR, 'openal-0.0.8')
+PATH_OgreOde= os.path.join(PATH_OgreAddons,'ogreode')
+
+PATH_OgreBullet= os.path.join(PATH_THIRDPARTY,'ogrebullet')
+PATH_ogreforests= os.path.join(PATH_THIRDPARTY,'forests')
+PATH_OGREAL= os.path.join(PATH_THIRDPARTY,'ogreal')
+PATH_OPCODE= os.path.join(PATH_THIRDPARTY,'opcode')
+PATH_quickgui= os.path.join(PATH_THIRDPARTY,'quickgui')
+PATH_betagui= os.path.join(PATH_THIRDPARTY,'betagui')
+PATH_ogredshow = os.path.join(PATH_THIRDPARTY,'dshow')
+PATH_plib = os.path.join(PATH_THIRDPARTY, 'plib')
+PATH_et = os.path.join(PATH_THIRDPARTY, 'et')
+PATH_caelum = os.path.join(PATH_THIRDPARTY, 'caelum')
+PATH_noise= os.path.join(PATH_THIRDPARTY, 'noise')
+PATH_watermesh= os.path.join(PATH_THIRDPARTY, 'watermesh')
+PATH_ofusion= os.path.join(PATH_THIRDPARTY, 'ofusion')
+PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
+PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
+PATH_NxOgre_09= os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')
+# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.66')
+###PATH_PhysX= os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
+PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
+PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
+PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
+PATH_particleuniverse = os.path.join(PATH_Ogre, 'PlugIns', 'ParticleUniverse' )
+PATH_cadunetree= os.path.join(PATH_THIRDPARTY, 'cadunetree')
+PATH_opensteer = os.path.join(BASE_DIR, 'opensteer', 'trunk')
+
+
+###
+### these paths assume you've left all the directory structure as standard
+### Override anything that is different
+###
+PATH_LIB_Ogre_CEGUIRenderer = os.path.join( LOCAL_LIB ) #, 'Samples/Common/CEGUIRenderer/lib')
+PATH_LIB_Ogre_OgreMain= os.path.join( LOCAL_LIB ) # PATH_Ogre, 'OgreMain/lib/Release' )
+PATH_LIB_Ogre_Dependencies = os.path.join( LOCAL_LIB ) # , 'Dependencies/lib/Release')
+PATH_LIB_OgreRefApp = os.path.join( LOCAL_LIB ) # PATH_Ogre, 'ReferenceApplication/ReferenceAppLayer/lib/Release')
+PATH_LIB_OgreNewt = os.path.join( LOCAL_LIB ) #PATH_OgreAddons, r'ogrenewt/OgreNewt_Main/lib/Release')
+PATH_LIB_Newton = os.path.join( LOCAL_LIB ) # PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
+
+PATH_LIB_OIS = os.path.join( LOCAL_LIB ) #PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
+PATH_LIB_CEGUI = os.path.join( LOCAL_LIB ) #PATH_Ogre, r'Dependencies/lib/Release' )
+
+PATH_LIB_ODE = os.path.join( LOCAL_LIB ) #PATH_ODE, 'lib/releasedll')## probable releaselib for posix
+PATH_LIB_OPCODE = os.path.join( PATH_OPCODE )
+PATH_LIB_OgreOde = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'lib/Release')
+# PATH_LIB_OgreBullet = os.path.join( PATH_OgreBullet, 'lib/Release')
+PATH_LIB_OgreOdePrefab = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'prefab/lib/Release' )
+PATH_LIB_OgreOdeLoader = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'loader/lib/Release' )
+PATH_LIB_OgreAL = os.path.join( LOCAL_LIB ) #PATH_OGREAL, 'lib/Release' )
+PATH_LIB_betagui = PATH_betagui
+PATH_LIB_quickgui = PATH_quickgui
+PATH_LIB_NxOgre= os.path.join(LOCAL_LIB )
+PATH_LIB_PhysX = os.path.join(LOCAL_LIB, 'PhysX','v2.7.3')
+PATH_LIB_Bullet = os.path.join( LOCAL_LIB )
+PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
+PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
+PATH_LIB_plib = PATH_plib
+PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
+PATH_LIB_particleuniverse = os.path.join(PATH_particleuniverse, 'bin', 'release')
+PATH_LIB_opensteer = os.path.join(LOCAL_LIB)
+
+
+PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
+PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
+
+PATH_INCLUDE_OIS = os.path.join(LOCAL_INCLUDE,'OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
+PATH_INCLUDE_CEGUI = os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
+
+PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
+PATH_INCLUDE_OgreNewt = os.path.join(LOCAL_INCLUDE,'OgreNewt') #os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
+PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'ode') #os.path.join( PATH_ODE, 'include')
+PATH_INCLUDE_OPCODE = PATH_OPCODE
+PATH_INCLUDE_ODESOURCE = '' # os.path.join( PATH_ODE, 'ode/src')
+PATH_INCLUDE_OgreAL = PATH_OGREAL
+PATH_INCLUDE_OPENAL = os.path.join( LOCAL_INCLUDE ) #os.path.join( PATH_OPENAL, 'include')
+PATH_INCLUDE_OGG= os.path.join( LOCAL_INCLUDE,'ogg' ) #os.path.join( PATH_OGG, 'include' )
+PATH_INCLUDE_VORBIS= os.path.join( LOCAL_INCLUDE,'vorbis' ) #os.path.join( PATH_VORBIS, 'include' )
+
+# PATH_INCLUDE_OgreBullet = [
+# os.path.join( PATH_OgreBullet,'Collisions','include')
+# ,os.path.join( PATH_OgreBullet,'Dynamics','include')
+# ]
+
+
+PATH_INCLUDE_OgreOde = os.path.join( PATH_OgreOde,'include')
+PATH_INCLUDE_OgreOdePrefab= os.path.join( PATH_OgreOde,'prefab/include')
+PATH_INCLUDE_OgreOdeLoader= os.path.join( PATH_OgreOde,'loader/include')
+PATH_INCLUDE_FMOD = ""
+PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join(BASE_DIR, 'include', 'OGRE')
+PATH_INCLUDE_quickgui = PATH_quickgui
+PATH_INCLUDE_NxOgre= PATH_NxOgre
+PATH_INCLUDE_NxOgre_09= PATH_NxOgre_09
+# PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
+PATH_INCLUDE_Bullet = os.path.join( PATH_Bullet, 'src')
+PATH_INCLUDE_betagui = PATH_betagui
+PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
+PATH_INCLUDE_TheoraDemo = os.path.join (PATH_Theora,'..', 'CEGUI_TheoraDemo','include')
+
+PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
+PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+PATH_INCLUDE_noise = PATH_noise
+PATH_INCLUDE_ogredshow = PATH_ogredshow
+PATH_INCLUDE_ogreforests = PATH_ogreforests
+PATH_INCLUDE_particleuniverse = os.path.join(PATH_particleuniverse, 'include' )
+
+PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
+ ,os.path.join(BASE_DIR, 'vorbis', 'include')
+ ,os.path.join(PATH_OgreAddons,'videoplugin','theora','include')
+ ##,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-1.8.3','include')
+ ,os.path.join(PATH_THIRDPARTY,'ptypes','include')
+ ]
+physxbase = os.path.join(LOCAL_INCLUDE, 'PhysX','v2.7.3', 'SDKs')
+PATH_INCLUDE_PhysX= [ physxbase
+ ,os.path.join(physxbase, 'Cooking','Include')
+ ,os.path.join(physxbase, 'Foundation','include')
+ ,os.path.join(physxbase, 'PhysXLoader','include')
+ ,os.path.join(physxbase, 'NxCharacter','include')
+ ,os.path.join(physxbase, 'NxExtensions','include')
+ ,os.path.join(physxbase, 'Physics','include')
+ ]
+PATH_INCLUDE_opensteer = os.path.join(LOCAL_INCLUDE, 'OpenSteer')
+PATH_INCLUDE_opensteer_opensteer = os.path.join(LOCAL_INCLUDE, 'OpenSteer')
Property changes on: trunk/python-ogre/boost
___________________________________________________________________
Name: svn:ignore
+ *-stamp
*.so
Property changes on: trunk/python-ogre/boost/debian
___________________________________________________________________
Name: svn:ignore
+ libboost-python1.34.1-index*
tmp
Modified: trunk/python-ogre/boost/debian/control
===================================================================
--- trunk/python-ogre/boost/debian/control 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/boost/debian/control 2008-07-14 06:32:30 UTC (rev 632)
@@ -12,7 +12,7 @@
Description: Extra index stuff for boost-python
This package is the extra index stuff needed by python-ogre (and possibly
others). It does not refer to a real upstream object, we expect this to go way
- once boot-python is updated.
+ once boost-python is updated.
Package: libboost-python1.34.1-index
Section: libs
@@ -21,4 +21,4 @@
Description: Extra index stuff for boost-python
This package is the extra index stuff needed by python-ogre (and possibly
others). It does not refer to a real upstream object, we expect this to go way
- once boot-python is updated.
+ once boost-python is updated.
Modified: trunk/python-ogre/boost/debian/files
===================================================================
--- trunk/python-ogre/boost/debian/files 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/boost/debian/files 2008-07-14 06:32:30 UTC (rev 632)
@@ -10,3 +10,5 @@
libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
+libboost-python1.34.1-index-dev_0.0.0-1_i386.deb libdevel extra
+libboost-python1.34.1-index_0.0.0-1_i386.deb libs extra
Property changes on: trunk/python-ogre/code_generators/cache
___________________________________________________________________
Name: svn:ignore
+ *.xml
Modified: trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-07-14 06:32:30 UTC (rev 632)
@@ -62,8 +62,10 @@
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
EventSet_exposer.def( "subscribeEvent", &EventSet_subscribeEventSet,
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
-EventSet_exposer.def( "subscribeEvent", &EventSet_subscribeTree,
+#if CEGUI_VERSION_MINOR > 5 && CEGUI_VERSION_PATCH > 0
+EventSet_exposer.def( "subscribeEvent", &EventSet_subscribeTree,
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
+#endif
{ //EventConnection
typedef bp::class_< EventConnection > EventConnection_exposer_t;
@@ -169,22 +171,23 @@
boost::python::call<void>(mSubscriber,
static_cast<const CEGUI::MouseEventArgs&>(args) );
- else if (dynamic_cast<CEGUI::TreeEventArgs *>((CEGUI::EventArgs *)&args))
- if (mMethod.length() > 0 )
- boost::python::call_method<void>(mSubscriber, mMethod.c_str(),
- static_cast<const CEGUI::TreeEventArgs&>(args) );
- else
- boost::python::call<void>(mSubscriber,
- static_cast<const CEGUI::TreeEventArgs&>(args) );
-
+#if CEGUI_VERSION_MINOR > 5 && CEGUI_VERSION_PATCH > 0
+ else if (dynamic_cast<CEGUI::TreeEventArgs *>((CEGUI::EventArgs *)&args))
+ if (mMethod.length() > 0 )
+ boost::python::call_method<void>(mSubscriber, mMethod.c_str(),
+ static_cast<const CEGUI::TreeEventArgs&>(args) );
+ else
+ boost::python::call<void>(mSubscriber,
+ static_cast<const CEGUI::TreeEventArgs&>(args) );
+#endif
else if (dynamic_cast<CEGUI::WindowEventArgs *>((CEGUI::EventArgs *)&args))
if (mMethod.length() > 0 )
boost::python::call_method<void>(mSubscriber, mMethod.c_str(),
static_cast<const CEGUI::WindowEventArgs&>(args) );
else
boost::python::call<void>(mSubscriber,
- static_cast<const CEGUI::WindowEventArgs&>(args) );
-
+ static_cast<const CEGUI::WindowEventArgs&>(args) );
+
else
boost::python::call_method<void>(mSubscriber, mMethod.c_str(), args );
return true;
@@ -348,14 +351,16 @@
{
EventConnection *connect = new EventConnection(self->subscribeEvent(name, EventCallback(subscriber, method)));
return connect;
-}
-
-EventConnection * EventSet_subscribeTree(CEGUI::Tree *self , CEGUI::String const & name,
- PyObject* subscriber, CEGUI::String const & method="")
-{
- EventConnection *connect = new EventConnection(self->subscribeEvent(name, EventCallback(subscriber, method)));
- return connect;
}
+
+#if CEGUI_VERSION_MINOR > 5 && CEGUI_VERSION_PATCH > 0
+EventConnection * EventSet_subscribeTree(CEGUI::Tree *self , CEGUI::String const & name,
+ PyObject* subscriber, CEGUI::String const & method="")
+{
+ EventConnection *connect = new EventConnection(self->subscribeEvent(name, EventCallback(subscriber, method)));
+ return connect;
+}
+#endif
"""
WRAPPER_DEFINITION_General = \
Property changes on: trunk/python-ogre/debian
___________________________________________________________________
Name: svn:ignore
+ python-ogre
Modified: trunk/python-ogre/debian/changelog
===================================================================
--- trunk/python-ogre/debian/changelog 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/changelog 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,3 +1,9 @@
+python-ogre (0.0.0-1) unstable; urgency=low
+
+ * Added support for ogreal.
+ * Fixed the CEGUI import.
+
+ -- Tim 'Mithro' Ansell <mi...@mi...> Mon, 14 Jul 2008 11:13:51 +1000
python-ogre (0.0.0-0) unstable; urgency=low
* First testing version.
@@ -2,2 +8,2 @@
- -- Tim 'Mithro' Ansell <mi...@mi...>
+ -- Tim 'Mithro' Ansell <mi...@mi...> Sun, 13 Jul 2008 13:27:51 +1000
Modified: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/control 2008-07-14 06:32:30 UTC (rev 632)
@@ -4,12 +4,24 @@
Priority: optional
Maintainer: Tim 'Mithro' Ansell <mi...@mi...>
Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
-Build-Depends: debhelper (>= 5.0.38)
+Build-Depends: debhelper (>= 5.0.38),
+ cmake (>= 2.4.0), scons,
+ nvidia-cg-toolkit,
+ zziplib-bin,
+ libboost-dev (>= 1.34), libboost-dev (<= 1.35),
+ libboost-python-dev (>= 1.34), libboost-dev (<= 1.35),
+ libfreeimage-dev,
+ libois-dev,
+ libogre-dev (>= 1.4), libogre-dev (< 1.5),
+ libceguiogre-dev (>= 1.4), libceguiogre-dev (< 1.5),
+ libopenal-dev,
+ gccxml (>=0.7.0),
+ pygccxml, pyplusplus,
Standards-Version: 3.7.2
Package: python-ogre
-Architecture: all
-Depends: ${python:Depends}
+Architecture: i386
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
XB-Python-Version: ${python:Versions}
Description: Python Ogre.
Python Ogre.
Deleted: trunk/python-ogre/debian/files
===================================================================
--- trunk/python-ogre/debian/files 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/files 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,2 +0,0 @@
-python-ogre_0.0.0-0_all.deb python optional
-python-ogre_0.0.0-0_all.deb python optional
Deleted: trunk/python-ogre/debian/python-ogre.postinst.debhelper
===================================================================
--- trunk/python-ogre/debian/python-ogre.postinst.debhelper 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/python-ogre.postinst.debhelper 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,8 +0,0 @@
-# Automatically added by dh_pycentral
-if which pycentral >/dev/null 2>&1; then
- pycentral pkginstall python-ogre
- if grep -qs '^python-ogre$' /var/lib/pycentral/delayed-pkgs; then
- sed -i '/^python-ogre$/d' /var/lib/pycentral/delayed-pkgs
- fi
-fi
-# End automatically added section
Deleted: trunk/python-ogre/debian/python-ogre.preinst.debhelper
===================================================================
--- trunk/python-ogre/debian/python-ogre.preinst.debhelper 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/python-ogre.preinst.debhelper 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,68 +0,0 @@
-# Automatically added by dh_pycentral
-if which pycentral >/dev/null 2>&1 && pycentral --help 2>/dev/null | grep -q pkgprepare; then
- pycentral pkgprepare python-ogre <<PYEOF
-[python-package]
-format = 1
-python-version = 2.5
-[pycentral]
-version = 0.6.1
-[files]
-/usr/lib/python2.5/site-packages/ogre=d
-/usr/lib/python2.5/site-packages/ogre/gui=d
-/usr/lib/python2.5/site-packages/ogre/gui/CEGUI=d
-/usr/lib/python2.5/site-packages/ogre/gui/CEGUI/_cegui_.so=f
-/usr/lib/python2.5/site-packages/ogre/io=d
-/usr/lib/python2.5/site-packages/ogre/io/OIS=d
-/usr/lib/python2.5/site-packages/ogre/io/OIS/_ois_.so=f
-/usr/lib/python2.5/site-packages/ogre/renderer=d
-/usr/lib/python2.5/site-packages/ogre/renderer/OGRE=d
-/usr/lib/python2.5/site-packages/ogre/renderer/OGRE/_ogre_.so=f
-/usr/share/pyshared/ogre=d
-/usr/share/pyshared/ogre/__init__.py=f
-/usr/share/pyshared/ogre/gui=d
-/usr/share/pyshared/ogre/gui/__init__.py=f
-/usr/share/pyshared/ogre/gui/navi=d
-/usr/share/pyshared/ogre/gui/navi/__init__.py=f
-/usr/share/pyshared/ogre/gui/QuickGUI=d
-/usr/share/pyshared/ogre/gui/QuickGUI/__init__.py=f
-/usr/share/pyshared/ogre/gui/CEGUI=d
-/usr/share/pyshared/ogre/gui/CEGUI/__init__.py=f
-/usr/share/pyshared/ogre/gui/betagui=d
-/usr/share/pyshared/ogre/gui/betagui/__init__.py=f
-/usr/share/pyshared/ogre/io=d
-/usr/share/pyshared/ogre/io/__init__.py=f
-/usr/share/pyshared/ogre/io/OIS=d
-/usr/share/pyshared/ogre/io/OIS/__init__.py=f
-/usr/share/pyshared/ogre/renderer=d
-/usr/share/pyshared/ogre/renderer/OGRE=d
-/usr/share/pyshared/ogre/renderer/OGRE/__init__.py=f
-/usr/share/pyshared/ogre/renderer/OGRE/sf_OIS.py=f
-/usr/share/pyshared/ogre/renderer/OGRE/sf_utils.py=f
-/usr/share/pyshared/ogre/renderer/OGRE/named_tuple.py=f
-/usr/share/pyshared/ogre/renderer/OGRE/_ogre_exceptions_.py=f
-/usr/share/pyshared/ogre/renderer/__init__.py=f
-/usr/share/pyshared/ogre/addons=d
-/usr/share/pyshared/ogre/addons/__init__.py=f
-/usr/share/pyshared/ogre/addons/ofusion=d
-/usr/share/pyshared/ogre/addons/ofusion/__init__.py=f
-/usr/share/pyshared/ogre/addons/theora=d
-/usr/share/pyshared/ogre/addons/theora/__init__.py=f
-/usr/share/pyshared/ogre/addons/plib=d
-/usr/share/pyshared/ogre/addons/plib/__init__.py=f
-/usr/share/pyshared/ogre/addons/cadunetree=d
-/usr/share/pyshared/ogre/addons/cadunetree/__init__.py=f
-/usr/share/pyshared/ogre/addons/particleuniverse=d
-/usr/share/pyshared/ogre/addons/particleuniverse/__init__.py=f
-/usr/share/pyshared/ogre/addons/watermesh=d
-/usr/share/pyshared/ogre/addons/watermesh/__init__.py=f
-/usr/share/pyshared/ogre/sound=d
-/usr/share/pyshared/ogre/sound/__init__.py=f
-/usr/share/pyshared/ogre/sound/OgreAL=d
-/usr/share/pyshared/ogre/sound/OgreAL/__init__.py=f
-/usr/share/pyshared/Python_Ogre-1.1.a.egg-info=f
-PYEOF
-else
- mkdir -p /var/lib/pycentral
- echo python-ogre >> /var/lib/pycentral/delayed-pkgs
-fi
-# End automatically added section
Deleted: trunk/python-ogre/debian/python-ogre.prerm.debhelper
===================================================================
--- trunk/python-ogre/debian/python-ogre.prerm.debhelper 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/python-ogre.prerm.debhelper 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,38 +0,0 @@
-# Automatically added by dh_pycentral
-if [ "$1" = remove ]; then
-if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
- pycentral pkgremove python-ogre
-else
- flist=$(tempfile)
- slist=$(tempfile)
- dpkg -L python-ogre | tee $flist | \
- while read n; do
- case "$n" in
- /usr/share/pyshared/*)
- n2=${n#/usr/share/pyshared/*}
- case "$n" in
- *.py) echo "p $n";;
- *) [ -d "$n" ] && echo "d $n2" || echo "f $n2"
- esac
- ;;
- *) continue
- esac
- done > $slist
- if [ -s $slist ]; then
- for d in /usr/lib/python[0-9].[0-9]/????-packages; do
- case "$d" in */python2.1/*|*/python2.2/*) continue; esac
- while read t n; do
- case "$t" in
- p) rm -f $d/$n $d/${n}[co];;
- d) rmdir $d/$n 2>/dev/null || true;;
- *) rm -f $d/$n
- esac
- done < $slist
- done
- fi
- awk '/\/usr\/share\/pyshared/ {next} /\.py$/ {print $0"c\n" $0"o"}' $flist \
- | xargs -r rm -f >&2
- rm -f $flist $slist
-fi
-fi
-# End automatically added section
Deleted: trunk/python-ogre/debian/python-ogre.substvars
===================================================================
--- trunk/python-ogre/debian/python-ogre.substvars 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/python-ogre.substvars 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,3 +0,0 @@
-python:Versions=2.5
-python:Provides=python2.5-ogre
-python:Depends=python-central (>= 0.6.1), python (>= 2.5), python (<< 2.6)
Modified: trunk/python-ogre/debian/rules
===================================================================
--- trunk/python-ogre/debian/rules 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debian/rules 2008-07-14 06:32:30 UTC (rev 632)
@@ -10,13 +10,24 @@
#PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
PYVERS = 2.5 #$(shell pyversions -vr)
-build:
-# touch $@
-# python BuildModule.py -g -c ois
-# python BuildModule.py -g -c cegui
-# python BuildModule.py -g -c noise
-# python BuildModule.py -g -c ogre
-# python BuildModule.py -g -c ogreode
+build: build-stamp
+build-stamp:
+ # Core Modules
+ python BuildModule.py --usesystem -g -c ois
+ python BuildModule.py --usesystem -g -c cegui
+ python BuildModule.py --usesystem -g -c ogre
+ # Extra modules
+ python BuildModule.py --usesystem -g -c noise
+# python BuildModule.py --usesystem -g -c ogreode
+ python BuildModule.py --usesystem -g -c betagui
+ python BuildModule.py --usesystem -g -c cadunetree
+ python BuildModule.py --usesystem -g -c caelum
+ python BuildModule.py --usesystem -g -c et
+ python BuildModule.py --usesystem -g -c plib
+ python BuildModule.py --usesystem -g -c ogreforests
+ python BuildModule.py --usesystem -g -c ogreal
+ python BuildModule.py --usesystem -g -c watermesh
+ touch $@-stamp
build-python%:
dh_testdir
@@ -41,6 +52,10 @@
# Build architecture-independent files here.
binary-indep: build install
+# We have nothing to do here.
+
+# Build architecture-dependent files here.
+binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs
@@ -49,22 +64,19 @@
dh_compress -X.py
dh_fixperms
dh_installdeb
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
+#prep:
+# # Build and install the lastest gccxml
+# cd ..; python python-ogre/BuildModule.py -r -b gccxml
+# # Build and install the lastest pygccxml
+# cd ..; python python-ogre/BuildModule.py -r -b pygccxml
+# # Build and install the extra boost stuff we need
+# cd boost; fakeroot ./debian/rules binary-arch
+# sudo dpkg --install libboost-python1.34.1-index*.deb
-prep:
- # Build and install the lastest gccxml
- cd ..; python python-ogre/BuildModule.py -r -b gccxml
- # Build and install the lastest pygccxml
- cd ..; python python-ogre/BuildModule.py -r -b pygccxml
- # Build and install the extra boost stuff we need
- cd boost; fakeroot ./debian/rules binary-arch
- sudo dpkg --install libboost-python1.34.1-index*.deb
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure prep build-python2.5
Modified: trunk/python-ogre/debs/gccxml-debian/changelog
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/changelog 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debs/gccxml-debian/changelog 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,4 +1,4 @@
-gccxml (0.7.0+%%SHORTDATE%%-0) unstable; urgency=low
+gccxml (0.7.0+cvs%%SHORTDATE%%-0) unstable; urgency=low
* New cvs snapshot.
Modified: trunk/python-ogre/debs/pygccxml-debian/control
===================================================================
--- trunk/python-ogre/debs/pygccxml-debian/control 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debs/pygccxml-debian/control 2008-07-14 06:32:30 UTC (rev 632)
@@ -4,12 +4,12 @@
Priority: optional
Maintainer: Tim 'Mithro' Ansell <mi...@mi...>
Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
-Build-Depends: debhelper (>= 5.0.38)
+Build-Depends: debhelper (>= 5.0.38), gccxml (= 0.7.0+cvs%%SHORTDATE%%-0)
Standards-Version: 3.7.2
Package: pygccxml
Architecture: all
-Depends: ${python:Depends}, gccxml
+Depends: ${python:Depends}, gccxml (= 0.7.0+cvs%%SHORTDATE%%-0)
XB-Python-Version: ${python:Versions}
Description: pygccxml is a specialized XML reader that reads the output from GCCXML.
Modified: trunk/python-ogre/debs/pyplusplus-debian/changelog
===================================================================
--- trunk/python-ogre/debs/pyplusplus-debian/changelog 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debs/pyplusplus-debian/changelog 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,4 +1,4 @@
-pyplusplus (0.9.0+%%SHORTDATE%%-0) unstable; urgency=low
+pyplusplus (0.9.0+svn%%SHORTDATE%%-0) unstable; urgency=low
* First testing version.
Modified: trunk/python-ogre/debs/pyplusplus-debian/control
===================================================================
--- trunk/python-ogre/debs/pyplusplus-debian/control 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/debs/pyplusplus-debian/control 2008-07-14 06:32:30 UTC (rev 632)
@@ -4,12 +4,12 @@
Priority: optional
Maintainer: Tim 'Mithro' Ansell <mi...@mi...>
Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
-Build-Depends: debhelper (>= 5.0.38)
+Build-Depends: debhelper (>= 5.0.38), pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.34.1-index-dev
Standards-Version: 3.7.2
Package: pyplusplus
Architecture: all
-Depends: ${python:Depends}, pygccxml
+Depends: ${python:Depends}, pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.34.1-index
XB-Python-Version: ${python:Versions}
Description: Py++ is a code generator for Boost.Python that simplifies writing
Python bindings of a C/C++ library. The tool is implemented as a Python
Modified: trunk/python-ogre/demos/PythonOgreConfig.py
===================================================================
--- trunk/python-ogre/demos/PythonOgreConfig.py 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/demos/PythonOgreConfig.py 2008-07-14 06:32:30 UTC (rev 632)
@@ -1,41 +0,0 @@
-#
-# a single config file that is imported 'first' by the Python-Ogre demos
-# this is primarly used to manage Linux demos when we have binaries in non standard (safe) locations
-
-import os,sys
-
-#########################################################################
-### Override this setting if you are using non standard locations
-
-libpath = ""
-
-#########################################################################
-
-
-if os.name == 'nt':
- libpath=""
- pythonpath = ""
-else:
- if libpath == "" : # we need to find this ourselves
- localpath = os.path.abspath(os.path.dirname(__file__) ) # assume that this module is in the ./demos directory
- libpath = os.path.abspath(os.path.join(localpath,'../lib')) # so in the binary release the lib is one path back up
- if not os.path.exists ( libpath ): #we must be running from the development environment
- libpath = os.path.abspath(os.path.join(localpath,'../../root/usr/lib'))
- if not os.path.exists ( libpath ):
- ## should die here
- print "**Problem finding libraries"
- libpath=localpath
-
- ## path to the Python-Ogre modules
- pythonpath = os.path.abspath(os.path.join(libpath, 'python2.5/site-packages') )
- ## and insert it into the system path
- sys.path.insert(0,pythonpath)
-
- ## now we need to set the library path so the shared libraries can be found
- try:
- ldpath = os.environ['LD_LIBRARY_PATH']
- except:
- ldpath=""
- newldpath = libpath + ":" + ldpath
- os.environ['LD_LIBRARY_PATH'] = newldpath
-
Property changes on: trunk/python-ogre/demos/ogre
___________________________________________________________________
Name: svn:ignore
+ *.log
ogre.cfg
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/environment.py 2008-07-14 06:32:30 UTC (rev 632)
@@ -17,7 +17,7 @@
_LOGGING_ON = False
_PreCompiled = True
-_STABLE = False # set to true if using specific versions of CVS and SVN checkouts..
+_STABLE = True # set to true if using specific versions of CVS and SVN checkouts..
##
@@ -39,6 +39,9 @@
return True
return False
+def isDebian():
+ return os.path.exists("/etc/debian_version")
+
def isMac():
if os.sys.platform == 'darwin':
return True
@@ -89,6 +92,10 @@
_SystemType = os.name ## nt or posix or mac
_PlatformType = sys.platform ## win32, ??
+UseSystem = "--usesystem" in sys.argv or (os.environ.has_key('USESYSTEM') and eval(os.environ['USESYSTEM'].title()))
+if "--usesystem" in sys.argv:
+ sys.argv.remove("--usesystem")
+
##
## Now we load the user specific stuff
##
@@ -101,8 +108,11 @@
log ( "Loaded Config (based on username) from %s" % (s ))
except ImportError:
try:
- s= 'PythonOgreConfig_' + _SystemType ## + '.py'
-
+ if UseSystem:
+ s= 'PythonOgreConfig_system'
+ else:
+ s= 'PythonOgreConfig_' + _SystemType ## + '.py'
+
Config = __import__( s )
_ConfigSet = True
log ( "Loaded Config (based on systemtype) from %s" % (s))
@@ -152,8 +162,12 @@
Config.RPATH=""
## BIG assumption about where you want things put
-ROOT = os.path.join(os.getcwd(),'root' )
-PREFIX = os.path.join(os.getcwd(),'root', 'usr' )
+if UseSystem:
+ ROOT = '/'
+ PREFIX = '/usr'
+else:
+ ROOT = os.path.join(os.getcwd(),'root' )
+ PREFIX = os.path.join(os.getcwd(),'root', 'usr' )
def unTarGz ( base, source ):
@@ -182,10 +196,12 @@
active = True
base = 'gccxml'
if _STABLE:
+ source_version = "20080522"
source = [
- [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 22052008 "+base, os.getcwd()]
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 22May2008 "+base, os.getcwd()]
]
else:
+ source_version = "20080627"
source = [
[cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 27June2008 "+base, os.getcwd()]
]
@@ -265,21 +281,43 @@
active = True
base = 'pygccxml'
if _STABLE:
+ source_version = "1300"
source = [
- [svn, " co -r 1300 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ [svn, " co -r 1300 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
]
else:
+ source_version = "1362"
source = [
- [svn, " co -r 1362 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ [svn, " co -r 1362 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
]
if isLinux() or isMac() :
buildCmds = [
[0,"python setup.py install --prefix="+ PREFIX , os.path.join (os.getcwd(), base, "pygccxml_dev") ],
+ ]
+ if isWindows():
+ buildCmds = [
+ [0,"python setup.py install " , os.path.join (os.getcwd(), base, "pygccxml_dev") ],
+ ]
+
+
+class pyplusplus:
+ pythonModule = False
+ active = True
+ base = 'pyplusplus'
+ if _STABLE:
+ source = [
+ [svn, " co -r 1300 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
+ ]
+ else:
+ source = [
+ [svn, " co -r 1362 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
+ ]
+ if isLinux() or isMac() :
+ buildCmds = [
[0,"python setup.py install --prefix=" + PREFIX , os.path.join (os.getcwd(), base, "pyplusplus_dev") ]
]
if isWindows():
buildCmds = [
- [0,"python setup.py install " , os.path.join (os.getcwd(), base, "pygccxml_dev") ],
[0,"python setup.py install " , os.path.join (os.getcwd(), base, "pyplusplus_dev") ]
]
@@ -289,7 +327,7 @@
pythonModule = False
active = True
if isLinux():
- base = 'Cg-2.0_May2008_x86'
+ base = 'Cg-2.0_May2008_x86'
source = [
[wget, " http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/"+base+".tgz",downloadPath]
]
@@ -472,6 +510,19 @@
]
+
+class boost_python_index:
+ active = True
+ version = "1.34.1"
+ pythonModule = False
+ ModuleName = ""
+ base = "boost-python-index"
+ if isLinux() or isMac():
+ source = [
+ ["cp",'-rf %s %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
+ ]
+ buildCmds = []
+
####################################################
@@ -483,9 +534,9 @@
class ogre:
active = True
pythonModule = True
- if _STABLE:
- version="1.4"
- else:
+ if _STABLE:
+ version="1.4"
+ else:
version = "1.7"
name='ogre'
ModuleName='OGRE'
@@ -529,10 +580,10 @@
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
LINKFLAGS = ''
externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', Config.LIB_Boost+'.dll']
- elif isLinux():
+ elif isLinux():
version = "1.4" #### UGLY OVERRIDE AT MOMENT...
libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
- base = "ogre-v1-4-9"
+ base = "ogre-v1-4-9"
source = [
[wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
]
@@ -555,8 +606,8 @@
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
]
- CCFLAGS = '' ## -DBOOST_PYTHON_MAX_ARITY=19'
- LINKFLAGS = ''
+ CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
+ LINKFLAGS = '-lboost_python_index-gcc42-1_34_1'
elif isMac():
base = "ogre-linux_osx-v1-4-9"
basedep = "OgreDependenciesOSX_20070929"
@@ -605,7 +656,7 @@
source=[]
if isLinux():
base = "ois"
- source=[
+ source=[
[wget, "http://downloads.sourceforge.net/wgois/ois_1.2.0.tar.gz", downloadPath]
]
# buildCmds = [
@@ -657,6 +708,8 @@
#externalFiles = ['OIS.dll']
if os.sys.platform == 'darwin':
LINKFLAGS = '-framework Python -framework Carbon'
+ else:
+ LINKFLAGS = '-lboost_python_index-gcc42-1_34_1'
class ogrerefapp:
active = True
@@ -803,6 +856,7 @@
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'CEGUI'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
+ LINKFLAGS = '-lboost_python_index-gcc42-1_34_1'
class ode:
Property changes on: trunk/python-ogre/generated
___________________________________________________________________
Name: svn:ignore
- Release
python-ogre.vcproj
python-ogre.ncb
python-ogre.sln
python-ogre.suo
*.ncb
*.suo
+ *
Property changes on: trunk/python-ogre/packages_2.5
___________________________________________________________________
Name: svn:ignore
+
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/cadunetree
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/caelum
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/et
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/noise
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/ofusion
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/ogredshow
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/ogreforests
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/ogrevideoffmpeg
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/particleuniverse
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/plib
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/theora
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/addons/watermesh
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/gui/CEGUI
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Modified: trunk/python-ogre/packages_2.5/ogre/gui/CEGUI/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/gui/CEGUI/__init__.py 2008-07-02 08:50:50 UTC (rev 631)
+++ trunk/python-ogre/packages_2.5/ogre/gui/CEGUI/__init__.py 2008-07-14 06:32:30 UTC (rev 632)
@@ -5,6 +5,14 @@
## we need the path for additional CEGUI dll's
if sys.platform == 'win32':
os.environ['PATH'] += ';' + __path__[0]
-
+
+elif sys.platform == "linux2":
+ ## We need to import the library
+ import ctypes
+ ctypes.CDLL("libCEGUIBase.so.1", ctypes.RTLD_GLOBAL)
+
from _cegui_ import *
+## Make sure we are using a sane XML parser
+System.setDefaultXMLParserName("TinyXMLParser")
+
warnings.resetwarnings( )
Property changes on: trunk/python-ogre/packages_2.5/ogre/gui/QuickGUI
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/gui/betagui
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/gui/navi
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/io/OIS
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/NxOgre
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/ODE
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/OgreBulletC
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/OgreBulletD
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/OgreNewt
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/OgreOde
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/OgreRefApp
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/Opcode
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/PhysX
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/physics/bullet
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Property changes on: trunk/python-ogre/packages_2.5/ogre/sound/OgreAL
___________________________________________________________________
Name: svn:ignore
+ _*_.so
Added: trunk/python-ogre/scripts/build-deb.sh
===================================================================
--- trunk/python-ogre/scripts/build-deb.sh (rev 0)
+++ trunk/python-ogre/scripts/build-deb.sh 2008-07-14 06:32:30 UTC (rev 632)
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# Run sudo so that we have the permissions to do things
+sudo true
+
+# The following modules are provided by the operating system
+sudo apt-get install \
+ cmake \
+ scons \
+ nvidia-cg-toolkit \
+ zziplib-bin \
+ libboost-dev \
+ libboost-python-dev \
+ libfreeimage-dev \
+ libois-dev \
+ libogre-dev \
+ libceguiogre-dev
+
+# Things we need to build ourself
+
+# The extra boost support module
+python python-ogre/BuildModule.py -r --build-deb boost_python_index || exit
+sudo true
+python python-ogre/BuildModule.py --install-deb boost_python_index || exit
+# The gccxml version is important to us (but only during build)
+python python-ogre/BuildModule.py -r --build-deb gccxml || exit
+sudo true
+python python-ogre/BuildModule.py --install-deb gccxml || exit
+# The pygccxml is dependent on the gccxml version we just built
+python python-ogre/BuildModule.py -r --build-deb pygccxml || exit
+sudo true
+python python-ogre/BuildModule.py --install-deb pygccxml || exit
+
+#python python-ogre/BuildModule.py -r --build-deb boost || exit
+
+# Build our custom extension to boost-indexing which pyplusplus needs
+python python-ogre/BuildModule.py -r --build-deb pyplusplus || exit
+sudo true
+python python-ogre/BuildModule.py --install-deb pyplusplus || exit
+
+# Generate the python-ogre package
+cd python-ogre
+dpkg-checkbuilddeps || exit
+fakeroot ./debian/rules binary
Property changes on: trunk/python-ogre/scripts/build-deb.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-15 18:48:59
|
Revision: 648
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=648&view=rev
Author: andy_miller
Date: 2008-07-15 11:49:08 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Fix for Windows build in environment
Various demo updates and code generation improvements
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/code_generators/ogreal/generate_code.py
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py
trunk/python-ogre/demos/ogreal/Demo_AL_01.py
trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
trunk/python-ogre/demos/ogreode/SimpleScenes.py
trunk/python-ogre/demos/ogreode/SimpleScenes_BoxStack.py
trunk/python-ogre/demos/ogreode/resources.cfg
trunk/python-ogre/demos/plib/Demo_Sound.py
trunk/python-ogre/demos/theora/demo_video.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-07-15 13:28:33 UTC (rev 647)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-07-15 18:49:08 UTC (rev 648)
@@ -20,9 +20,9 @@
## Path to your boost_pythonxxxx lib file
# PATH_LIB_Boost = os.path.join(BASE_DIR, PATH_Boost,'bin.v2/libs/python/build/msvc-8.0/release/threading-multi')
# # # # # # # PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc/release/threading-multi')
-PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0express/release/threading-multi')
+PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/threading-multi')
## and the name of the boost python library
-LIB_Boost = r'boost_python-vc90-mt-1_35'
+LIB_Boost = r'boost_python-vc90-mt-1_36'
# # LIB_Boost = r'boost_python-vc80-mt-1_34_1'
# LIB_Boost = r'boost_python-vc-mt-1_35'
@@ -55,6 +55,9 @@
PATH_OgreBullet= os.path.join(PATH_THIRDPARTY,'ogrebullet')
PATH_ogreforests= os.path.join(PATH_THIRDPARTY,'forests')
PATH_OGREAL= os.path.join(PATH_THIRDPARTY,'ogreal')
+
+PATH_OGREAL= os.path.join(BASE_DIR,'ogreal')
+
PATH_OPCODE= os.path.join(PATH_THIRDPARTY,'opcode')
PATH_quickgui= os.path.join(PATH_THIRDPARTY,'quickgui')
PATH_betagui= os.path.join(PATH_THIRDPARTY,'betagui')
@@ -103,7 +106,8 @@
# # PATH_LIB_OgreBullet = os.path.join( PATH_OgreBullet, 'lib/Release')
PATH_LIB_OgreOdePrefab = os.path.join( PATH_OgreOde, 'prefab/lib/Release' )
PATH_LIB_OgreOdeLoader = os.path.join( PATH_OgreOde, 'loader/lib/Release' )
-PATH_LIB_OgreAL = os.path.join( PATH_OGREAL)#, 'lib/Release' )
+
+PATH_LIB_OgreAL = os.path.join( PATH_OGREAL, 'lib/Release' )
PATH_LIB_betagui = PATH_betagui
PATH_LIB_quickgui = PATH_quickgui
PATH_LIB_NxOgre= os.path.join(PATH_NxOgre, 'lib')
@@ -135,7 +139,8 @@
PATH_INCLUDE_ODE = os.path.join( PATH_ODE, 'include')
PATH_INCLUDE_OPCODE = PATH_OPCODE
PATH_INCLUDE_ODESOURCE = os.path.join( PATH_ODE, 'ode/src')
-PATH_INCLUDE_OgreAL = os.path.join( PATH_OGREAL)#, 'include' )
+
+PATH_INCLUDE_OgreAL = os.path.join( PATH_OGREAL, 'include' )
PATH_INCLUDE_OPENAL = os.path.join( PATH_OPENAL, 'include')
PATH_INCLUDE_OGG= os.path.join( PATH_OGG, 'include' )
PATH_INCLUDE_VORBIS= os.path.join( PATH_VORBIS, 'include' )
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-07-15 13:28:33 UTC (rev 647)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-07-15 18:49:08 UTC (rev 648)
@@ -1,6 +1,16 @@
#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+## STARTER TEMPLATE..
+## replace ogreal with lowercase project name
+## set MAIN_NAMESPACE
+## rename and configure .h files
+
import os, sys, time, shutil
#add environment to the path
@@ -14,6 +24,7 @@
import customization_data
import hand_made_wrappers
+
from pygccxml import parser
from pygccxml import declarations
from pyplusplus import messages
@@ -22,139 +33,180 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
+from common_utils import docit
+MAIN_NAMESPACE = 'OgreAL'
-def filter_declarations( mb ):
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+def ManualExclude ( mb ):
global_ns = mb.global_ns
- global_ns.exclude()
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+ excludes=['::OgreAL::SoundManager::errorToString']
+ for e in excludes:
+ main_ns.mem_fun(e).exclude()
+
+ # a couple of defined functions without source
+ main_ns.class_('Sound').mem_fun('setGainValues').exclude()
+ main_ns.class_('Sound').mem_fun('setDistanceValues').exclude()
- ogreal_ns = global_ns.namespace( 'OgreAL' )
- ogreal_ns.include()
- ##ogreal_ns.mem_funs( return_type='::OgreAL::Real const *', allow_empty=True).exclude()
+ main_ns.class_('SoundManager').variable('WAV').exclude()
+ main_ns.class_('SoundManager').variable('OGG').exclude()
+ main_ns.class_('SoundManager').variable('FILE_TYPE').exclude()
+ main_ns.class_('SoundManager').variable('AUDIO_FORMAT').exclude()
-# #Virtual functions that return reference could not be overriden from Python
-# query = declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.VIRTUAL ) \
-# & declarations.custom_matcher_t( lambda decl: declarations.is_reference( decl.return_type ) )
-# ogreal_ns.calldefs( query ).virtuality = declarations.VIRTUALITY_TYPES.NOT_VIRTUAL
-
- ## Exclude protected and private that are not pure virtual
- query = ~declarations.access_type_matcher_t( 'public' ) \
- & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
- non_public_non_pure_virtual = ogreal_ns.calldefs( query )
- non_public_non_pure_virtual.exclude()
-
-
- # a couple of defined functions without source
- ogreal_ns.class_('Sound').mem_fun('setGainValues').exclude()
- ogreal_ns.class_('Sound').mem_fun('setDistanceValues').exclude()
+ excludes= ['::OgreAL::alcCreateContext',
+ '::OgreAL::alcCaptureOpenDevice',
+ '::OgreAL::alcCreateContext',
+ '::OgreAL::alcGetContextsDevice',
+ '::OgreAL::alcGetCurrentContext',
+ '::OgreAL::alcOpenDevice'
+ ]
+ for e in excludes:
+ main_ns.free_function(e).exclude()
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
- # need to force these to be included so they get exposed..
- global_ns.namespace( 'Ogre' ).class_('Singleton<OgreAL::Listener>').include()
- global_ns.namespace( 'Ogre' ).class_('Singleton<OgreAL::SoundManager>').include()
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
- # and classes the we need to be exposed but don't want code generated as they already exist in
- # other modules ('Ogre' in this case) that will be "imported" before the OgreAL module
- global_ns.namespace( 'Ogre' ).class_('AxisAlignedBox').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('MovableObject').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('MovableObjectFactory').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Vector3').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Node').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('RenderQueue').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('FrameEvent').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('FrameListener').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('Quaternion').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('SceneManager').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('SceneNode').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('NameValuePairList').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('String').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('ResourceGroupManager').include(already_exposed=True)
-#
-# global_ns.namespace( 'Ogre' ).class_('MapIterator<OgreAL::FormatMap>').include(already_exposed=True)
-
- ogreal_ns.class_('SoundManager').variable('WAV').exclude()
- ogreal_ns.class_('SoundManager').variable('OGG').exclude()
- ogreal_ns.class_('SoundManager').variable('FILE_TYPE').exclude()
- ogreal_ns.class_('SoundManager').variable('AUDIO_FORMAT').exclude()
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+def AutoFixes ( mb, MAIN_NAMESPACE ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+ # Functions that have void pointers in their argument list need to change to unsigned int's
+ pointee_types=[]
+ ignore_names=[]
+ common_utils.Fix_Void_Ptr_Args ( main_ns ) # , pointee_types, ignore_names )
-
-def set_call_policies( mb ):
-#
- # Set the default policy to deal with pointer/reference return types to reference_existing object
- # as this is the Ogre Default.
- mem_funs = mb.calldefs ()
- mem_funs.create_with_signature = True #Generated code will not compile on
- #MSVC 7.1 if function has throw modifier.
- for mem_fun in mem_funs:
- if mem_fun.call_policies:
- continue
- if declarations.is_pointer (mem_fun.return_type) or declarations.is_reference (mem_fun.return_type):
- mem_fun.call_policies = call_policies.return_value_policy(
- call_policies.reference_existing_object )
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ pointee_types=[]
+ ignore_names=[] # these are function names we know it's cool to exclude
+ common_utils.Fix_Pointer_Returns ( main_ns ) # , pointee_types, ignore_names )
-
-def set_smart_pointers( mb ):
- for v in mb.variables():
- if not declarations.is_class( v.type ):
- continue
- cls = declarations.class_traits.get_declaration( v.type )
- if cls.name.startswith( 'SharedPtr<' ):
- v.apply_smart_ptr_wa = True
- print "Applying Smart Pointer: ", v.name, " of class: ", cls.name
- elif cls.name.endswith( 'SharedPtr' ):
- v.apply_smart_ptr_wa = True
- print "Applying Smart Pointer: ", v.name, " of class: ", cls.name
-
-def configure_exception(mb):
- #We don't exclude Exception, because it contains functionality, that could
- #be useful to user. But, we will provide automatic exception translator
- return
- Exception = mb.namespace( 'OgreAL' ).class_( 'Exception' )
- Exception.include()
- Exception.translate_exception_to_string( 'PyExc_RuntimeError', 'exc.getFullDescription().c_str()' )
+ # functions that need to have implicit conversions turned off
+ ImplicitClasses=[]
+ common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+ common_utils.Auto_Document( mb, MAIN_NAMESPACE )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
-def add_transformations ( mb ):
- ns = mb.global_ns.namespace ('Ogre')
-
- def create_output( size ):
- return [ ft.output( i ) for i in range( size ) ]
-
+
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
-def query_containers_with_ptrs(decl):
- if not isinstance( decl, declarations.class_types ):
- return False
- if not decl.indexing_suite:
- return False
- return declarations.is_pointer( decl.indexing_suite.element_type )
-
#
# the 'main'function
#
def generate_code():
-# messages.disable(
-# #Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
-# messages.W1020
-# , messages.W1021
-# , messages.W1022
-# , messages.W1023
-# , messages.W1024
-# , messages.W1025
-# , messages.W1026
-# , messages.W1027
-# , messages.W1028
-# , messages.W1029
-# , messages.W1030
-# , messages.W1031
-# #, messages.W1040
-# # Inaccessible property warning
-# , messages.W1041 )
-
+ messages.disable(
+# Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
+ messages.W1020
+ , messages.W1021
+ , messages.W1022
+ , messages.W1023
+ , messages.W1024
+ , messages.W1025
+ , messages.W1026
+ , messages.W1027
+ , messages.W1028
+ , messages.W1029
+ , messages.W1030
+ , messages.W1031
+ , messages.W1035
+ , messages.W1040
+ , messages.W1038
+ , messages.W1041
+ , messages.W1036 # pointer to Python immutable member
+ , messages.W1033 # unnamed variables
+ , messages.W1018 # expose unnamed classes
+ , messages.W1049 # returns reference to local variable
+ , messages.W1014 # unsupported '=' operator
+ )
#
# Use GCCXML to create the controlling XML file.
# If the cache file (../cache/*.xml) doesn't exist it gets created, otherwise it just gets loaded
@@ -164,10 +216,8 @@
os.path.join( environment.ogreal.root_dir, "python_ogreal.h" )
, environment.ogreal.cache_file )
- defined_symbols = [ 'OGREAL_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD' ]
- if os.name=='nt':
- defined_symbols= defined_symbols + [ 'WIN32', '_LIB', '_MBCS', 'NDEBUG' ]
- defined_symbols.append( 'OGREAL_VERSION_' + environment.ogreal.version )
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols.append( 'VERSION_' + environment.ogreal.version )
#
# build the core Py++ system from the GCCXML created source
@@ -178,58 +228,63 @@
, include_paths=environment.ogreal.include_dirs
, define_symbols=defined_symbols
, indexing_suite_version=2
+ , cflags=environment.ogreal.cflags
)
+
+ # if this module depends on another set it here
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
+ # normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
+ mb.constructors().allow_implicit_conversion = False
+
+ mb.BOOST_PYTHON_MAX_ARITY = 25
+ mb.classes().always_expose_using_scope = True
+
#
- mb.register_module_dependency ( environment.ogre.generated_dir )
-
# We filter (both include and exclude) specific classes and functions that we want to wrap
#
- filter_declarations (mb)
-
+ global_ns = mb.global_ns
+ global_ns.exclude()
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ main_ns.include()
+
+ common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
+ ManualExclude ( mb )
+ common_utils.AutoInclude ( mb, MAIN_NAMESPACE )
+ ManualInclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+ AutoFixes ( mb, MAIN_NAMESPACE )
+ ManualFixes ( mb )
#
- # fix shared Ptr's that are defined as references but NOT const...
+ # We need to tell boost how to handle calling (and returning from) certain functions
#
-# find_nonconst ( mb.namespace( 'OgreAL' ) )
-
-
- mb.BOOST_PYTHON_MAX_ARITY = 25
- mb.classes().always_expose_using_scope = True
-
- ogreal_ns = mb.namespace( 'OgreAL' )
+ common_utils.Set_DefaultCall_Policies ( mb.global_ns.namespace ( MAIN_NAMESPACE ) )
- configure_exception( mb )
-
#
# the manual stuff all done here !!!
#
hand_made_wrappers.apply( mb )
-
- #
- # We need to tell boost how to handle calling (and returning from) certain functions
- #
- set_call_policies ( mb.global_ns.namespace ('OgreAL') )
- set_call_policies ( mb.global_ns.namespace ('Ogre') ) # need this to set singletons to return_existing_object
-
- # now we fix up the smart pointers ...
-# set_smart_pointers ( mb.global_ns.namespace ('OgreAL') )
-
- # here we fixup functions that expect to modifiy their 'passed' variables
- add_transformations ( mb )
-
- for cls in ogreal_ns.classes():
- cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
-
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
+ cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
+
common_utils.add_constants( mb, { 'ogreal_version' : '"%s"' % environment.ogreal.version.replace("\n", "\\\n")
, 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
+
+ ## need to create a welcome doc string for this...
+ common_utils.add_constants( mb, { '__doc__' : '"ogreal DESCRIPTION"' } )
+
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
#
##########################################################################################
- extractor = exdoc.doc_extractor("")
- mb.build_code_creator (module_name='_ogreal_' , doc_extractor= extractor)
+ extractor = exdoc.doc_extractor() # I'm excluding the UTFstring docs as lots about nothing
+ mb.build_code_creator (module_name='_ogreal_' , doc_extractor= extractor )
for inc in environment.ogreal.include_dirs:
mb.code_creator.user_defined_directories.append(inc )
@@ -238,30 +293,16 @@
huge_classes = map( mb.class_, customization_data.huge_classes( environment.ogreal.version ) )
- mb.split_module(environment.ogreal.generated_dir, huge_classes)
+ mb.split_module(environment.ogreal.generated_dir, huge_classes, use_files_sum_repository=False)
-# if not os.path.exists( os.path.join(environment.ogreal.generated_dir, 'py_shared_ptr.h' ) ):
-# shutil.copy( os.path.join( environment.shared_ptr_dir, 'py_shared_ptr.h' )
-# , environment.ogreal.generated_dir )
## now we need to ensure a series of headers and additional source files are
- ## copied to the generated directory.. Also cope with sub directories
- additional_dirs=[
- [environment.Config.PATH_OGREAL,''],
-# [os.path.join(environment.Config.root_dir, 'ThirdParty', 'ogreal', 'extra'),''],
-# [os.path.join(environment.Config.root_dir, 'ThirdParty', 'ogreal', 'extra','ogg'),'ogg'],
-# # [os.path.join(environment.Config.root_dir, 'ThirdParty', 'ogreal', 'extra','vorbis'),'vorbis'],
- ]
- for d,d1 in additional_dirs:
- for f in os.listdir(d):
- if f.endswith('cpp') or f.endswith('.h') or f.endswith('.c'):
- sourcefile = os.path.join(d, f)
- destfile = os.path.join(environment.ogreal.generated_dir, d1, f )
- if not os.path.exists ( os.path.join(environment.ogreal.generated_dir, d1 ) ):
- os.mkdir ( os.path.join(environment.ogreal.generated_dir, d1 ) )
- if not common_utils.samefile( sourcefile ,destfile ):
- shutil.copy( sourcefile, environment.ogreal.generated_dir )
- print "Updated ", f, "as it was missing or out of date"
+ ## copied to the generated directory..
+
+# common_utils.copyTree ( sourcePath = environment.Config.PATH_Config.PATH_OGREAL,
+# destPath = environment.ogreal.generated_dir,
+# recursive=False )
+
if __name__ == '__main__':
start_time = time.clock()
generate_code()
- print 'Python-OgreAL source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-07-15 13:28:33 UTC (rev 647)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-07-15 18:49:08 UTC (rev 648)
@@ -1,13 +1,18 @@
#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
-#-------------------------------------------------------------------------------
-# TODO:
-# 1. void* as a function argument - they are currently wrapped (and compile/load etc) due to latest CVS of boost.
-# However probably don't actually work
-# 2. Properties.py and calling 'properties.create' - commented out at the moment, not sure if it is really needed?
+## STARTER TEMPLATE..
+## replace ogreode with lowercase project name
+## set MAIN_NAMESPACE
+## rename and configure .h files
-import os, sys, time
+import os, sys, time, shutil
+
#add environment to the path
sys.path.append( os.path.join( '..', '..' ) )
#add common utils to the pass
@@ -19,6 +24,7 @@
import customization_data
import hand_made_wrappers
+
from pygccxml import parser
from pygccxml import declarations
from pyplusplus import messages
@@ -30,242 +36,258 @@
from pyplusplus.module_creator import sort_algorithms
import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
-import common_utils.process_warnings as process_warnings
+from common_utils import docit
+MAIN_NAMESPACE = ['OgreOde','OgreOde_Prefab', 'OgreOde_Loader']
-def filter_declarations( mb ):
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
global_ns = mb.global_ns
- global_ns.exclude()
+# if MAIN_NAMESPACE:
+# main_ns = global_ns.namespace( MAIN_NAMESPACE )
+# else:
+# main_ns = global_ns
-# # global_ns.namespace("std").class_('list<Ogre::Plane, std::allocator<Ogre::Plane> >').exclude()
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
- if not environment.ogre.version.startswith("1.2") and os.name =='nt':
- mb.global_ns.class_( 'vector<Ogre::Vector4, std::allocator<Ogre::Vector4> >' ).exclude( )
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+# if MAIN_NAMESPACE:
+# main_ns = global_ns.namespace( MAIN_NAMESPACE )
+# else:
+# main_ns = global_ns
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+ global_ns = mb.global_ns
+# if MAIN_NAMESPACE:
+# main_ns = global_ns.namespace( MAIN_NAMESPACE )
+# else:
+# main_ns = global_ns
+ ## here we adjust for functions that return poiners to ODE "ID's", which are really C structs
+ ## I may have been over agressive in identifing these functions but hopefully not...
+ for func in mb.namespace( 'OgreOde' ).member_functions():
+ if func.return_type.decl_string.endswith('ID'):
+ print "Setting ", func.name, "to Opaque"
+ func.opaque = True
+ func.call_policies = call_policies.return_value_policy(
+ call_policies.return_opaque_pointer )
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ global_ns = mb.global_ns
+# if MAIN_NAMESPACE:
+# main_ns = global_ns.namespace( MAIN_NAMESPACE )
+# else:
+# main_ns = global_ns
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
- ogreode_ns = global_ns.namespace( 'OgreOde' )
- ogreode_ns.include()
- ogreode_ns.class_("Body").variable("MovableType").exclude() ## this "static const Ogre::String" causes msvc7.1 to die!!
- ogreode_ns.class_("Utility").variable("Infinity").exclude() ## this "static const Ogre::String" causes msvc7.1 to die!!
-
- ogreode_ns.class_("EntityInformer").mem_fun("getIndices").exclude() ## unsigned int const *
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
- # Unfortunately the classes here being used with Maintainedlist don't implement ALL of
- # maintaintlist's functions - hence Py++ has tried to expose them all and it fails at
- # compile time. Probably need to patch the source to implement null functions.
- ogreode_ns.class_("MaintainedList<OgreOde::Body>").exclude()
- ogreode_ns.class_("MaintainedList<OgreOde::Geometry>").exclude()
- ogreode_ns.class_("MaintainedList<OgreOde::Joint>").exclude()
- ogreode_ns.class_("MaintainedList<OgreOde::JointGroup>").exclude()
- ogreode_ns.class_("MaintainedList<OgreOde::Space>").exclude()
-# ogreode_ns.class_("MaintainedListIterator<OgreOde::Body>").exclude()
-# ogreode_ns.class_("MaintainedListIterator<OgreOde::Geometry>").exclude()
-# ogreode_ns.class_("MaintainedListIterator<OgreOde::Joint>").exclude()
-# ogreode_ns.class_("MaintainedListIterator<OgreOde::JointGroup>").exclude()
-# ogreode_ns.class_("MaintainedListIterator<OgreOde::Space>").exclude()
-
- # this one has link errors
- ogreode_ns.class_("CircularBuffer<OgreOde::BodyState*>").exclude()
- ogreode_ns.class_("PlaneBoundedRegionGeometry").member_functions("_planeCallback").exclude()
- ogreode_ns.class_("TerrainGeometry").member_functions("_heightCallback").exclude()
-
- ## couple of functions that are hand wrapped
- ogreode_ns.class_("Geometry").mem_fun("setUserObject").exclude()
- ogreode_ns.class_("Geometry").mem_fun("getUserObject").exclude()
+def AutoFixes ( mb, ns ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ main_ns = mb.global_ns.namespace(ns)
+
+ # Functions that have void pointers in their argument list need to change to unsigned int's
+ pointee_types=[]
+ ignore_names=[]
+ common_utils.Fix_Void_Ptr_Args ( main_ns ) # , pointee_types, ignore_names )
- ogreodeP_ns = global_ns.namespace( 'OgreOde_Prefab' )
- ogreodeP_ns.include()
- ogreodeP_ns.class_("Vehicle").mem_fun("load").exclude()
-
- ogreodeL_ns = global_ns.namespace( 'OgreOde_Loader' )
- ogreodeL_ns.include()
- ogreodeL_ns.class_('DotLoader').mem_fun('loadFile').exclude() # it returns a pointer to a tinyxml object - could make it opaque?
- ##ogreodeL_ns.class_('DotLoader').mem_fun('loadObject').exclude() # hand wrapped
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ pointee_types=[]
+ ignore_names=[] # these are function names we know it's cool to exclude
+ common_utils.Fix_Pointer_Returns ( main_ns ) # , pointee_types, ignore_names )
+
+ # functions that need to have implicit conversions turned off
+ ImplicitClasses=[]
+ common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
-
- ## Exclude private that are not pure virtual
- query = declarations.access_type_matcher_t( 'private' ) \
- & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
- ogreode_ns.calldefs( query,allow_empty=True ).exclude()
- ogreodeP_ns.calldefs( query,allow_empty=True ).exclude()
- ogreodeL_ns.calldefs( query,allow_empty=True ).exclude()
-
- ## now expose but don't create class that exist in other modules
- global_ns.namespace( 'Ogre' ).class_('Bone').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Quaternion').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('SimpleRenderable').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('FrameEvent').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Plane').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('SceneQuery').struct('WorldFragment').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('MovableObjectFactory').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('MovableObject').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('RaySceneQueryListener').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Root').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Matrix3').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Vector3').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('UserDefinedObject').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('AxisAlignedBox').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Camera').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('FrameListener').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Node').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('SceneNode').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('RenderQueue').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Entity').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('SceneManager').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Matrix4').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Plugin').include(already_exposed=True)
-# print "\nCLASSES::: Std"
-# for c in global_ns.namespace('std').classes():
-# print c.name, c
- global_ns.namespace("std").class_('list<Ogre::Plane, std::allocator<Ogre::Plane> >').include(already_exposed=True)
-# global_ns.class_('::std::list<Ogre::Plane, std::allocator<Ogre::Plane> >').include(already_exposed=True)
-# print "\nCLASSES::: std"
-# for c in global_ns.namespace('std').classes():
-# print c.name, c
-# sys.exit()
-# # print "\nCLASSES::: Prefab"
-# for c in global_ns.namespace('OgreOde_Prefab').classes():
-# print c.name, c
-# print "\nCLASSES::: Loader"
-# for c in global_ns.namespace('OgreOde_Loader').classes():
-# print c.name, c
-# print "\n\nfunction"
-# c= global_ns.namespace('OgreOde_Prefab').class_('Vehicle')
-# print dir(c)
-# mem_funs = c.calldefs()
-# for f in mem_funs:
-# print f
-# sys.exit()
-# global_ns.namespace( 'std' ).class_('vector<Ogre::Vector4, std::allocator<Ogre::Vector4> >').include(already_exposed=True)
-# global_ns.namespace( 'std' ).class_('StringVector').include(already_exposed=True)
-
- #global_ns.namespace( 'Ogre' ).class_('Root').class_('PluginInstanceList').exclude()
-
-def set_call_policies( mb ):
-#
- # Set the default policy to deal with pointer/reference return types to reference_existing object
- # as this is the Ogre Default.
- mem_funs = mb.calldefs ()
- mem_funs.create_with_signature = True #Generated code will not compile on
- #MSVC 7.1 if function has throw modifier.
- for mem_fun in mem_funs:
- if mem_fun.call_policies:
- continue
- if declarations.is_pointer (mem_fun.return_type) or declarations.is_reference (mem_fun.return_type):
- mem_fun.call_policies = call_policies.return_value_policy(
- call_policies.reference_existing_object )
-
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+ common_utils.Auto_Document( mb, ns )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
-def add_transformations ( mb ):
- global_ns = mb.global_ns
-# global_ns.member_functions('::OgreOde_Prefab::Ragdoll::pick').exclude()
-# global_ns.mem_fun('::OgreOde_Prefab::Ragdoll::pick', arg_types=[None,None,None]).include()
-# # f = global_ns.mem_fun('::OgreOde_Prefab::Ragdoll::pick', arg_types=[None,None,None])
-# # f.add_transformation(ft.output('body'), ft.output('position') , alias='pick')
-
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
+
-
-
-def configure_exception(mb):
- #We don't exclude Exception, because it contains functionality, that could
- #be useful to user. But, we will provide automatic exception translator
- Exception = mb.namespace( 'OgreOde' ).class_( 'Exception' )
- Exception.translate_exception_to_string( 'PyExc_RuntimeError', 'exc.getFullDescription().c_str()' )
-
-def generate_ogreode():
+#
+# the 'main'function
+#
+def generate_code():
+ messages.disable(
+# Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
+ messages.W1020
+ , messages.W1021
+ , messages.W1022
+ , messages.W1023
+ , messages.W1024
+ , messages.W1025
+ , messages.W1026
+ , messages.W1027
+ , messages.W1028
+ , messages.W1029
+ , messages.W1030
+ , messages.W1031
+ , messages.W1035
+ , messages.W1040
+ , messages.W1038
+ , messages.W1041
+ , messages.W1036 # pointer to Python immutable member
+ , messages.W1033 # unnamed variables
+ , messages.W1018 # expose unnamed classes
+ , messages.W1049 # returns reference to local variable
+ , messages.W1014 # unsupported '=' operator
+ )
+ #
+ # Use GCCXML to create the controlling XML file.
+ # If the cache file (../cache/*.xml) doesn't exist it gets created, otherwise it just gets loaded
+ # NOTE: If you update the source library code you need to manually delete the cache .XML file
+ #
xml_cached_fc = parser.create_cached_source_fc(
os.path.join( environment.ogreode.root_dir, "python_ogreode.h" )
, environment.ogreode.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'ODE_LIB' ]
+
+ defined_symbols = ['OGRE_NONCLIENT_BUILD', 'ODE_LIB' ]
defined_symbols.append( 'OGREODE_VERSION_' + environment.ogreode.version )
-
+
+ #
+ # build the core Py++ system from the GCCXML created source
+ #
mb = module_builder.module_builder_t( [ xml_cached_fc ]
, gccxml_path=environment.gccxml_bin
, working_directory=environment.root_dir
, include_paths=environment.ogreode.include_dirs
- , define_symbols= defined_symbols
- , indexing_suite_version=2 )
-
- ## This module depends on Ogre
+ , define_symbols=defined_symbols
+ , indexing_suite_version=2
+ , cflags=environment.ogreode.cflags
+ )
+
+ # if this module depends on another set it here
mb.register_module_dependency ( environment.ogre.generated_dir )
- filter_declarations (mb)
-
- ## we need to handle "ode" return values etc
- query = lambda decl: isinstance( decl, ( declarations.class_t, declarations.class_declaration_t ) ) \
- and decl.name.startswith( 'dx' )
- mb.global_ns.decls( query ).opaque = True
- ## here we adjust for functions that return poiners to ODE "ID's", which are really C structs
- ## I may have been over agressive in identifing these functions but hopefully not...
- for func in mb.namespace( 'OgreOde' ).member_functions():
- if func.return_type.decl_string.endswith('ID'):
- print "Setting ", func.name, "to Opaque"
- func.opaque = True
- func.call_policies = call_policies.return_value_policy(
- call_policies.return_opaque_pointer )
-
-
- #
+ # normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
+ mb.constructors().allow_implicit_conversion = False
+
mb.BOOST_PYTHON_MAX_ARITY = 25
mb.classes().always_expose_using_scope = True
-
- ogreode_ns = mb.namespace( 'OgreOde' )
- try:
- common_utils.fix_unnamed_classes( ogreode_ns.classes( name='' ), 'OgreOde' )
- except:
- pass # there weren't any unnamed classes
-
- common_utils.configure_shared_ptr(mb)
-# configure_exception( mb )
-
+
#
+ # We filter (both include and exclude) specific classes and functions that we want to wrap
+ #
+ global_ns = mb.global_ns
+ global_ns.exclude()
+ for ns in MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( ns )
+ main_ns.include()
+
+ common_utils.AutoExclude ( mb, ns )
+ ManualExclude ( mb )
+ common_utils.AutoInclude ( mb, ns )
+ ManualInclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+ AutoFixes ( mb, ns )
+ ManualFixes ( mb )
+ #
+ # We need to tell boost how to handle calling (and returning from) certain functions
+ #
+ common_utils.Set_DefaultCall_Policies ( mb.global_ns.namespace ( ns ) )
+
+ #
# the manual stuff all done here !!!
#
hand_made_wrappers.apply( mb )
-
- #
- # We need to tell boost how to handle calling (and returning from) certain functions
- #
- set_call_policies ( mb.global_ns.namespace ('OgreOde') )
- set_call_policies ( mb.global_ns.namespace ('OgreOde_Prefab') )
- set_call_policies ( mb.global_ns.namespace ('OgreOde_Loader') )
-
- # here we fixup functions that expect to modifiy their 'passed' variables
- add_transformations ( mb )
- #
- # add properties to the 3 namespaces, in a conservative fashion
- #
- namespaces = ['OgreOde', 'OgreOde_Prefab', 'OgreOde_Loader']
- for ns in namespaces:
- for cls in mb.global_ns.namespace(ns).classes():
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
-
+
common_utils.add_constants( mb, { 'ogreode_version' : '"%s"' % environment.ogreode.version.replace("\n", "\\\n")
, 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
- for ns in namespaces:
- for cls in mb.global_ns.namespace(ns).classes():
- process_warnings.go ( cls )
+
+ ## need to create a welcome doc string for this...
+ common_utils.add_constants( mb, { '__doc__' : '"ogreode DESCRIPTION"' } )
+
+
+ ##########################################################################################
#
- # now do the work
+ # Creating the code. After this step you should not modify/customize declarations.
#
- #Creating ogreode creator. After this step you should not modify/customize declarations.
- #
- extractor = exdoc.doc_extractor("")
- mb.build_code_creator (module_name='_ogreode_' , doc_extractor= extractor)
-
+ ##########################################################################################
+ extractor = exdoc.doc_extractor() # I'm excluding the UTFstring docs as lots about nothing
+ mb.build_code_creator (module_name='_ogreode_' , doc_extractor= extractor )
+
for inc in environment.ogreode.include_dirs:
mb.code_creator.user_defined_directories.append(inc )
-
mb.code_creator.user_defined_directories.append( environment.ogreode.generated_dir )
- mb.code_creator.replace_included_headers( customization_data.header_files(environment.ogreode.version) )
+ mb.code_creator.replace_included_headers( customization_data.header_files( environment.ogreode.version ) )
- huge_classes = map( mb.class_, customization_data.huge_classes(environment.ogreode.version) )
- print "ABOUT TO SPLIT"
- mb.split_module(environment.ogreode.generated_dir, huge_classes, use_files_sum_repository=False )
+ huge_classes = map( mb.class_, customization_data.huge_classes( environment.ogreode.version ) )
+ mb.split_module(environment.ogreode.generated_dir, huge_classes, use_files_sum_repository=False)
+
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generated directory..
+
+# common_utils.copyTree ( sourcePath = environment.Config.PATH_INCLUDE_ogreode,
+# destPath = environment.ogreode.generated_dir,
+# recursive=False )
+
if __name__ == '__main__':
start_time = time.clock()
- generate_ogreode()
- print 'Python-ogreode source ogreode was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
+ generate_code()
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Modified: trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py 2008-07-15 13:28:33 UTC (rev 647)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py 2008-07-15 18:49:08 UTC (rev 648)
@@ -138,7 +138,7 @@
self.GUIsystem.setDefaultMouseCursor("TaharezLook", "MouseArrow")
self.GUIsystem.setDefaultFont( "BlueHighway-12")
- sheet = CEGUI.WindowManager.getSingleton().loadWindowLayout("ogregui.layout", False)
+ sheet = CEGUI.WindowManager.getSingleton().loadWindowLayout("ogregui.layout" ) ##, False)
self.GUIsystem.setGUISheet(sheet)
#
Modified: trunk/python-ogre/demos/ogreal/Demo_AL_01.py
===================================================================
--- trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-07-15 13:28:33 UTC (rev 647)
+++ trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-07-15 18:49:08 UTC (rev 648)
@@ -65,6 +65,9 @@
def _createScene(self):
"Override sf create scene"
+ self.soundManager = OgreAL.SoundManager() ## "Generic Software")
+
+
sceneManager = self.sceneManager
camera = self.camera
@@ -119,29 +122,30 @@
#
#
#
- self.soundManager = OgreAL.SoundManager() ## "Generic Software")
dl = self.soundManager.getDeviceList()
# for dev in dl:
# print "Device available:", dev
+
node = rootNode.createChildSceneNode( "Head" )
node.attachObject( ogreHead )
sound = self.soundManager.createSound("Roar", "roar.wav", True) ## "6chan.ogg", True) ## "roar.wav", True)
node.attachObject(sound)
sound.play()
-
- bgSound = self.soundManager.createSound("stereo", "6chan.ogg", True, True)
- bgSound.setGain(0.5)
- bgSound.setRelativeToListener(True)
- bgSound.play()
+ OgreAL.SoundManager.getSingleton().getSound("Roar").play()
+
+ bgSound = self.soundManager.createSound("ZeroFactor", "Zero Factor - Untitled.ogg", True, True)
+
+
node = sceneManager.getRootSceneNode().createChildSceneNode("CameraNode")
node.setPosition(0, 100, 100)
+
node = node.createChildSceneNode("PitchNode")
-# node.attachObject(self.camera)
+# node.attachObject(self.camera)
node.attachObject(self.soundManager.getListener())
node.pitch(ogre.Degree(-30))
- self.pitchnode = node
+ self.pitchnode = node
OgreAL.SoundManager.getSingleton().getSound("Roar").play()
Modified: trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
===================================================================
--- trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-07-15 13:28:33 UTC (rev 647)
+++ trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-07-15 18:49:08 UTC (rev 648)
@@ -10,14 +10,14 @@
#------------------------------------------------------------------------------------------------
carNames = [
+ "Subaru",
"Jeep",
- "JeepSway",
- "Subaru"
+ "JeepSway"
]
carFileNames= [
+ "subaru.ogreode",
"jeep.ogreode",
- "jeep.ogreode",
- "subaru.ogreode"
+ "jeep.ogreode"
]
sSelectedCar = 1
maxNumCar = 3
@@ -25,6 +25,7 @@
#------------------------------------------------------------------------------------------------
class GranTurismOgreFrameListener ( sf.FrameListener ):
def __init__(self, win, cam,time_step,root,world) :
+ print "frame init"
sf.FrameListener.__init__(self, win,cam)
self.camera = cam
self.vehicle = None
@@ -85,6 +86,7 @@
ogre.OverlayManager.getSingleton().getOverlayElement("OgreOdeDemos/Keys").setCaption("Keys: " + "I/K - Accelerate/Brake, J/L - Turn, X - Change drive mode, N - Change Car")
ogre.OverlayManager.getSingleton().getOverlayElement("OgreOdeDemos/OtherKeys").setCaption("Extra: " + "E - Debug Object")
pOver.show()
+ print "Done"
#------------------------------------------------------------------------------------------------
def __del__(self ):
@@ -92,6 +94,7 @@
#------------------------------------------------------------------------------------------------
def changeCar( self ):
+ print "ChangeCar"
self.sSelectedCar = (self.sSelectedCar + 1) % self.maxNumCar
del self.vehicle
@@ -106,8 +109,10 @@
self.vehicle.setPosition(v_pos)
self.updateInfo()
+ print "Done Change Car"
#------------------------------------------------------------------------------------------------
def updateInfo( self ):
+ print "** Updating Info"
pOver = ogre.OverlayManager.getSingleton().getByName("OgreOdeDemos/Overlay")
newInfo = "Info: " + carNames[self.sSelectedCar]
if self.drive =='R':
@@ -120,9 +125,11 @@
elif self.drive == '4':
newInfo = newInfo + " & Rear wheel drive"
ogre.OverlayManager.getSingleton().getOverlayElement("OgreOdeDemos/Info").setCaption(newInfo)
+ print "** Done"
#------------------------------------------------------------------------------------------------
def frameStarted( self, evt):
+ print "*** frameStarted"
time = evt.timeSinceLastFrame
ret = sf.FrameListener.frameStarted(self,evt)
@@ -179,11 +186,12 @@
self.TimeUntilNextToggle = 0.5
if( not self._stepper.isPaused()):
- self.vehicle.setInputs(self.Keyboard.isKeyDown(OIS.KC_J),
- self.Keyboard.isKeyDown(OIS.KC_L),
- self.Keyboard.isKeyDown(OIS.KC_I),
- self.Keyboard.isKeyDown(OIS.KC_K))
- self.vehicle.update(time)
+ print "**** Stepping"
+# self.vehicle.setInputs(self.Keyboard.isKeyDown(OIS.KC_J),
+# self.Keyboard.isKeyDown(OIS.KC_L),
+# self.Keyboard.isKeyDown(OIS.KC_I),
+# self.Keyboard.isKeyDown(OIS.KC_K))
+# self.vehicle.update(time)
# Thanks to Ahmed!
followFactor = 0.2
@@ -200,6 +208,7 @@
self.camera.move( (toCam - self.camera.getPosition()) * followFactor )
self.camera.lookAt(self.vehicle.getSceneNode().getPosition() + ((self.vehicle.getSceneNode().getOrientation() * ogre.Vector3.UNIT_Z) * camLookAhead))
+ print "*** FrameStarted End" , ret
return ret
#------------------------------------------------------------------------------------------------
@@ -242,6 +251,7 @@
#------------------------------------------------------------------------------------------------
# Just override the mandatory create scene method
def _createScene(self):
+ print "** _CreateScene"
# Set ambient light
self.sceneManager.setAmbientLight(ogre.ColourValue(0.5, 0.5, 0.5))
self.sceneManager.setSkyBox(True,"GranTurismOgre/Skybox")
@@ -273,9 +283,11 @@
track_node.attachObject(track_mesh)
ei = OgreOde.EntityInformer(track_mesh)
+ print "** Done 1"
print ei
print self._world.getDefaultSpace()
self._track = ei.createStaticTriangleMesh(self._world, self._world.getDefaultSpace())
+ print "****"
#------------------------------------------------------------------------------------------------
# Create new frame listener
@@ -284,6 +296,7 @@
self.root.addFrameListener(self.FrameListener)
#------------------------------------------------------------------------------------------------
def collision(self, contact):
+ print "** Collision "
if not OgreOde.Vehicle.handleTyreCollision(contact):
contact.setBouncyness(0.0)
contact.setCoulombFriction(18.0)
Modified: trunk/python-ogre/demos/ogreode/SimpleScenes.py
===================================================================
--- trunk/python-ogre/demos/ogreode/SimpleScenes.py 2008-07-15 13:28:33 UTC (rev 647)
+++ trunk/python-ogre/demos/ogreode/SimpleScenes.py 2008-07-15 18:49:08 UTC (rev 648)
@@ -13,9 +13,11 @@
STEP_RATE = 0.01
def __init__ ( self, world ):
global KEY_DELAY
+ print "** SimpleScenes Init"
OgreOde.CollisionListener.__init__(self)
+ print "1"
OgreOde.StepListener.__init__(self)
-
+ print "Ode Created"
self._world = world
self._mgr = self._world.getSceneManager()
self._world.setCollisionListener(self)
@@ -23,15 +25,29 @@
self._key_delay = 1.0 # KEY_DELAY
self._last_node = 0
self.RagdollList=[]
-
+ print "3"
self.dotOgreOdeLoader = OgreOde.DotLoader( world )
+ print "3.1"
self._bodies=[] # an array to keep objects around in (like c++ "new" )
self._geoms=[]
self._joints=[]
+ print "3.2"
self._ragdollFactory = OgreOde.RagdollFactory()
+ print dir (OgreOde)
+ print dir ( self._ragdollFactory)
+# print self._ragdollFactory.Type
+
+ print "Type is:", self._ragdollFactory.getType()
+ print "Flags:", self._ragdollFactory.requestTypeFlags()
+ print "3.3"
+ print self._ragdollFactory
+ print ogre.Root.getSingletonPtr()
+
ogre.Root.getSingletonPtr().addMovableObjectFactory(self._ragdollFactory)
+
+ print "3.4"
self.setInfoText("")
-
+ print "4"
self.xmlNames = [
"zombie",
"zombie",
@@ -66,13 +82,14 @@
]
self.sSelectedMesh = 0
self._ragdoll_count = 0
-
+ print "SimpleScenes Init Done"
#
# Called by OgreOde whenever a collision occurs, so
# that we can modify the contact parameters
#
def collision( self, contact) :
+# print "Simple Scenes Collision"
## Check for collisions between things that are connected and ignore them
g1 = contact.getFirstGeometry()
g2 = contact.getSecondGeometry()
@@ -95,25 +112,31 @@
# Handle key presses
#
def frameEnded(self, time, keyinput, mouse):
+# print "SimpleScenes frameEnded"
self._key_delay += time
for d in self.RagdollList:
d.update() # ??
+# print "Done"
#
# Utility method to set the information string in the UI
#
def setInfoText(self, text):
+# print "Setinfotext"
ogre.OverlayManager.getSingleton().getOverlayElement("OgreOdeDemos/Info").setCaption(ogre.UTFString("Info: " + text))
def getLastNode(self):
+# print "getlastnode"
return self._last_node
## If we register this with a stepper it'll get told every time the world's about to be stepped
def preStep(self, time):
+# print "preStep"
self.addForcesAndTorques()
return True
def addForcesAndTorques(self):
+# print "Addforces"
pass
# /*
# Create a ragdoll
@@ -187,23 +210,28 @@
typeName = "gun"
else:
typeName = "unknown"
-
+ print "2", typeName
## Create the visual representation (the Ogre entity and scene node)
name = typeName + str(len(self._bodies))
entity = self._mgr.createEntity(name, typeName + ".mesh")
node = self._mgr.getRootSceneNode().createChildSceneNode(name)
node.attachObject(entity)
- entity.setNormaliseNormals(True)
+# entity.setNormaliseNormals(True)
entity.setCastShadows(True)
-
+ print "3"
## Pick a size
size = ogre.Vector3((OgreOde.Utility.randomReal() * 0.5 + 0.1) * 2.0,
(OgreOde.Utility.randomReal() * 0.5 + 0.1) * 2.0,
(OgreOde.Utility.randomReal() * 0.5 + 0.1) * 2.0)
-
+ print size
## Create a body associated with the node we created
body = OgreOde.Body(self._world) ##AJM
+ print body
+ print "About to attach"
+ print node
node.attachObject(body)
+ print "node:", node
+
## Set the mass and geometry to match the visual representation
if objectClass == OgreOde.Geometry.Class_Box:
@@ -217,12 +245,15 @@
body.setMass(mass)
elif objectClass == OgreOde.Geometry.Class_Sphere:
+ print "setting spehere"
mass= OgreOde.SphereMass(1.0,size.x)
mass.setDensity(5.0,size.x)
-
+ print mass
geom = OgreOde.SphereGeometry(size.x,self._world,self._space)
+ print gemo
node.setScale(size.x * 0.2,size.x * 0.2,size.x * 0.2)
body.setMass(mass)
+ print body
elif objectClass == OgreOde.Geometry.Class_Cylinder:
size.x *= 0.5
@@ -245,6 +276,7 @@
body.setMass(mass)
## Tie the collision geometry to the physical body
+ print "5"
geom.setBody(body)
## Keep track of the body
@@ -252,7 +284,7 @@
self._geoms.append(geom)
self._key_delay = 0.0
-
+ print "body is: ", body
## If we created something position and orient it randomly
if (body) :
body.setOrientation(ogre.Quaterni...
[truncated message content] |
|
From: <mi...@us...> - 2008-07-16 00:58:51
|
Revision: 649
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=649&view=rev
Author: mithro
Date: 2008-07-15 17:59:00 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Added ability to build a stable version without clobbering Andy.
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_system.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/build-deb.sh
Property Changed:
----------------
trunk/python-ogre/
Property changes on: trunk/python-ogre
___________________________________________________________________
Name: svn:ignore
- python-ogre.sln
python-ogre.suo
python-ogre.ncb
Release
*.pyc
log.out
build_dir_2.5
downloads
build
build-stamp
+ python-ogre.sln
python-ogre.suo
python-ogre.ncb
Release
*.pyc
log.out
build_dir_2.5
downloads
build
build-stamp
STABLE
Modified: trunk/python-ogre/PythonOgreConfig_system.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_system.py 2008-07-15 18:49:08 UTC (rev 648)
+++ trunk/python-ogre/PythonOgreConfig_system.py 2008-07-16 00:59:00 UTC (rev 649)
@@ -14,8 +14,6 @@
PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = LOCAL_LIB
-## and the name of the boost python library
-LIB_Boost = 'libboost_python-gcc42-mt-1_34_1'
# in Linux we need to code in the Relative path for the library
RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-15 18:49:08 UTC (rev 648)
+++ trunk/python-ogre/environment.py 2008-07-16 00:59:00 UTC (rev 649)
@@ -17,9 +17,7 @@
_LOGGING_ON = False
_PreCompiled = True
-_STABLE = False # set to true if using specific versions of CVS and SVN checkouts..
-
##
## set this to True if you compiled Ogre with Threads enabled
##
@@ -127,7 +125,9 @@
##
print "\n\n You DO need to create a PythonOgreConfig_%s.py file with config details" % ( _SystemType)
sys.exit(-1)
-
+
+_STABLE = os.path.exists("STABLE") # set to true if using specific versions of CVS and SVN checkouts..
+
######################
downloadPath = os.path.abspath("downloads")
wget = "wget -c -nc "
@@ -451,12 +451,12 @@
pythonModule = False
ModuleName = ""
# AJM Changed so stable is 1.35 as this seems fine....
-# if _STABLE:
-# base = 'boost_1_34_1'
-# lib= 'boost_python-vc90-mt-1_34_1'
-# else:
- base = 'boost_1_35_0'
- lib = 'boost_python-vc90-mt-1_35'
+ if _STABLE:
+ base = 'boost_1_34_1'
+ lib= 'boost_python-vc90-mt-1_34_1'
+ else:
+ base = 'boost_1_35_0'
+ lib = 'boost_python-vc90-mt-1_35'
if isLinux() or isMac():
bjambase = 'boost-jam-3.1.16'
Modified: trunk/python-ogre/scripts/build-deb.sh
===================================================================
--- trunk/python-ogre/scripts/build-deb.sh 2008-07-15 18:49:08 UTC (rev 648)
+++ trunk/python-ogre/scripts/build-deb.sh 2008-07-16 00:59:00 UTC (rev 649)
@@ -36,6 +36,11 @@
sudo apt-get install libceguiogre-dev
fi
+# Make sure we are building the stable version
+cd python-ogre
+touch STABLE
+cd ..
+
# Things we need to build ourself
# The extra boost support module
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-16 01:05:14
|
Revision: 652
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=652&view=rev
Author: mithro
Date: 2008-07-15 18:05:22 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Added libogg and libvorbis dependencies.
Modified Paths:
--------------
trunk/python-ogre/debian/control
trunk/python-ogre/scripts/build-deb.sh
Modified: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control 2008-07-16 01:04:22 UTC (rev 651)
+++ trunk/python-ogre/debian/control 2008-07-16 01:05:22 UTC (rev 652)
@@ -15,7 +15,7 @@
libogre-dev (>= 1.4),
libceguiogre-dev (>= 1.4) | libogre-dev (<< 1.4.5),
libogre-dev (< 1.5),
- libopenal-dev,
+ libopenal-dev, libogg-dev, libvorbis-dev,
gccxml (>=0.7.0),
pygccxml, pyplusplus
Standards-Version: 3.7.2
Modified: trunk/python-ogre/scripts/build-deb.sh
===================================================================
--- trunk/python-ogre/scripts/build-deb.sh 2008-07-16 01:04:22 UTC (rev 651)
+++ trunk/python-ogre/scripts/build-deb.sh 2008-07-16 01:05:22 UTC (rev 652)
@@ -29,7 +29,9 @@
libfreeimage-dev \
libois-dev \
libogre-dev \
- libopenal-dev
+ libopenal-dev \
+ libogg-dev \
+ libvorbis-dev
DISTRO_CODENAME=`lsb_release -c | sed -e's/.*:\t*//'`
if [ "x$DISTRO_CODENAME" = "xhardy" ]; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
