Changeset 19613

Timestamp:

12/10/06 11:54:44 (2 years ago)

Author:

patrick

Message:

Added untested bindings for vrj::OpenSGApp so that PyJuggler? and PyOpenSG
can be combined. Rolled version to 1.1.9.

Files:

• PyJuggler/trunk/ChangeLog (modified) (1 diff)
• PyJuggler/trunk/configure.ac (modified) (4 diffs)
• PyJuggler/trunk/dist/__init__.py (modified) (1 diff)
• PyJuggler/trunk/dist/vrj.py (modified) (1 diff)
• PyJuggler/trunk/src/Makefile.in (modified) (1 diff)
• PyJuggler/trunk/src/opensgapp (added)
• PyJuggler/trunk/src/opensgapp/Makefile.in (added)
• PyJuggler/trunk/src/opensgapp/_OpenSGApp.cpp (added)
• PyJuggler/trunk/src/opensgapp/__opensgapp.cpp (added)

PyJuggler/trunk/ChangeLog

@@ -1 +1 @@
-DATE        AUTHOR      CHANGE
------------ ----------- -------------------------------------------------------
+Dec-10-2006 patrick     Exposed vrj::OpenSGApp so that developers can combine
+                        PyJuggler and PyOpenSG.
+                        NEW VERSION: 1.1.9
-Nov-10-2006 patrick     Handle 64-bit installations of Open Scene Graph.
-Jul-14-2006 patrick     Use automatic linking for CppDOM and the Juggler

PyJuggler/trunk/configure.ac

@@ -55 +55 @@
-            [  --with-osg=<PATH>       Open Scene Graph installation   [default=$OSGHOME then /usr/local]],
-            [osg_base_dir="$withval"], [osg_base_dir=${OSGHOME-/usr/local}])
+
+AC_ARG_WITH([opensg],
+            [  --with-opensg=<PATH>    OpenSG installation             [default=$OSGROOT then /usr/local]],
+            [opensg_base_dir="$withval"],
+            [opensg_base_dir=${OSGROOT-/usr/local}])
-
-# Force the use of GCC as the compiler.
@@ -530 +535 @@
-fi
-
+HAVE_OPENSG='N'
+
+if test "x$opensg_base_dir" != "xno" ; then
+#   pyjsave_CFLAGS="$CFLAGS"
+#   pyjsave_CPPFLAGS="$CPPFLAGS"
+#   pyjsave_LDFLAGS="$LDFLAGS"
+#   pyjsave_LIBS="$LIBS"
+
+   AC_PATH_PROG(OPENSG_CONFIG, osg-config, no, [$opensg_base_dir/bin:$PATH])
+   if test "x$OPENSG_CONFIG" != "xno" ; then
+      opensg_pkgs='Base System'
+      OPENSG_INCLUDES=`$OPENSG_CONFIG --opt --cflags $opensg_pkgs`
+      OPENSG_LDFLAGS=`$OPENSG_CONFIG --opt --lflags $opensg_pkgs`
+      OPENSG_LIBS=`$OPENSG_CONFIG --opt --libs $opensg_pkgs`
+      HAVE_OPENSG='Y'
+   fi
+
+#   CFLAGS="$pyjsave_CFLAGS"
+#   CPPFLAGS="$pyjsave_CPPFLAGS"
+#   LDFLAGS="$pyjsave_LDFLAGS"
+#   LIBS="$pyjsave_LIBS"
+fi
+
-# -----------------------------------------------------------------------------
-# Miscellaneous checks.
@@ -568 +596 @@
-AC_SUBST(OSG_LDFLAGS)
-AC_SUBST(OSG_LIBS)
+
+AC_SUBST(HAVE_OPENSG)
+AC_SUBST(OPENSG_INCLUDES)
+AC_SUBST(OPENSG_LDFLAGS)
+AC_SUBST(OPENSG_LIBS)
-
-AC_SUBST(PYTHON_ROOT)
@@ -600 +633 @@
-                 src/jccl/Makefile
-                 src/osgapp/Makefile
+                 src/opensgapp/Makefile
-                 src/snx/Makefile
-                 src/vpr/Makefile

PyJuggler/trunk/dist/__init__.py

@@ -6 +6 @@
-__all__     = ["vrj", "cluster", "gadget", "snx", "jccl", "vpr"]
-__build__   = 1
-8
+9
-__date__    = string.join(string.split('$Date$')[1:3], ' ')
-__author__  = 'Patrick Hartling <patrick@infiscape.com>'

PyJuggler/trunk/dist/vrj.py

@@ -15 +15 @@
-   pass
-
+# Attempt to import everything from __opensgapp into our namespace. If it
+# fails, then OpenSG is not available for use. For people who don't want to
+# use vrj.OpenSGApp, this is fine. For those who do, they have to have OpenSG
+# and PyOpenSG installed.
+try:
+   from __opensgapp import *
+except:
+   pass
+
-__doc__ = '''PyJuggler.vrj is a module that imports the symbols from
-
-
-
+
+
+
+
-
- and PyJuggler.__osgapp modules for class
-
+, PyJuggler.__osgapp, and PyJuggler.__opensgapp
+modules for class 
-'''

PyJuggler/trunk/src/Makefile.in

@@ -9 +9 @@
-ifeq (@HAVE_OSG@, Y)
-DIRS+=  osgapp
+endif
+
+ifeq (@HAVE_OPENSG@, Y)
+DIRS+=  opensgapp
-endif
-