openvrml-commit

SF.net SVN: openvrml:[3983] trunk

[<br...@us...>]

Revision: 3983
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3983&view=rev
Author:   braden
Date:     2009-08-02 07:53:50 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
Removed obsolete -I flags when building libopenvrml.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
    trunk/src/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-02 06:15:32 UTC (rev 3982)
+++ trunk/ChangeLog	2009-08-02 07:53:50 UTC (rev 3983)
@@ -1,5 +1,13 @@
 2009-08-02 Braden McDaniel  <br...@en...>
 
+	Removed obsolete -I flags when building libopenvrml.
+
+	* src/Makefile.am
+	(libopenvrml_libopenvrml_la_CPPFLAGS): Removed obsolete -I flags.
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+
+2009-08-02 Braden McDaniel  <br...@en...>
+
 	Moved libltdl/LoadLibrary wrapper to its own static library.
 
 	* ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-08-02 06:15:32 UTC (rev 3982)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-08-02 07:53:50 UTC (rev 3983)
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node"
+				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
 				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\&quot;0.18.2\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
@@ -126,7 +126,7 @@
 				Optimization="3"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\node"
+				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
 				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\&quot;0.18.2\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-08-02 06:15:32 UTC (rev 3982)
+++ trunk/src/Makefile.am	2009-08-02 07:53:50 UTC (rev 3983)
@@ -66,8 +66,6 @@
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml \
         -I$(top_srcdir)/src/local/libopenvrml-dl \
-        -I$(srcdir)/node \
-        -I$(srcdir)/node/vrml97 \
         -DOPENVRML_LIBDIR_=\"$(libdir)\" \
         -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
         -DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[3985] trunk

[<br...@us...>]

Revision: 3985
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3985&view=rev
Author:   braden
Date:     2009-08-03 06:38:42 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
Converted Java scripting backend to use libopenvrml-dl to load libjvm rather than using libltdl directly.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.h
    trunk/src/script/java.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-02 07:56:29 UTC (rev 3984)
+++ trunk/ChangeLog	2009-08-03 06:38:42 UTC (rev 3985)
@@ -1,3 +1,27 @@
+2009-08-03 Braden McDaniel  <br...@en...>
+
+	Converted Java scripting backend to use libopenvrml-dl to load
+	libjvm rather than using libltdl directly.
+
+	* src/Makefile.am
+	(script_java_la_CPPFLAGS): Add the libopenvrml-dl source directory
+	to the include path.
+	(script_java_la_LIBADD): Added libopenvrml-dl.
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp: Added function
+	openvrml::local::dl::prepend_to_searchpath.
+	* src/local/libopenvrml-dl/openvrml/local/dl.h: Added function
+	openvrml::local::dl::prepend_to_searchpath.
+	* src/script/java.cpp
+	(create_searchpath_from_java_home(const std::string &)): Removed;
+	replaced with prepend_java_home_libdirs_to_searchpath.
+	(prepend_java_home_libdirs_to_searchpath(const std::string &)):
+	Given a location for the Java Runtime Environment, prepend the
+	possible locations of libjvm to the runtime library search path.
+	(load_libjvm::load_libjvm()): Use libopenvrml-dl functions instead
+	of libltdl ones.
+	(load_libjvm::~load_libjvm()): Use libopenvrml-dl functions instead
+	of libltdl ones.
+
 2009-08-02 Braden McDaniel  <br...@en...>
 
 	Removed obsolete -I flags when building libopenvrml.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-08-02 07:56:29 UTC (rev 3984)
+++ trunk/src/Makefile.am	2009-08-03 06:38:42 UTC (rev 3985)
@@ -163,6 +163,7 @@
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml \
         -I$(top_builddir)/src/script/java \
+        -I$(top_srcdir)/src/local/libopenvrml-dl \
         -DOPENVRML_LIBDIR_=\"$(libdir)\" \
         -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
         -DJAVA_HOME=\"$(JAVA_HOME)\" \
@@ -174,7 +175,8 @@
         -no-undefined \
         -avoid-version
 script_java_la_LIBADD = \
-        libopenvrml/libopenvrml.la
+        libopenvrml/libopenvrml.la \
+        local/libopenvrml-dl.la
 
 openvrmlnodedir = $(pkglibdir)/node
 openvrmlnode_LTLIBRARIES = \

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2009-08-02 07:56:29 UTC (rev 3984)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2009-08-03 06:38:42 UTC (rev 3985)
@@ -117,6 +117,21 @@
 # endif
 }
 
+/**
+ * @internal
+ *
+ * @brief Prepend @p dir to the dynamic library search path.
+ */
+int openvrml::local::dl::prepend_to_searchpath(const char * const dir)
+{
+# ifdef _WIN32
+    return SetDllDirectory(dir);
+# else
+    const char * const before = lt_dlgetsearchpath();
+    return lt_dlinsertsearchdir(before, dir);
+# endif
+}
+
 openvrml::local::dl::handle openvrml::local::dl::open(const char * filename)
 {
 # ifdef _WIN32

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.h
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.h	2009-08-02 07:56:29 UTC (rev 3984)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.h	2009-08-03 06:38:42 UTC (rev 3985)
@@ -44,6 +44,8 @@
                             int (*func)(const char * filename, void * data),
                             void * data);
 
+            OPENVRML_LOCAL int prepend_to_searchpath(const char * dir);
+
 #   ifdef _WIN32
             typedef HMODULE handle;
 #   else

Modified: trunk/src/script/java.cpp
===================================================================
--- trunk/src/script/java.cpp	2009-08-02 07:56:29 UTC (rev 3984)
+++ trunk/src/script/java.cpp	2009-08-03 06:38:42 UTC (rev 3985)
@@ -79,10 +79,10 @@
 # include <vrml_node_Node.h>
 # include <vrml_node_Script.h>
 
+# include <openvrml/local/dl.h>
 # include <openvrml/browser.h>
 # include <openvrml/scene.h>
 # include <private.h>
-# include <ltdl.h>
 # include <boost/array.hpp>
 # include <boost/filesystem/path.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
@@ -101,7 +101,7 @@
 
 namespace {
 
-    OPENVRML_JAVA_LOCAL lt_dlhandle libjvm_handle;
+    OPENVRML_JAVA_LOCAL openvrml::local::dl::handle libjvm_handle;
     OPENVRML_JAVA_LOCAL jint (*CreateJavaVM)(JavaVM **, void **, void *);
 
     OPENVRML_JAVA_LOCAL JavaVM * vm;
@@ -112,54 +112,78 @@
         ~load_libjvm();
     } load_libjvm_;
 
-    OPENVRML_JAVA_LOCAL const std::string
-    create_searchpath_from_java_home(const std::string & java_home)
+    OPENVRML_JAVA_LOCAL
+    int
+    prepend_java_home_libdirs_to_searchpath(const std::string & java_home)
     {
         assert(!java_home.empty());
-        std::ostringstream searchpath;
-        searchpath << java_home << "/lib/" << OPENVRML_JVM_ARCH << "/client:"
-                   << java_home << "/lib/" << OPENVRML_JVM_ARCH << "/server";
-        return searchpath.str();
+
+        using std::ostringstream;
+        using namespace openvrml::local;
+
+        static const ostringstream::iostate exceptions = ostringstream::eofbit
+                                                       | ostringstream::failbit
+                                                       | ostringstream::badbit;
+        int result = 0;
+        {
+            ostringstream libdir;
+            libdir.exceptions(exceptions);
+            libdir << java_home << "/lib/" << OPENVRML_JVM_ARCH << "/client";
+            result = dl::prepend_to_searchpath(libdir.str().c_str());
+            if (result != 0) { return result; }
+        }
+        {
+            ostringstream libdir;
+            libdir.exceptions(exceptions);
+            libdir << java_home << "/lib/" << OPENVRML_JVM_ARCH << "/server";
+            result = dl::prepend_to_searchpath(libdir.str().c_str());
+            if (result != 0) { return result; }
+        }
+        return result;
     }
 
     load_libjvm::load_libjvm()
     {
-        int result = lt_dlinit();
+        using namespace openvrml::local;
+
+        int result = dl::init();
         if (result != 0) {
-            std::cerr << lt_dlerror() << std::endl;
+            std::cerr << dl::error() << std::endl;
             return;
         }
-        std::ostringstream jvm_searchpath;
-        const char * const java_home_env = getenv("JAVA_HOME");
-        if (java_home_env) {
-            jvm_searchpath << create_searchpath_from_java_home(java_home_env);
-        }
         const std::string java_home = JAVA_HOME;
-        if (!java_home.empty()
-            && (!java_home_env || java_home != java_home_env)) {
-            if (!jvm_searchpath.str().empty()) { jvm_searchpath << ':'; }
-            jvm_searchpath << create_searchpath_from_java_home(java_home);
+        if (!java_home.empty()) {
+            result = prepend_java_home_libdirs_to_searchpath(java_home);
+            if (result != 0) {
+                std::cerr << dl::error() << std::endl;
+                return;
+            }
         }
-        result = lt_dlsetsearchpath(jvm_searchpath.str().c_str());
-        if (result != 0) {
-            std::cerr << lt_dlerror() << std::endl;
-            return;
+        const char * const java_home_env = getenv("JAVA_HOME");
+        if (java_home_env && (java_home_env != java_home)) {
+            result = prepend_java_home_libdirs_to_searchpath(java_home_env);
+            if (result != 0) {
+                std::cerr << dl::error() << std::endl;
+                return;
+            }
         }
-        libjvm_handle = lt_dlopen("libjvm.so");
+        libjvm_handle = dl::open("libjvm");
         if (!libjvm_handle) {
             std::cerr << lt_dlerror() << std::endl;
             return;
         }
         CreateJavaVM =
             reinterpret_cast<jint (*)(JavaVM **, void **, void *)>(
-                lt_dlsym(libjvm_handle, "JNI_CreateJavaVM"));
+                dl::sym(libjvm_handle, "JNI_CreateJavaVM"));
         if (!CreateJavaVM) {
-            std::cerr << lt_dlerror() << std::endl;
+            std::cerr << dl::error() << std::endl;
         }
     }
 
     load_libjvm::~load_libjvm()
     {
+        using namespace openvrml::local;
+
         //
         // The Java VM doesn't seem to play very nicely with DestroyJavaVM; it
         // seems to wait for some internal threads to finish; and they never
@@ -173,13 +197,13 @@
         //     vm->DestroyJavaVM();
         // }
         if (libjvm_handle) {
-            int result = lt_dlclose(libjvm_handle);
+            int result = dl::close(libjvm_handle);
             if (result != 0) {
-                std::cerr << lt_dlerror() << std::endl;
+                std::cerr << dl::error() << std::endl;
                 return;
             }
         }
-        lt_dlexit();
+        dl::exit();
     }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[3987] trunk

[<br...@us...>]

Revision: 3987
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3987&view=rev
Author:   braden
Date:     2009-08-07 07:58:00 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
Modified openvrml::local::dl interface to use boost::filesystem::path and std::string.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am
    trunk/src/libopenvrml/openvrml/local/conf.cpp
    trunk/src/libopenvrml/openvrml/local/conf.h
    trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
    trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h
    trunk/src/libopenvrml/openvrml/script.cpp
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/ChangeLog	2009-08-07 07:58:00 UTC (rev 3987)
@@ -1,3 +1,57 @@
+2009-08-07 Braden McDaniel  <br...@en...>
+
+	Modified openvrml::local::dl interface to use
+	boost::filesystem::path and std::string.
+
+	* src/Makefile.am
+	(local_libopenvrml_dl_la_LIBADD): Added libboost_filesystem
+	dependency.
+	* src/libopenvrml/openvrml/local/conf.cpp
+	(openvrml::local::conf::datadir()): Return a
+	boost::filesystem::path.
+	(openvrml::local::conf::node_path()): Return a std::vector of
+	boost::filesystem::path to represent the node module search path.
+	(openvrml::local::conf::script_path()): Return a std::vector of
+	boost::filesystem::path to represent the script module search
+	path.
+	* src/libopenvrml/openvrml/local/conf.h
+	(openvrml::local::conf::datadir()): Return a
+	boost::filesystem::path.
+	(openvrml::local::conf::node_path()): Return a std::vector of
+	boost::filesystem::path to represent the node module search path.
+	(openvrml::local::conf::script_path()): Return a std::vector of
+	boost::filesystem::path to represent the script module search
+	path.
+	* src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
+	(openvrml_open_node_module(const std::string &, void *)): Changed
+	signature to use std::string.
+	(openvrml::local::node_metatype_registry_impl::node_metatype_registry_impl(openvrml::browser&)):
+	Use a std::vector of boost::filesystem::path to represent the node
+	module search path.
+	* src/libopenvrml/openvrml/local/node_metatype_registry_impl.h
+	(node_metatype_registry_impl): Use std::string in the signature of
+	openvrml_open_node_module; changed type of sym to std::string.
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
+	(openvrml::local::dl::foreachfile(const
+	std::vector<boost::filesystem::path> &, int (*)(const
+	std::string&, void *), void *)): Use boost::filesystem::path and
+	std::string.
+	(openvrml::local::dl::prepend_to_searchpath(const
+	boost::filesystem::path &)): Use boost::filesystem::path.
+	(openvrml::local::dl::open(const std::string &)): Use std::string.
+	(openvrml::local::dl::sym(handle, const std::string &)): Use
+	std::string.
+	* src/local/libopenvrml-dl/openvrml/local/dl.h
+	(openvrml::local::dl::foreachfile(const
+	std::vector<boost::filesystem::path> &, int (*)(const
+	std::string&, void *), void *)): Use boost::filesystem::path and
+	std::string.
+	(openvrml::local::dl::prepend_to_searchpath(const
+	boost::filesystem::path &)): Use boost::filesystem::path.
+	(openvrml::local::dl::open(const std::string &)): Use std::string.
+	(openvrml::local::dl::sym(handle, const std::string &)): Use
+	std::string.
+
 2009-08-03 Braden McDaniel  <br...@en...>
 
 	Converted Java scripting backend to use libopenvrml-dl to load

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/Makefile.am	2009-08-07 07:58:00 UTC (rev 3987)
@@ -130,7 +130,9 @@
 local_libopenvrml_dl_la_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml
-local_libopenvrml_dl_la_LIBADD = -lltdl
+local_libopenvrml_dl_la_LIBADD = \
+        -lboost_filesystem$(BOOST_LIB_SUFFIX) \
+        -lltdl
 
 openvrmlscriptdir = $(pkglibdir)/script
 

Modified: trunk/src/libopenvrml/openvrml/local/conf.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/conf.cpp	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/libopenvrml/openvrml/local/conf.cpp	2009-08-07 07:58:00 UTC (rev 3987)
@@ -21,6 +21,7 @@
 # include "conf.h"
 # include <boost/multi_index/detail/scope_guard.hpp>
 # include <boost/ref.hpp>
+# include <boost/tokenizer.hpp>
 # ifdef _WIN32
 #   include <windows.h>
 #   include <vector>
@@ -132,10 +133,10 @@
 # endif
 }
 
-const std::string openvrml::local::conf::datadir()
+const boost::filesystem::path openvrml::local::conf::datadir()
     OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
 {
-    std::string result;
+    boost::filesystem::path result;
     try {
         result = get_env("OPENVRML_DATADIR");
     } catch (const no_environment_var &) {
@@ -156,25 +157,56 @@
         ':';
 # endif
 
-    OPENVRML_LOCAL void append_to_path(std::string & path,
-                                       const std::string & appended_part)
-        OPENVRML_THROW1(std::bad_alloc)
-    {
-        if (!path.empty() && !appended_part.empty()) {
-            path += path_separator;
+    struct OPENVRML_LOCAL search_path_tokenizer {
+        template <typename Iterator, typename Token>
+            bool operator()(Iterator & next, Iterator end, Token & tok)
+        {
+            while (next != end) {
+                if (*next == path_separator) {
+                    ++next;
+                    break;
+                }
+                this->tok_.push_back(*next);
+                ++next;
+            }
+            if (!this->tok_.empty()) {
+                tok = this->tok_;
+                this->tok_.clear();
+                return true;
+            }
+            return false;
         }
-        path += appended_part;
-    }
+
+        void reset()
+        {
+            this->tok_.clear();
+        }
+
+    private:
+        std::string tok_;
+    };
 }
 
-const std::string openvrml::local::conf::node_path()
+const std::vector<boost::filesystem::path> openvrml::local::conf::node_path()
     OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
 {
+    using std::back_inserter;
+    using std::copy;
+    using boost::filesystem::path;
+    typedef boost::tokenizer<search_path_tokenizer> tokenizer_t;
+
+    std::vector<path> result;
+    search_path_tokenizer tokenizer_func;
+
     std::string env_path;
     try {
         env_path = get_env("OPENVRML_NODE_PATH");
     } catch (const no_environment_var &) {}
 
+    tokenizer_t env_path_tokenizer(env_path, tokenizer_func);
+    copy(env_path_tokenizer.begin(), env_path_tokenizer.end(),
+         back_inserter(result));
+
     std::string system_path;
 # ifdef _WIN32
     try {
@@ -184,19 +216,33 @@
     system_path = OPENVRML_PKGLIBDIR_ "/node";
 # endif
 
-    std::string result = env_path;
-    append_to_path(result, system_path);
+    tokenizer_t system_path_tokenizer(system_path, tokenizer_func);
+    copy(system_path_tokenizer.begin(), system_path_tokenizer.end(),
+         back_inserter(result));
+
     return result;
 }
 
-const std::string openvrml::local::conf::script_path()
+const std::vector<boost::filesystem::path> openvrml::local::conf::script_path()
     OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
 {
+    using std::back_inserter;
+    using std::copy;
+    using boost::filesystem::path;
+    typedef boost::tokenizer<search_path_tokenizer> tokenizer_t;
+
+    std::vector<path> result;
+    search_path_tokenizer tokenizer_func;
+
     std::string env_path;
     try {
         env_path = get_env("OPENVRML_SCRIPT_PATH");
     } catch (const no_environment_var &) {}
 
+    tokenizer_t env_path_tokenizer(env_path, tokenizer_func);
+    copy(env_path_tokenizer.begin(), env_path_tokenizer.end(),
+         back_inserter(result));
+
     std::string system_path;
 # ifdef _WIN32
     try {
@@ -206,7 +252,9 @@
     system_path = OPENVRML_PKGLIBDIR_ "/script";
 # endif
 
-    std::string result = env_path;
-    append_to_path(result, system_path);
+    tokenizer_t system_path_tokenizer(system_path, tokenizer_func);
+    copy(system_path_tokenizer.begin(), system_path_tokenizer.end(),
+         back_inserter(result));
+
     return result;
 }

Modified: trunk/src/libopenvrml/openvrml/local/conf.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/conf.h	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/libopenvrml/openvrml/local/conf.h	2009-08-07 07:58:00 UTC (rev 3987)
@@ -22,8 +22,9 @@
 #   define OPENVRML_LOCAL_CONF_H
 
 #   include <openvrml-common.h>
+#   include <boost/filesystem/path.hpp>
 #   include <stdexcept>
-#   include <string>
+#   include <vector>
 
 namespace openvrml {
 
@@ -31,11 +32,15 @@
 
         namespace conf {
 
-            OPENVRML_LOCAL const std::string datadir()
+            OPENVRML_LOCAL const boost::filesystem::path datadir()
                 OPENVRML_THROW2(std::runtime_error, std::bad_alloc);
-            OPENVRML_LOCAL const std::string node_path()
+
+            OPENVRML_LOCAL
+            const std::vector<boost::filesystem::path> node_path()
                 OPENVRML_THROW2(std::runtime_error, std::bad_alloc);
-            OPENVRML_LOCAL const std::string script_path()
+
+            OPENVRML_LOCAL
+            const std::vector<boost::filesystem::path> script_path()
                 OPENVRML_THROW2(std::runtime_error, std::bad_alloc);
         }
     }

Modified: trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp	2009-08-07 07:58:00 UTC (rev 3987)
@@ -27,10 +27,10 @@
 
 using namespace boost::multi_index::detail;  // for scope_guard
 
-const char openvrml::local::node_metatype_registry_impl::sym[33] =
+const std::string openvrml::local::node_metatype_registry_impl::sym =
     "openvrml_register_node_metatypes";
 
-int openvrml_open_node_module(const char * const filename, void * const data)
+int openvrml_open_node_module(const std::string & filename, void * const data)
 {
     using openvrml::node_metatype_registry;
     using namespace openvrml::local;
@@ -75,9 +75,9 @@
         throw std::runtime_error("dlinit_failure");
     }
 
-    const std::string node_path = conf::node_path();
+    const std::vector<boost::filesystem::path> & node_path = conf::node_path();
 
-    result = dl::foreachfile(node_path.c_str(),
+    result = dl::foreachfile(node_path,
                              openvrml_open_node_module,
                              this);
     assert(result == 0); // We always return 0 from the callback.

Modified: trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/libopenvrml/openvrml/local/node_metatype_registry_impl.h	2009-08-07 07:58:00 UTC (rev 3987)
@@ -24,8 +24,9 @@
 #   include <openvrml/local/dl.h>
 #   include <openvrml/node.h>
 
-extern "C" OPENVRML_LOCAL int openvrml_open_node_module(const char * filename,
-                                                        void * data);
+extern "C"
+OPENVRML_LOCAL
+int openvrml_open_node_module(const std::string & filename, void * data);
 
 namespace openvrml {
 
@@ -36,8 +37,10 @@
     namespace local {
 
         class OPENVRML_LOCAL node_metatype_registry_impl : boost::noncopyable {
-            friend int (::openvrml_open_node_module)(const char * filename,
-                                                     void * data);
+            friend
+            int (::openvrml_open_node_module)(const std::string & filename,
+                                              void * data);
+
             mutable boost::shared_mutex mutex_;
 
             openvrml::browser & browser_;
@@ -50,7 +53,7 @@
             mutable node_metatype_map_t node_metatype_map_;
 
         public:
-            static const char sym[33];
+            static const std::string sym;
 
             explicit node_metatype_registry_impl(openvrml::browser & b);
             ~node_metatype_registry_impl() OPENVRML_NOTHROW;

Modified: trunk/src/libopenvrml/openvrml/script.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/script.cpp	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/libopenvrml/openvrml/script.cpp	2009-08-07 07:58:00 UTC (rev 3987)
@@ -361,7 +361,7 @@
  *        instantiate @c script_factory_registry.
  */
 
-extern "C" int openvrml_get_script_factory(const char * filename, void * data);
+extern "C" int openvrml_get_script_factory(const std::string & filename, void * data);
 
 /**
  * @internal
@@ -373,7 +373,7 @@
 class openvrml::script_factory_registry::impl :
     boost::noncopyable {
 
-    friend int (::openvrml_get_script_factory)(const char * filename,
+    friend int (::openvrml_get_script_factory)(const std::string & filename,
                                                void * data);
 
     typedef std::set<local::dl::handle> module_handle_set;
@@ -403,7 +403,7 @@
     find_using_uri_scheme(const std::string & uri_scheme) const;
 };
 
-int openvrml_get_script_factory(const char * const filename, void * data)
+int openvrml_get_script_factory(const std::string & filename, void * data)
 {
     assert(data);
 
@@ -442,9 +442,10 @@
         throw std::runtime_error("dlinit failure");
     }
 
-    const std::string script_path = local::conf::script_path();
+    const std::vector<boost::filesystem::path> & script_path =
+        local::conf::script_path();
 
-    result = dl::foreachfile(script_path.c_str(),
+    result = dl::foreachfile(script_path,
                              openvrml_get_script_factory,
                              this);
     assert(result == 0); // We always return 0 from the callback.

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2009-08-07 07:58:00 UTC (rev 3987)
@@ -23,6 +23,7 @@
 # include <boost/ref.hpp>
 # include <boost/tokenizer.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
+# include <sstream>
 
 using namespace boost::multi_index::detail;  // for scope_guard
 
@@ -45,75 +46,55 @@
 }
 
 namespace {
-
-    struct OPENVRML_LOCAL win32_search_path_tokenizer {
-        win32_search_path_tokenizer()
-        {}
-
-        template <typename Iterator, typename Token>
-            bool operator()(Iterator & next, Iterator end, Token & tok)
-        {
-            while (next != end) {
-                if (*next == ';') {
-                    ++next;
-                    break;
-                }
-                this->tok_.push_back(*next);
-                ++next;
-            }
-            if (!this->tok_.empty()) {
-                tok = this->tok_;
-                this->tok_.clear();
-                return true;
-            }
-            return false;
-        }
-
-        void reset()
-        {
-            this->tok_.clear();
-        }
-
-    private:
-        std::string tok_;
+    struct ltforeachfile_data {
+        int (*func)(const std::string & filename, void * data);
+        void * data;
     };
 }
 
+extern "C"
+OPENVRML_LOCAL
+int openvrml_dl_ltforeachfile(const char * filename, void * data)
+{
+    ltforeachfile_data * const d = static_cast<ltforeachfile_data *>(data);
+    return (d->func)(filename, d->data);
+}
+
 int
-openvrml::local::dl::foreachfile(const char * search_path,
-                                 int (*func)(const char * filename, void * data),
-                                 void * data)
+openvrml::local::dl::
+foreachfile(const std::vector<boost::filesystem::path> & search_path,
+            int (*func)(const std::string & filename, void * data),
+            void * data)
 {
 # ifdef _WIN32
     using boost::filesystem::path;
     using boost::filesystem::directory_iterator;
     typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t;
 
-    std::vector<path> search_dirs;
-    win32_search_path_tokenizer tokenizer_func;
-    std::string search_path_str(search_path);
-    tokenizer_t tokenizer(search_path_str, tokenizer_func);
-    for (tokenizer_t::const_iterator token = tokenizer.begin();
-         token != tokenizer.end();
-         ++token) {
-        search_dirs.push_back(path(*token));
-    }
-
     int result = 0;
-    for (std::vector<path>::const_iterator dir = search_dirs.begin();
-         dir != search_dirs.end();
+    for (std::vector<path>::const_iterator dir = search_path.begin();
+         dir != search_path.end();
          ++dir) try {
-            for (directory_iterator entry(*dir);
-                 entry != directory_iterator();
-                 ++entry) {
-                result = (func)(entry->path().external_file_string().c_str(),
-                                data);
-                if (result != 0) { return result; }
-            }
-        } catch (boost::filesystem::filesystem_error &) {}
+        for (directory_iterator entry(*dir);
+             entry != directory_iterator();
+             ++entry) {
+            result = (func)(entry->path().external_file_string(), data);
+            if (result != 0) { return result; }
+        }
+    } catch (boost::filesystem::filesystem_error &) {}
     return result;
 # else
-    return lt_dlforeachfile(search_path, func, data);
+    std::ostringstream path;
+    std::vector<boost::filesystem::path>::const_iterator dir =
+        search_path.begin();
+    while (dir != search_path.end()) {
+        path << *dir;
+        if (++dir != search_path.end()) { path << LT_PATHSEP_CHAR; }
+    }
+    ltforeachfile_data ltdata = { func, data };
+    return lt_dlforeachfile(path.str().c_str(),
+                            openvrml_dl_ltforeachfile,
+                            &ltdata);
 # endif
 }
 
@@ -122,24 +103,26 @@
  *
  * @brief Prepend @p dir to the dynamic library search path.
  */
-int openvrml::local::dl::prepend_to_searchpath(const char * const dir)
+int
+openvrml::local::dl::prepend_to_searchpath(const boost::filesystem::path & dir)
 {
 # ifdef _WIN32
-    return SetDllDirectory(dir);
+    return SetDllDirectory(dir.directory_string().c_str());
 # else
     const char * const before = lt_dlgetsearchpath();
-    return lt_dlinsertsearchdir(before, dir);
+    return lt_dlinsertsearchdir(before, dir.directory_string().c_str());
 # endif
 }
 
-openvrml::local::dl::handle openvrml::local::dl::open(const char * filename)
+openvrml::local::dl::handle
+openvrml::local::dl::open(const std::string & filename)
 {
 # ifdef _WIN32
-    const char * last_dot = strrchr(filename, '.');
-    if (strcmp(last_dot, ".dll") != 0) { return 0; }
-    return LoadLibrary(filename);
+    std::string::size_type last_dot_index = filename.find_last_of('.');
+    if (filename.substr(last_dot_index) != ".dll") { return 0; }
+    return LoadLibrary(filename.c_str());
 # else
-    return lt_dlopenext(filename);
+    return lt_dlopenext(filename.c_str());
 # endif
 }
 
@@ -177,11 +160,11 @@
 # endif
 }
 
-void * openvrml::local::dl::sym(handle h, const char * name)
+void * openvrml::local::dl::sym(handle h, const std::string & name)
 {
 # ifdef _WIN32
-    return GetProcAddress(h, name);
+    return GetProcAddress(h, name.c_str());
 # else
-    return lt_dlsym(h, name);
+    return lt_dlsym(h, name.c_str());
 # endif
 }

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.h
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.h	2009-08-03 06:41:42 UTC (rev 3986)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.h	2009-08-07 07:58:00 UTC (rev 3987)
@@ -27,7 +27,9 @@
 #   else
 #     include <ltdl.h>
 #   endif
+#   include <boost/filesystem/path.hpp>
 #   include <string>
+#   include <vector>
 
 namespace openvrml {
 
@@ -40,11 +42,14 @@
             OPENVRML_LOCAL int exit();
             
             OPENVRML_LOCAL
-            int foreachfile(const char * search_path,
-                            int (*func)(const char * filename, void * data),
-                            void * data);
+            int
+            foreachfile(
+                const std::vector<boost::filesystem::path> & search_path,
+                int (*func)(const std::string & filename, void * data),
+                void * data);
 
-            OPENVRML_LOCAL int prepend_to_searchpath(const char * dir);
+            OPENVRML_LOCAL
+            int prepend_to_searchpath(const boost::filesystem::path & dir);
 
 #   ifdef _WIN32
             typedef HMODULE handle;
@@ -52,13 +57,13 @@
             typedef lt_dlhandle handle;
 #   endif
 
-            OPENVRML_LOCAL handle open(const char * filename);
+            OPENVRML_LOCAL handle open(const std::string & filename);
 
             OPENVRML_LOCAL const std::string error();
 
             OPENVRML_LOCAL int close(handle);
 
-            OPENVRML_LOCAL void * sym(handle, const char * name);
+            OPENVRML_LOCAL void * sym(handle, const std::string & name);
         }
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[3989] trunk

[<br...@us...>]

Revision: 3989
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3989&view=rev
Author:   braden
Date:     2009-08-08 00:29:19 +0000 (Sat, 08 Aug 2009)

Log Message:
-----------
Fixes for building on Windows.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-07 08:08:03 UTC (rev 3988)
+++ trunk/ChangeLog	2009-08-08 00:29:19 UTC (rev 3989)
@@ -1,5 +1,16 @@
 2009-08-07 Braden McDaniel  <br...@en...>
 
+	Fixes for building on Windows.
+
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
+	(openvrml::local::dl::foreachfile(const
+	std::vector<boost::filesystem::path> &, int (*)(const
+	std::string&, void *), void *)): Removed obsolete typedef.
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
+	Added libopenvrml-dl source directory to include path.
+
+2009-08-07 Braden McDaniel  <br...@en...>
+
 	Modified openvrml::local::dl interface to use
 	boost::filesystem::path and std::string.
 

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-08-07 08:08:03 UTC (rev 3988)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-08-08 00:29:19 UTC (rev 3989)
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
+				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl"
 				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\&quot;0.18.2\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
@@ -126,7 +126,7 @@
 				Optimization="3"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
+				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl"
 				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\&quot;0.18.2\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2009-08-07 08:08:03 UTC (rev 3988)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2009-08-08 00:29:19 UTC (rev 3989)
@@ -69,7 +69,6 @@
 # ifdef _WIN32
     using boost::filesystem::path;
     using boost::filesystem::directory_iterator;
-    typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t;
 
     int result = 0;
     for (std::vector<path>::const_iterator dir = search_path.begin();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[3991] trunk

[<br...@us...>]

Revision: 3991
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3991&view=rev
Author:   braden
Date:     2009-08-11 03:55:57 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Removed obsolete include of <boost/concept_check.hpp>.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml/openvrml/local/float.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-08 01:55:16 UTC (rev 3990)
+++ trunk/ChangeLog	2009-08-11 03:55:57 UTC (rev 3991)
@@ -1,3 +1,8 @@
+2009-08-10 Braden McDaniel  <br...@en...>
+
+	* src/libopenvrml/openvrml/local/float.h: Removed obsolete include
+	of <boost/concept_check.hpp>.
+
 2009-08-07 Braden McDaniel  <br...@en...>
 
 	Fixes for building on Windows.

Modified: trunk/src/libopenvrml/openvrml/local/float.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/float.h	2009-08-08 01:55:16 UTC (rev 3990)
+++ trunk/src/libopenvrml/openvrml/local/float.h	2009-08-11 03:55:57 UTC (rev 3991)
@@ -23,7 +23,6 @@
 
 #   include <openvrml-common.h>
 #   include <limits>
-#   include <boost/concept_check.hpp>
 
 namespace openvrml {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[3996] trunk

[<br...@us...>]

Revision: 3996
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3996&view=rev
Author:   braden
Date:     2009-10-05 06:56:10 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Updates for 0.18.3 release.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/README
    trunk/configure.ac
    trunk/doc/Doxyfile
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
    trunk/src/Makefile.am

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/bad_url.h
    trunk/src/libopenvrml/openvrml/local/proto.cpp
    trunk/src/libopenvrml/openvrml/local/proto.h
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp
    trunk/src/mozilla-plugin/
    trunk/src/node/vrml97/register_node_metatypes.cpp
    trunk/src/node/x3d-cad-geometry/cad_face.cpp
    trunk/src/node/x3d-cad-geometry/cad_face.h
    trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
    trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
    trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
    trunk/src/node/x3d-core/metadata_double.cpp
    trunk/src/node/x3d-core/metadata_double.h
    trunk/src/node/x3d-core/metadata_float.cpp
    trunk/src/node/x3d-core/metadata_float.h
    trunk/src/node/x3d-core/metadata_integer.cpp
    trunk/src/node/x3d-core/metadata_integer.h
    trunk/src/node/x3d-core/metadata_set.cpp
    trunk/src/node/x3d-core/metadata_set.h
    trunk/src/node/x3d-core/metadata_string.cpp
    trunk/src/node/x3d-core/metadata_string.h
    trunk/src/node/x3d-core/register_node_metatypes.cpp
    trunk/src/node/x3d-dis/espdu_transform.cpp
    trunk/src/node/x3d-dis/espdu_transform.h
    trunk/src/node/x3d-dis/receiver_pdu.cpp
    trunk/src/node/x3d-dis/receiver_pdu.h
    trunk/src/node/x3d-dis/register_node_metatypes.cpp
    trunk/src/node/x3d-dis/signal_pdu.cpp
    trunk/src/node/x3d-dis/signal_pdu.h
    trunk/src/node/x3d-dis/transmitter_pdu.cpp
    trunk/src/node/x3d-dis/transmitter_pdu.h
    trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
    trunk/src/node/x3d-environmental-effects/texture_background.cpp
    trunk/src/node/x3d-environmental-effects/texture_background.h
    trunk/src/node/x3d-event-utilities/boolean_filter.cpp
    trunk/src/node/x3d-event-utilities/boolean_filter.h
    trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
    trunk/src/node/x3d-event-utilities/boolean_sequencer.h
    trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
    trunk/src/node/x3d-event-utilities/boolean_toggle.h
    trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
    trunk/src/node/x3d-event-utilities/boolean_trigger.h
    trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
    trunk/src/node/x3d-event-utilities/integer_sequencer.h
    trunk/src/node/x3d-event-utilities/integer_trigger.cpp
    trunk/src/node/x3d-event-utilities/integer_trigger.h
    trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
    trunk/src/node/x3d-event-utilities/time_trigger.cpp
    trunk/src/node/x3d-event-utilities/time_trigger.h
    trunk/src/node/x3d-geometry2d/arc2d.cpp
    trunk/src/node/x3d-geometry2d/arc2d.h
    trunk/src/node/x3d-geometry2d/arc_close2d.cpp
    trunk/src/node/x3d-geometry2d/arc_close2d.h
    trunk/src/node/x3d-geometry2d/circle2d.cpp
    trunk/src/node/x3d-geometry2d/circle2d.h
    trunk/src/node/x3d-geometry2d/disk2d.cpp
    trunk/src/node/x3d-geometry2d/disk2d.h
    trunk/src/node/x3d-geometry2d/polyline2d.cpp
    trunk/src/node/x3d-geometry2d/polyline2d.h
    trunk/src/node/x3d-geometry2d/polypoint2d.cpp
    trunk/src/node/x3d-geometry2d/polypoint2d.h
    trunk/src/node/x3d-geometry2d/rectangle2d.cpp
    trunk/src/node/x3d-geometry2d/rectangle2d.h
    trunk/src/node/x3d-geometry2d/register_node_metatypes.cpp
    trunk/src/node/x3d-geometry2d/triangle_set2d.cpp
    trunk/src/node/x3d-geometry2d/triangle_set2d.h
    trunk/src/node/x3d-geospatial/geo_coordinate.cpp
    trunk/src/node/x3d-geospatial/geo_coordinate.h
    trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp
    trunk/src/node/x3d-geospatial/geo_elevation_grid.h
    trunk/src/node/x3d-geospatial/geo_location.cpp
    trunk/src/node/x3d-geospatial/geo_location.h
    trunk/src/node/x3d-geospatial/geo_lod.cpp
    trunk/src/node/x3d-geospatial/geo_lod.h
    trunk/src/node/x3d-geospatial/geo_metadata.cpp
    trunk/src/node/x3d-geospatial/geo_metadata.h
    trunk/src/node/x3d-geospatial/geo_origin.cpp
    trunk/src/node/x3d-geospatial/geo_origin.h
    trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp
    trunk/src/node/x3d-geospatial/geo_position_interpolator.h
    trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp
    trunk/src/node/x3d-geospatial/geo_touch_sensor.h
    trunk/src/node/x3d-geospatial/geo_viewpoint.cpp
    trunk/src/node/x3d-geospatial/geo_viewpoint.h
    trunk/src/node/x3d-geospatial/register_node_metatypes.cpp
    trunk/src/node/x3d-grouping/register_node_metatypes.cpp
    trunk/src/node/x3d-grouping/static_group.cpp
    trunk/src/node/x3d-grouping/static_group.h
    trunk/src/node/x3d-h-anim/h_anim_displacer.cpp
    trunk/src/node/x3d-h-anim/h_anim_displacer.h
    trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp
    trunk/src/node/x3d-h-anim/h_anim_humanoid.h
    trunk/src/node/x3d-h-anim/h_anim_joint.cpp
    trunk/src/node/x3d-h-anim/h_anim_joint.h
    trunk/src/node/x3d-h-anim/h_anim_segment.cpp
    trunk/src/node/x3d-h-anim/h_anim_segment.h
    trunk/src/node/x3d-h-anim/h_anim_site.cpp
    trunk/src/node/x3d-h-anim/h_anim_site.h
    trunk/src/node/x3d-h-anim/register_node_metatypes.cpp
    trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
    trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h
    trunk/src/node/x3d-interpolation/position_interpolator2d.cpp
    trunk/src/node/x3d-interpolation/position_interpolator2d.h
    trunk/src/node/x3d-interpolation/register_node_metatypes.cpp
    trunk/src/node/x3d-key-device-sensor/key_sensor.cpp
    trunk/src/node/x3d-key-device-sensor/key_sensor.h
    trunk/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
    trunk/src/node/x3d-key-device-sensor/string_sensor.cpp
    trunk/src/node/x3d-key-device-sensor/string_sensor.h
    trunk/src/node/x3d-networking/load_sensor.cpp
    trunk/src/node/x3d-networking/load_sensor.h
    trunk/src/node/x3d-networking/register_node_metatypes.cpp
    trunk/src/node/x3d-nurbs/contour2d.cpp
    trunk/src/node/x3d-nurbs/contour2d.h
    trunk/src/node/x3d-nurbs/contour_polyline2d.cpp
    trunk/src/node/x3d-nurbs/contour_polyline2d.h
    trunk/src/node/x3d-nurbs/coordinate_double.cpp
    trunk/src/node/x3d-nurbs/coordinate_double.h
    trunk/src/node/x3d-nurbs/nurbs_curve.cpp
    trunk/src/node/x3d-nurbs/nurbs_curve.h
    trunk/src/node/x3d-nurbs/nurbs_curve2d.cpp
    trunk/src/node/x3d-nurbs/nurbs_curve2d.h
    trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_patch_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_patch_surface.h
    trunk/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_position_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_set.cpp
    trunk/src/node/x3d-nurbs/nurbs_set.h
    trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
    trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.h
    trunk/src/node/x3d-nurbs/nurbs_swept_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_swept_surface.h
    trunk/src/node/x3d-nurbs/nurbs_swung_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_swung_surface.h
    trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
    trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.h
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.h
    trunk/src/node/x3d-nurbs/register_node_metatypes.cpp
    trunk/src/node/x3d-rendering/color_rgba.cpp
    trunk/src/node/x3d-rendering/color_rgba.h
    trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h
    trunk/src/node/x3d-rendering/indexed_triangle_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_set.h
    trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
    trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h
    trunk/src/node/x3d-rendering/register_node_metatypes.cpp
    trunk/src/node/x3d-rendering/triangle_fan_set.cpp
    trunk/src/node/x3d-rendering/triangle_fan_set.h
    trunk/src/node/x3d-rendering/triangle_set.cpp
    trunk/src/node/x3d-rendering/triangle_set.h
    trunk/src/node/x3d-rendering/triangle_strip_set.cpp
    trunk/src/node/x3d-rendering/triangle_strip_set.h
    trunk/src/node/x3d-shape/fill_properties.cpp
    trunk/src/node/x3d-shape/fill_properties.h
    trunk/src/node/x3d-shape/line_properties.cpp
    trunk/src/node/x3d-shape/line_properties.h
    trunk/src/node/x3d-shape/register_node_metatypes.cpp
    trunk/src/node/x3d-texturing/multi_texture.cpp
    trunk/src/node/x3d-texturing/multi_texture.h
    trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp
    trunk/src/node/x3d-texturing/multi_texture_coordinate.h
    trunk/src/node/x3d-texturing/multi_texture_transform.cpp
    trunk/src/node/x3d-texturing/multi_texture_transform.h
    trunk/src/node/x3d-texturing/register_node_metatypes.cpp
    trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp
    trunk/src/node/x3d-texturing/texture_coordinate_generator.h


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18:3951,3953,3955,3960
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18:3951,3953,3955,3960,3994
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/ChangeLog	2009-10-05 06:56:10 UTC (rev 3996)
@@ -1,3 +1,16 @@
+2009-08-13 Braden McDaniel  <br...@en...>
+
+	Updates for 0.18.3 release.
+
+	* README
+	* NEWS
+	* configure.ac
+	* doc/Doxyfile
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+	* src/Makefile.am: Updated libopenvrml library version to 9:2:0.
+
 2009-08-10 Braden McDaniel  <br...@en...>
 
 	* src/libopenvrml/openvrml/local/float.h: Removed obsolete include

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/NEWS	2009-10-05 06:56:10 UTC (rev 3996)
@@ -1,3 +1,9 @@
+Changes new in version 0.18.3, 13 August, 2009
+========================================================================
+
+- Fixes for building on Windows.
+
+
 Changes new in version 0.18.2, 7 July, 2009
 ========================================================================
 

Modified: trunk/README
===================================================================
--- trunk/README	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/README	2009-10-05 06:56:10 UTC (rev 3996)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.18.2
+OpenVRML library version 0.18.3
 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
 Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Braden McDaniel <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/configure.ac	2009-10-05 06:56:10 UTC (rev 3996)
@@ -1,4 +1,4 @@
-AC_INIT([OpenVRML], [0.18.2], [ope...@li...])
+AC_INIT([OpenVRML], [0.18.3], [ope...@li...])
 AC_PREREQ([2.59])
 AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
 AC_CONFIG_MACRO_DIR([m4])

Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/doc/Doxyfile	2009-10-05 06:56:10 UTC (rev 3996)
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenVRML
-PROJECT_NUMBER         = 0.18.2
+PROJECT_NUMBER         = 0.18.3
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc	2009-10-05 06:56:10 UTC (rev 3996)
@@ -11,8 +11,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,1,0,0
- PRODUCTVERSION 0,18,2,0
+ FILEVERSION 9,2,0,0
+ PRODUCTVERSION 0,18,3,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "OpenVRML Library"
-            VALUE "FileVersion", "9, 1, 0, 0"
+            VALUE "FileVersion", "9, 2, 0, 0"
             VALUE "InternalName", "openvrml"
             VALUE "LegalCopyright", "Copyright (C) 2009"
             VALUE "OriginalFilename", "openvrml.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.2"
+            VALUE "ProductVersion", "0.18.3"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-10-05 06:56:10 UTC (rev 3996)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl"
-				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\&quot;0.18.2\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;"
+				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\&quot;0.18.3\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
@@ -127,7 +127,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl"
-				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\&quot;0.18.2\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;;NDEBUG"
+				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\&quot;0.18.3\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc	2009-10-05 06:56:10 UTC (rev 3996)
@@ -12,7 +12,7 @@
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 8,0,0,0
- PRODUCTVERSION 0,18,2,0
+ PRODUCTVERSION 0,18,3,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -33,7 +33,7 @@
             VALUE "LegalCopyright", "Copyright (C) 2009"
             VALUE "OriginalFilename", "openvrml-gl.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.2"
+            VALUE "ProductVersion", "0.18.3"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-08-13 06:33:34 UTC (rev 3995)
+++ trunk/src/Makefile.am	2009-10-05 06:56:10 UTC (rev 3996)
@@ -47,7 +47,7 @@
         libopenvrml/private.h \
         openvrml-player/filechooserdialog.h
 
-LIBOPENVRML_LIBRARY_VERSION =    9:1:0
+LIBOPENVRML_LIBRARY_VERSION =    9:2:0
 LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0
 #                                | | |
 #                         +------+ | +---+


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3953,3955,3960
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3953,3955,3960,3994
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3953,3955,3960
/branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
   + /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3953,3955,3960,3994
/branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674


Property changes on: trunk/src/libopenvrml/openvrml/local/proto.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
   + /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/local/proto.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
   + /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3953,3955,3960
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3953,3955,3960,3994
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3953,3955,3960
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3953,3955,3960,3994
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3953,3955,3960
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3953,3955,3960,3994
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801


Property changes on: trunk/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960
   + /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994


Property changes on: trunk/src/node/vrml97/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734


Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3953,3955,3960
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3953,3955,3960,3994
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3953,3955,3960
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3953,3955,3960,3994
/branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3953,3955,3960
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3953,3955,3960,3994
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3953,3955,3960
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
   + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3953,3955,3960,3994
/branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630


Property changes on: trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734


Property changes on: trunk/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_double.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_double.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_float.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_float.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_float.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_integer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_integer.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_set.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_set.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_string.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/metadata_string.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3953,3955,3960
/branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
   + /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-core/metadata_string.h:3677-3689
/branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801


Property changes on: trunk/src/node/x3d-core/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734


Property changes on: trunk/src/node/x3d-dis/espdu_transform.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/espdu_transform.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689
/branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/receiver_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/receiver_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734


Property changes on: trunk/src/node/x3d-dis/signal_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/signal_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3953,3955,3960
/branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630
   + /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689
/branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630


Property changes on: trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734


Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630
   + /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630


Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3953,3955,3960
/branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630
   + /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689
/branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3953,3955,3960
/branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734
   + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3953,3955,3960,3994
/branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734


Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630
   + /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955,3960,3994
/branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630


Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953,3955,3960
/branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689
/branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk/src/libop...
 
[truncated message content]

SF.net SVN: openvrml:[3997] trunk

[<br...@us...>]

Revision: 3997
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3997&view=rev
Author:   braden
Date:     2009-10-05 06:59:53 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Added openvrml-dl.vcproj to the distribution.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/ide-projects/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-05 06:56:10 UTC (rev 3996)
+++ trunk/ChangeLog	2009-10-05 06:59:53 UTC (rev 3997)
@@ -1,3 +1,8 @@
+2009-10-05 Braden McDaniel  <br...@en...>
+
+	* Makefile.am (VISUALC9_0_FILES): Added openvrml-dl.vcproj to the
+	distribution.
+
 2009-08-13 Braden McDaniel  <br...@en...>
 
 	Updates for 0.18.3 release.

Modified: trunk/ide-projects/Makefile.am
===================================================================
--- trunk/ide-projects/Makefile.am	2009-10-05 06:56:10 UTC (rev 3996)
+++ trunk/ide-projects/Makefile.am	2009-10-05 06:59:53 UTC (rev 3997)
@@ -4,6 +4,7 @@
         Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj \
         Windows/VisualC9_0/OpenVRML/openvrml/openvrml-config.h \
         Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc \
+        Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj \
         Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj \
         Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl-config.h \
         Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[3999] trunk

[<br...@us...>]

Revision: 3999
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3999&view=rev
Author:   braden
Date:     2009-10-19 02:04:21 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Make throw_runtime_error_from_win32_system_error available to other translation units.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am
    trunk/src/libopenvrml/openvrml/local/conf.cpp

Added Paths:
-----------
    trunk/src/libopenvrml/openvrml/local/error.cpp
    trunk/src/libopenvrml/openvrml/local/error.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-05 07:21:09 UTC (rev 3998)
+++ trunk/ChangeLog	2009-10-19 02:04:21 UTC (rev 3999)
@@ -1,3 +1,13 @@
+2009-10-18 Braden McDaniel  <br...@en...>
+
+	Make throw_runtime_error_from_win32_system_error available to
+	other translation units.
+
+	* src/Makefile.am
+	* src/libopenvrml/openvrml/local/conf.cpp
+	* src/libopenvrml/openvrml/local/error.cpp
+	* src/libopenvrml/openvrml/local/error.h
+
 2009-10-05 Braden McDaniel  <br...@en...>
 
 	* Makefile.am (VISUALC9_0_FILES): Added openvrml-dl.vcproj to the

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-10-05 07:21:09 UTC (rev 3998)
+++ trunk/src/Makefile.am	2009-10-19 02:04:21 UTC (rev 3999)
@@ -96,6 +96,8 @@
         libopenvrml/openvrml/node_impl_util.cpp \
         libopenvrml/openvrml/local/conf.cpp \
         libopenvrml/openvrml/local/conf.h \
+        libopenvrml/openvrml/local/error.cpp \
+        libopenvrml/openvrml/local/error.h \
         libopenvrml/openvrml/local/uri.cpp \
         libopenvrml/openvrml/local/uri.h \
         libopenvrml/openvrml/local/xml_reader.cpp \

Modified: trunk/src/libopenvrml/openvrml/local/conf.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/conf.cpp	2009-10-05 07:21:09 UTC (rev 3998)
+++ trunk/src/libopenvrml/openvrml/local/conf.cpp	2009-10-19 02:04:21 UTC (rev 3999)
@@ -19,6 +19,7 @@
 //
 
 # include "conf.h"
+# include "error.h"
 # include <boost/multi_index/detail/scope_guard.hpp>
 # include <boost/ref.hpp>
 # include <boost/tokenizer.hpp>
@@ -64,25 +65,6 @@
     }
 
 # ifdef _WIN32
-    void throw_runtime_error(LONG result) OPENVRML_THROW1(std::runtime_error)
-    {
-        using boost::ref;
-
-        static const LPCVOID source;
-        LPTSTR buf = 0;
-        scope_guard buf_guard = make_guard(LocalFree, ref(buf));
-        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
-                      | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-                      source,
-                      result,
-                      LANG_USER_DEFAULT,
-                      reinterpret_cast< LPTSTR >(&buf),
-                      0,
-                      0);
-
-        throw std::runtime_error(buf);
-    }
-
     const std::string query_registry_value(HKEY key, const std::string & name)
         OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
     {
@@ -101,7 +83,9 @@
             data.resize(data.size() * 2);
         }
 
-        if (result != 0) { throw_runtime_error(result); }
+        if (result != 0) {
+            throw_runtime_error_from_win32_system_error(result);
+        }
 
         _ASSERTE(type == REG_SZ);
 
@@ -125,7 +109,7 @@
                                    &key);
         if (result != ERROR_SUCCESS) {
             if (result == ERROR_FILE_NOT_FOUND) { throw no_registry_key(); }
-            throw_runtime_error(result);
+            throw_runtime_error_from_win32_system_error(result);
         }
 
         return query_registry_value(key, name);

Added: trunk/src/libopenvrml/openvrml/local/error.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/error.cpp	                        (rev 0)
+++ trunk/src/libopenvrml/openvrml/local/error.cpp	2009-10-19 02:04:21 UTC (rev 3999)
@@ -0,0 +1,43 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2009  Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# include "error.h"
+
+# ifdef _WIN32
+void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result)
+    OPENVRML_THROW1(std::runtime_error)
+{
+    using boost::ref;
+
+    static const LPCVOID source;
+    LPTSTR buf = 0;
+    scope_guard buf_guard = make_guard(LocalFree, ref(buf));
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+                  | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+                  source,
+                  result,
+                  LANG_USER_DEFAULT,
+                  reinterpret_cast< LPTSTR >(&buf),
+                  0,
+                  0);
+
+    throw std::runtime_error(buf);
+}
+# endif


Property changes on: trunk/src/libopenvrml/openvrml/local/error.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/src/libopenvrml/openvrml/local/error.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/error.h	                        (rev 0)
+++ trunk/src/libopenvrml/openvrml/local/error.h	2009-10-19 02:04:21 UTC (rev 3999)
@@ -0,0 +1,42 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2009  Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# ifndef OPENVRML_LOCAL_ERROR_H
+#   define OPENVRML_LOCAL_ERROR_H
+
+#   include <openvrml-common.h>
+#   include <stdexcept>
+#   ifdef _WIN32
+#     include <windows.h>
+#   endif
+
+namespace openvrml {
+
+    namespace local {
+
+#   ifdef _WIN32
+        OPENVRML_LOCAL
+        void throw_runtime_error_from_win32_system_error(LONG error)
+            OPENVRML_THROW1(std::runtime_error);
+#   endif
+    }
+}
+
+# endif // ifndef OPENVRML_LOCAL_ERROR_H


Property changes on: trunk/src/libopenvrml/openvrml/local/error.h
___________________________________________________________________
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4001] trunk

[<br...@us...>]

Revision: 4001
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4001&view=rev
Author:   braden
Date:     2009-10-19 02:21:05 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Only print out debugging message if we actually erased any references.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-xembed/main.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-19 02:10:57 UTC (rev 4000)
+++ trunk/ChangeLog	2009-10-19 02:21:05 UTC (rev 4001)
@@ -3,7 +3,8 @@
 	Make throw_runtime_error_from_win32_system_error available to
 	other translation units.
 
-	* src/Makefile.am
+	* src/Makefile.am (libopenvrml_libopenvrml_la_SOURCES): Added
+	libopenvrml/openvrml/local/error.{cpp,h}.
 	* src/libopenvrml/openvrml/local/conf.cpp
 	* src/libopenvrml/openvrml/local/error.cpp
 	* src/libopenvrml/openvrml/local/error.h

Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp	2009-10-19 02:10:57 UTC (rev 4000)
+++ trunk/src/openvrml-xembed/main.cpp	2009-10-19 02:21:05 UTC (rev 4001)
@@ -230,6 +230,10 @@
     error_guard.dismiss();
 }
 
+//
+// Note that this callback gets called for every name owner change on the
+// bus--including those completely unrelated to us.
+//
 gboolean
 openvrml_xembed_name_owner_changed(
     DBusGProxy * /* proxy */,
@@ -252,7 +256,7 @@
             openvrml_xembed_browser_factory_remove_hosts_for_owner(
                 data->browser_factory,
                 old_owner);
-        g_debug("erased references to %s", old_owner);
+        if (erased > 0) { g_debug("erased references to %s", old_owner); }
     }
 
     const bool browser_factory_has_hosts =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4003] trunk

[<br...@us...>]

Revision: 4003
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4003&view=rev
Author:   braden
Date:     2009-10-19 07:07:50 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Fixes for building against Boost 1.40.0.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml/openvrml/browser.cpp
    trunk/src/libopenvrml/openvrml/local/externproto.cpp
    trunk/src/libopenvrml/openvrml/local/uri.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/local/libopenvrml-control/openvrml_control/browser.h
    trunk/src/node/vrml97/inline.cpp
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
    trunk/src/openvrml-xembed/main.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/ChangeLog	2009-10-19 07:07:50 UTC (rev 4003)
@@ -1,5 +1,25 @@
+2009-10-19 Braden McDaniel  <br...@en...>
+
+	Fixes for building against Boost 1.40.0.
+
+	* src/libopenvrml/openvrml/browser.cpp
+	* src/libopenvrml/openvrml/local/uri.cpp
+	* src/libopenvrml/openvrml/local/externproto.cpp
+	* src/libopenvrml/openvrml/scene.cpp
+	* src/local/libopenvrml-control/openvrml_control/browser.h
+	* src/node/vrml97/inline.cpp
+	* src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
+	* src/openvrml-xembed/main.cpp
+
 2009-10-18 Braden McDaniel  <br...@en...>
 
+	* src/openvrml-xembed/main.cpp
+	(openvrml_xembed_name_owner_changed(DBusGProxy *, const gchar *,
+	const gchar *, const gchar *, gpointer)): Only print out debugging
+	message if we actually erased any references.
+
+2009-10-18 Braden McDaniel  <br...@en...>
+
 	Make throw_runtime_error_from_win32_system_error available to
 	other translation units.
 

Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/browser.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -29,6 +29,7 @@
 # include <openvrml/local/parse_vrml.h>
 # include <private.h>
 # include <boost/bind.hpp>
+# include <boost/function.hpp>
 # include <boost/functional.hpp>
 # include <boost/lexical_cast.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>

Modified: trunk/src/libopenvrml/openvrml/local/externproto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/externproto.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/local/externproto.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -23,6 +23,7 @@
 # include "uri.h"
 # include <openvrml/browser.h>
 # include <openvrml/scene.h>
+# include <boost/function.hpp>
 # include <boost/mpl/for_each.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
 

Modified: trunk/src/libopenvrml/openvrml/local/uri.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/uri.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/local/uri.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -21,6 +21,7 @@
 # include "uri.h"
 # include <list>
 # include <cerrno>
+# include <cstring>
 # ifdef _WIN32
 #   include <boost/multi_index/detail/scope_guard.hpp>
 using namespace boost::multi_index::detail;  // for scope_guard
@@ -596,7 +597,7 @@
         assert(errno != 0);
         assert(errno != EFAULT);
         assert(errno != EINVAL);
-        throw std::runtime_error(strerror(errno));
+        throw std::runtime_error(std::strerror(errno));
     }
 # endif
     return std::string(&buf.front());

Modified: trunk/src/libopenvrml/openvrml/scene.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/scene.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/scene.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -24,6 +24,7 @@
 # include <openvrml/local/uri.h>
 # include <openvrml/local/parse_vrml.h>
 # include <private.h>
+# include <boost/function.hpp>
 
 # ifdef HAVE_CONFIG_H
 #   include <config.h>

Modified: trunk/src/local/libopenvrml-control/openvrml_control/browser.h
===================================================================
--- trunk/src/local/libopenvrml-control/openvrml_control/browser.h	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/local/libopenvrml-control/openvrml_control/browser.h	2009-10-19 07:07:50 UTC (rev 4003)
@@ -22,6 +22,7 @@
 #   define OPENVRML_CONTROL_BROWSER_H
 
 #   include <openvrml/browser.h>
+#   include <boost/function.hpp>
 
 namespace openvrml_control {
 

Modified: trunk/src/node/vrml97/inline.cpp
===================================================================
--- trunk/src/node/vrml97/inline.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/node/vrml97/inline.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -29,6 +29,7 @@
 # include <openvrml/scene.h>
 # include <private.h>
 # include <boost/array.hpp>
+# include <boost/function.hpp>
 
 namespace {
 

Modified: trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
===================================================================
--- trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -274,7 +274,8 @@
     {
         if ((this->control_point_.value()
              && this->control_point_.value()->modified())
-            || this->tex_coord_.value() && this->tex_coord_.value()->modified())
+            || (this->tex_coord_.value()
+                && this->tex_coord_.value()->modified()))
         {
             return true;
         }

Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/openvrml-xembed/main.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -26,6 +26,7 @@
 # include <dbus/dbus-glib-bindings.h>
 # include <dbus/dbus-glib-lowlevel.h>
 # include <boost/concept_check.hpp>
+# include <boost/function.hpp>
 # include <boost/lexical_cast.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
 # include <boost/ref.hpp>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4005] trunk

[<br...@us...>]

Revision: 4005
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4005&view=rev
Author:   braden
Date:     2009-10-19 16:17:53 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Call do_modified to avoid recursion.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/node/vrml97/collision.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-19 07:19:59 UTC (rev 4004)
+++ trunk/ChangeLog	2009-10-19 16:17:53 UTC (rev 4005)
@@ -1,5 +1,11 @@
 2009-10-19 Braden McDaniel  <br...@en...>
 
+	* src/node/vrml97/collision.cpp
+	(collision_node::do_modified() const): Call do_modified to avoid
+	recursion.
+
+2009-10-19 Braden McDaniel  <br...@en...>
+
 	Fixes for building against Boost 1.40.0.
 
 	* src/libopenvrml/openvrml/browser.cpp

Modified: trunk/src/node/vrml97/collision.cpp
===================================================================
--- trunk/src/node/vrml97/collision.cpp	2009-10-19 07:19:59 UTC (rev 4004)
+++ trunk/src/node/vrml97/collision.cpp	2009-10-19 16:17:53 UTC (rev 4005)
@@ -126,7 +126,7 @@
     {
         return (this->proxy_.value() && this->proxy_.value()->modified())
             || (this->openvrml_node_vrml97::grouping_node_base<collision_node>::
-                modified());
+                do_modified());
     }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4007] trunk

[<br...@us...>]

Revision: 4007
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4007&view=rev
Author:   braden
Date:     2009-10-22 04:45:26 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Prefer JRE_HOME to locate libjvm rather than JAVA_HOME.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure-gcc-dbg
    trunk/configure-gcc-opt
    trunk/configure.ac
    trunk/src/Makefile.am
    trunk/src/script/java.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-19 16:22:19 UTC (rev 4006)
+++ trunk/ChangeLog	2009-10-22 04:45:26 UTC (rev 4007)
@@ -1,3 +1,16 @@
+2009-10-22 Braden McDaniel  <br...@en...>
+
+	Prefer JRE_HOME to locate libjvm rather than JAVA_HOME.
+
+	* configure.ac: Use JRE_HOME instead of JAVA_HOME.
+	* src/Makefile.am (script_java_la_CPPFLAGS): Define JRE_HOME
+	instead of JAVA_HOME.
+	* src/script/java.cpp
+	(prepend_jre_home_libdirs_to_searchpath(const std::string &)):
+	Changed function name.
+	(load_libjvm::load_libjvm()): First check JRE_HOME; then use
+	JAVA_HOME if JRE_HOME isn't set.
+
 2009-10-19 Braden McDaniel  <br...@en...>
 
 	* src/node/vrml97/collision.cpp

Modified: trunk/configure-gcc-dbg
===================================================================
--- trunk/configure-gcc-dbg	2009-10-19 16:22:19 UTC (rev 4006)
+++ trunk/configure-gcc-dbg	2009-10-22 04:45:26 UTC (rev 4007)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_CONCEPT_CHECKS -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -pedantic-errors -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
+./$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_CONCEPT_CHECKS -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -pedantic-errors -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JRE_HOME=/usr/lib/jvm/jre "$*"

Modified: trunk/configure-gcc-opt
===================================================================
--- trunk/configure-gcc-opt	2009-10-19 16:22:19 UTC (rev 4006)
+++ trunk/configure-gcc-opt	2009-10-22 04:45:26 UTC (rev 4007)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static --enable-exception-specs=nothrow CXX='g++ -pipe' CPPFLAGS="-I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -DNDEBUG" CXXFLAGS='-O3 -Wall -Wextra -Wno-missing-braces -Wno-unused-variable -fvisibility=hidden -fvisibility-inlines-hidden' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
+./$(dirname $0)/configure -C --prefix=$HOME --disable-static --enable-exception-specs=nothrow CXX='g++ -pipe' CPPFLAGS="-I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -DNDEBUG" CXXFLAGS='-O3 -Wall -Wextra -Wno-missing-braces -Wno-unused-variable -fvisibility=hidden -fvisibility-inlines-hidden' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JRE_HOME=/usr/lib/jvm/jre "$*"

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-19 16:22:19 UTC (rev 4006)
+++ trunk/configure.ac	2009-10-22 04:45:26 UTC (rev 4007)
@@ -371,7 +371,7 @@
 #
 # Script node Java support
 #
-AC_ARG_VAR([JAVA_HOME], [Path to Java Runtime Environment])
+AC_ARG_VAR([JRE_HOME], [Path to Java Runtime Environment])
 AC_ARG_ENABLE([script-node-java],
               [AC_HELP_STRING([--disable-script-node-java],
                               [disable Script node Java support])])
@@ -388,12 +388,12 @@
        [AC_MSG_FAILURE([The Java Native Interface is required for Script node Java support.])])
 AC_DEFINE_UNQUOTED([OPENVRML_JNI_CONST], [$ov_cv_jni_const],
                    [const for JNI function signatures.])
-AS_IF([test -z "$JAVA_HOME"],
-[AC_MSG_WARN([JAVA_HOME has not been set.  JAVA_HOME must be set at run time to locate libjvm.])],
+AS_IF([test -z "$JRE_HOME"],
+[AC_MSG_WARN([JRE_HOME has not been set.  JRE_HOME must be set at run time to locate libjvm.])],
 [ov_save_LDFLAGS=$LDFLAGS
-LDFLAGS="-L$JAVA_HOME/lib/$OPENVRML_JVM_ARCH/client -L$JAVA_HOME/lib/$OPENVRML_JVM_ARCH/server $LDFLAGS"
+LDFLAGS="-L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/client -L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/server $LDFLAGS"
 AC_CHECK_LIB([jvm], [JNI_CreateJavaVM], [LIBS=$LIBS],
-             [AC_MSG_WARN([no libjvm found at JAVA_HOME])])
+             [AC_MSG_WARN([no libjvm found at JRE_HOME])])
 LDFLAGS=$ov_save_LDFLAGS
 ])
 java_subdir=java])

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-10-19 16:22:19 UTC (rev 4006)
+++ trunk/src/Makefile.am	2009-10-22 04:45:26 UTC (rev 4007)
@@ -170,7 +170,7 @@
         -I$(top_srcdir)/src/local/libopenvrml-dl \
         -DOPENVRML_LIBDIR_=\"$(libdir)\" \
         -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
-        -DJAVA_HOME=\"$(JAVA_HOME)\" \
+        -DJRE_HOME=\"$(JRE_HOME)\" \
         -DOPENVRML_JVM_ARCH=\"$(OPENVRML_JVM_ARCH)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
         -DBOOST_MPL_LIMIT_VECTOR_SIZE=30

Modified: trunk/src/script/java.cpp
===================================================================
--- trunk/src/script/java.cpp	2009-10-19 16:22:19 UTC (rev 4006)
+++ trunk/src/script/java.cpp	2009-10-22 04:45:26 UTC (rev 4007)
@@ -114,9 +114,9 @@
 
     OPENVRML_JAVA_LOCAL
     int
-    prepend_java_home_libdirs_to_searchpath(const std::string & java_home)
+    prepend_jre_home_libdirs_to_searchpath(const std::string & jre_home)
     {
-        assert(!java_home.empty());
+        assert(!jre_home.empty());
 
         using std::ostringstream;
         using namespace openvrml::local;
@@ -128,14 +128,14 @@
         {
             ostringstream libdir;
             libdir.exceptions(exceptions);
-            libdir << java_home << "/lib/" << OPENVRML_JVM_ARCH << "/client";
+            libdir << jre_home << "/lib/" << OPENVRML_JVM_ARCH << "/client";
             result = dl::prepend_to_searchpath(libdir.str().c_str());
             if (result != 0) { return result; }
         }
         {
             ostringstream libdir;
             libdir.exceptions(exceptions);
-            libdir << java_home << "/lib/" << OPENVRML_JVM_ARCH << "/server";
+            libdir << jre_home << "/lib/" << OPENVRML_JVM_ARCH << "/server";
             result = dl::prepend_to_searchpath(libdir.str().c_str());
             if (result != 0) { return result; }
         }
@@ -151,21 +151,36 @@
             std::cerr << dl::error() << std::endl;
             return;
         }
-        const std::string java_home = JAVA_HOME;
-        if (!java_home.empty()) {
-            result = prepend_java_home_libdirs_to_searchpath(java_home);
+        const std::string jre_home = JRE_HOME;
+        if (!jre_home.empty()) {
+            result = prepend_jre_home_libdirs_to_searchpath(jre_home);
             if (result != 0) {
                 std::cerr << dl::error() << std::endl;
                 return;
             }
         }
-        const char * const java_home_env = getenv("JAVA_HOME");
-        if (java_home_env && (java_home_env != java_home)) {
-            result = prepend_java_home_libdirs_to_searchpath(java_home_env);
+        const char * const jre_home_env = getenv("JRE_HOME");
+        if (jre_home_env && (jre_home_env != jre_home)) {
+            result = prepend_jre_home_libdirs_to_searchpath(jre_home_env);
             if (result != 0) {
                 std::cerr << dl::error() << std::endl;
                 return;
             }
+        } else {
+            //
+            // If JRE_HOME isn't set, try JAVA_HOME.
+            //
+            const char * const java_home_env = getenv("JAVA_HOME");
+            if (java_home_env) {
+                using boost::filesystem::path;
+                result =
+                    prepend_jre_home_libdirs_to_searchpath(
+                        (path(java_home_env) / "jre").string());
+                if (result != 0) {
+                    std::cerr << dl::error() << std::endl;
+                    return;
+                }
+            }
         }
         libjvm_handle = dl::open("libjvm");
         if (!libjvm_handle) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4008] trunk

[<br...@us...>]

Revision: 4008
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4008&view=rev
Author:   braden
Date:     2009-10-22 05:06:27 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Use boost::filesystem::path when setting the search path for libjvm.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/java.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-22 04:45:26 UTC (rev 4007)
+++ trunk/ChangeLog	2009-10-22 05:06:27 UTC (rev 4008)
@@ -1,5 +1,17 @@
 2009-10-22 Braden McDaniel  <br...@en...>
 
+	Use boost::filesystem::path when setting the search path for
+	libjvm.
+
+	* src/script/java.cpp
+	(prepend_jre_home_libdirs_to_searchpath(const
+	boost::filesystem::path &)): Changed to take a
+	boost::filesystem::path.
+	(load_libjvm::load_libjvm()): Pass a boost::filesystem::path to
+	prepend_jre_home_libdirs_to_searchpath.
+
+2009-10-22 Braden McDaniel  <br...@en...>
+
 	Prefer JRE_HOME to locate libjvm rather than JAVA_HOME.
 
 	* configure.ac: Use JRE_HOME instead of JAVA_HOME.

Modified: trunk/src/script/java.cpp
===================================================================
--- trunk/src/script/java.cpp	2009-10-22 04:45:26 UTC (rev 4007)
+++ trunk/src/script/java.cpp	2009-10-22 05:06:27 UTC (rev 4008)
@@ -114,36 +114,29 @@
 
     OPENVRML_JAVA_LOCAL
     int
-    prepend_jre_home_libdirs_to_searchpath(const std::string & jre_home)
+    prepend_jre_home_libdirs_to_searchpath(
+        const boost::filesystem::path & jre_home)
     {
         assert(!jre_home.empty());
 
-        using std::ostringstream;
+        using boost::filesystem::path;
         using namespace openvrml::local;
 
-        static const ostringstream::iostate exceptions = ostringstream::eofbit
-                                                       | ostringstream::failbit
-                                                       | ostringstream::badbit;
+        const path archdir = jre_home / "lib" / OPENVRML_JVM_ARCH;
         int result = 0;
-        {
-            ostringstream libdir;
-            libdir.exceptions(exceptions);
-            libdir << jre_home << "/lib/" << OPENVRML_JVM_ARCH << "/client";
-            result = dl::prepend_to_searchpath(libdir.str().c_str());
-            if (result != 0) { return result; }
-        }
-        {
-            ostringstream libdir;
-            libdir.exceptions(exceptions);
-            libdir << jre_home << "/lib/" << OPENVRML_JVM_ARCH << "/server";
-            result = dl::prepend_to_searchpath(libdir.str().c_str());
-            if (result != 0) { return result; }
-        }
+
+        result = dl::prepend_to_searchpath(archdir / "client");
+        if (result != 0) { return result; }
+
+        result = dl::prepend_to_searchpath(archdir / "server");
+        if (result != 0) { return result; }
+
         return result;
     }
 
     load_libjvm::load_libjvm()
     {
+        using boost::filesystem::path;
         using namespace openvrml::local;
 
         int result = dl::init();
@@ -151,7 +144,7 @@
             std::cerr << dl::error() << std::endl;
             return;
         }
-        const std::string jre_home = JRE_HOME;
+        const path jre_home = JRE_HOME;
         if (!jre_home.empty()) {
             result = prepend_jre_home_libdirs_to_searchpath(jre_home);
             if (result != 0) {
@@ -172,10 +165,9 @@
             //
             const char * const java_home_env = getenv("JAVA_HOME");
             if (java_home_env) {
-                using boost::filesystem::path;
                 result =
                     prepend_jre_home_libdirs_to_searchpath(
-                        (path(java_home_env) / "jre").string());
+                        path(java_home_env) / "jre");
                 if (result != 0) {
                     std::cerr << dl::error() << std::endl;
                     return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4009] trunk

[<br...@us...>]

Revision: 4009
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4009&view=rev
Author:   braden
Date:     2009-10-22 21:54:43 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Infer JRE_HOME from JAVA_HOME if only the latter is set.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-22 05:06:27 UTC (rev 4008)
+++ trunk/ChangeLog	2009-10-22 21:54:43 UTC (rev 4009)
@@ -1,5 +1,10 @@
 2009-10-22 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Infer JRE_HOME from JAVA_HOME if only the latter
+	is set.
+
+2009-10-22 Braden McDaniel  <br...@en...>
+
 	Use boost::filesystem::path when setting the search path for
 	libjvm.
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-22 05:06:27 UTC (rev 4008)
+++ trunk/configure.ac	2009-10-22 21:54:43 UTC (rev 4009)
@@ -371,7 +371,9 @@
 #
 # Script node Java support
 #
-AC_ARG_VAR([JRE_HOME], [Path to Java Runtime Environment])
+AC_ARG_VAR([JAVA_HOME], [Path to Java installation])
+AS_IF([test $JRE_HOME], , [AS_IF([test $JAVA_HOME], [JRE_HOME=$JAVA_HOME])])
+AC_ARG_VAR([JRE_HOME], [Path to Java Runtime Environment [default=JAVA_HOME/jre]])
 AC_ARG_ENABLE([script-node-java],
               [AC_HELP_STRING([--disable-script-node-java],
                               [disable Script node Java support])])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4010] trunk

[<br...@us...>]

Revision: 4010
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4010&view=rev
Author:   braden
Date:     2009-10-22 22:04:00 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Set development version to 0.18.99.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/README
    trunk/configure.ac
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-22 21:54:43 UTC (rev 4009)
+++ trunk/ChangeLog	2009-10-22 22:04:00 UTC (rev 4010)
@@ -1,5 +1,15 @@
 2009-10-22 Braden McDaniel  <br...@en...>
 
+	Set development version to 0.18.99.
+
+	* README
+	* configure.ac
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+
+2009-10-22 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Infer JRE_HOME from JAVA_HOME if only the latter
 	is set.
 

Modified: trunk/README
===================================================================
--- trunk/README	2009-10-22 21:54:43 UTC (rev 4009)
+++ trunk/README	2009-10-22 22:04:00 UTC (rev 4010)
@@ -1,4 +1,4 @@
-OpenVRML library version 0.18.3
+OpenVRML library version 0.18.99
 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
 Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Braden McDaniel <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-22 21:54:43 UTC (rev 4009)
+++ trunk/configure.ac	2009-10-22 22:04:00 UTC (rev 4010)
@@ -1,4 +1,4 @@
-AC_INIT([OpenVRML], [0.18.3], [ope...@li...])
+AC_INIT([OpenVRML], [0.18.99], [ope...@li...])
 AC_PREREQ([2.59])
 AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
 AC_CONFIG_MACRO_DIR([m4])

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc	2009-10-22 21:54:43 UTC (rev 4009)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc	2009-10-22 22:04:00 UTC (rev 4010)
@@ -33,7 +33,7 @@
             VALUE "LegalCopyright", "Copyright (C) 2009"
             VALUE "OriginalFilename", "openvrml.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.3"
+            VALUE "ProductVersion", "0.18.99"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-10-22 21:54:43 UTC (rev 4009)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2009-10-22 22:04:00 UTC (rev 4010)
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl"
-				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\&quot;0.18.3\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;"
+				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\&quot;0.18.99\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
@@ -127,7 +127,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl"
-				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\&quot;0.18.3\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;;NDEBUG"
+				PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\&quot;0.18.99\&quot;;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\&quot;\&quot;;OPENVRML_PKGLIBDIR_=\&quot;\&quot;;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc	2009-10-22 21:54:43 UTC (rev 4009)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc	2009-10-22 22:04:00 UTC (rev 4010)
@@ -33,7 +33,7 @@
             VALUE "LegalCopyright", "Copyright (C) 2009"
             VALUE "OriginalFilename", "openvrml-gl.dll"
             VALUE "ProductName", "OpenVRML Library"
-            VALUE "ProductVersion", "0.18.3"
+            VALUE "ProductVersion", "0.18.99"
         END
     END
     BLOCK "VarFileInfo"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4011] trunk

[<br...@us...>]

Revision: 4011
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4011&view=rev
Author:   braden
Date:     2009-10-24 06:54:03 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Clean up legacy cruft in handling of GRE_PATH.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-22 22:04:00 UTC (rev 4010)
+++ trunk/ChangeLog	2009-10-24 06:54:03 UTC (rev 4011)
@@ -1,3 +1,7 @@
+2009-10-24 Braden McDaniel  <br...@en...>
+
+	* configure.ac: Clean up legacy cruft in handling of GRE_PATH.
+
 2009-10-22 Braden McDaniel  <br...@en...>
 
 	Set development version to 0.18.99.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-22 22:04:00 UTC (rev 4010)
+++ trunk/configure.ac	2009-10-24 06:54:03 UTC (rev 4011)
@@ -23,7 +23,7 @@
                 [openvrml.pc])
 
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([1.10.1 foreign subdir-objects check-news tar-pax])
+AM_INIT_AUTOMAKE([1.10.1 gnits subdir-objects check-news tar-pax])
 AM_CONFIG_HEADER([config.h])
 
 #
@@ -497,15 +497,15 @@
 # Determine whether to apply the -rpath for the Gecko runtime libraries.
 #
 AS_IF([test "X$enable_gecko_rpath" = Xyes],
-[AS_IF([test -z "$GRE_PATH"],
+[AS_IF([test $GRE_PATH],
        [GRE_PATH=`echo $JS_LIBS | sed -e 's/^-L\([[^ ]]*\).*/\1/'`
         AS_IF([test "X$GRE_PATH" = "X$JS_LIBS"],
               [GRE_PATH=""
-               AC_MSG_ERROR([GRE_PATH could not be derived from JS_LIBS.  Set GRE_PATH if executables linking with libopenvrml should be built with an -rpath for the Gecko runtime libraries.])])])
+               AC_MSG_ERROR([GRE_PATH could not be derived from JS_LIBS.  Set GRE_PATH if an -rpath is needed to locate the Gecko runtime libraries at runtime.])])])
 AS_IF([test -n "${openvrml_js_run_path}" -a -n "${GRE_PATH}"],
       [openvrml_js_run_path=":${openvrml_js_run_path}"])
 openvrml_js_run_path="${GRE_PATH}${openvrml_js_run_path}"
-OPENVRML_JAVASCRIPT_RPATH="-Wl,-rpath -Wl,${openvrml_js_run_path}"
+OPENVRML_JAVASCRIPT_RPATH="-Wl,-rpath -Wl,${GRE_PATH}"
 ])
 AC_SUBST([OPENVRML_JAVASCRIPT_RPATH])
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4014] trunk

[<br...@us...>]

Revision: 4014
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4014&view=rev
Author:   braden
Date:     2009-10-25 07:11:01 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
More GRE_PATH cleanup.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-25 07:08:49 UTC (rev 4013)
+++ trunk/ChangeLog	2009-10-25 07:11:01 UTC (rev 4014)
@@ -1,3 +1,7 @@
+2009-10-25 Braden McDaniel  <br...@en...>
+
+	* configure.ac: More GRE_PATH cleanup.
+
 2009-10-24 Braden McDaniel  <br...@en...>
 
 	* configure.ac: Clean up legacy cruft in handling of GRE_PATH.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-25 07:08:49 UTC (rev 4013)
+++ trunk/configure.ac	2009-10-25 07:11:01 UTC (rev 4014)
@@ -502,9 +502,6 @@
         AS_IF([test "X$GRE_PATH" = "X$JS_LIBS"],
               [GRE_PATH=""
                AC_MSG_ERROR([GRE_PATH could not be derived from JS_LIBS.  Set GRE_PATH if an -rpath is needed to locate the Gecko runtime libraries at runtime.])])])
-AS_IF([test -n "${openvrml_js_run_path}" -a -n "${GRE_PATH}"],
-      [openvrml_js_run_path=":${openvrml_js_run_path}"])
-openvrml_js_run_path="${GRE_PATH}${openvrml_js_run_path}"
 OPENVRML_JAVASCRIPT_RPATH="-Wl,-rpath -Wl,${GRE_PATH}"
 ])
 AC_SUBST([OPENVRML_JAVASCRIPT_RPATH])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4016] trunk

[<br...@us...>]

Revision: 4016
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4016&view=rev
Author:   braden
Date:     2009-10-25 07:16:58 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Improve warning message when JRE_HOME and JAVA_HOME aren't set.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-25 07:16:17 UTC (rev 4015)
+++ trunk/ChangeLog	2009-10-25 07:16:58 UTC (rev 4016)
@@ -1,5 +1,10 @@
 2009-10-25 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Improve warning message when JRE_HOME and
+	JAVA_HOME aren't set.
+
+2009-10-25 Braden McDaniel  <br...@en...>
+
 	* configure.ac: More GRE_PATH cleanup.
 
 2009-10-24 Braden McDaniel  <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-25 07:16:17 UTC (rev 4015)
+++ trunk/configure.ac	2009-10-25 07:16:58 UTC (rev 4016)
@@ -391,7 +391,7 @@
 AC_DEFINE_UNQUOTED([OPENVRML_JNI_CONST], [$ov_cv_jni_const],
                    [const for JNI function signatures.])
 AS_IF([test -z "$JRE_HOME"],
-[AC_MSG_WARN([JRE_HOME has not been set.  JRE_HOME must be set at run time to locate libjvm.])],
+[AC_MSG_WARN([Neither JRE_HOME nor JAVA_HOME has been set.  If neither of these is set at build time, at least one of them must be set at run time to locate libjvm.])],
 [ov_save_LDFLAGS=$LDFLAGS
 LDFLAGS="-L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/client -L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/server $LDFLAGS"
 AC_CHECK_LIB([jvm], [JNI_CreateJavaVM], [LIBS=$LIBS],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4017] trunk

[<br...@us...>]

Revision: 4017
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4017&view=rev
Author:   braden
Date:     2009-10-25 07:49:18 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Improve quality of checks to see whether variables have been set.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-25 07:16:58 UTC (rev 4016)
+++ trunk/ChangeLog	2009-10-25 07:49:18 UTC (rev 4017)
@@ -1,5 +1,10 @@
 2009-10-25 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Improve quality of checks to see whether variables
+	have been set.
+
+2009-10-25 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Improve warning message when JRE_HOME and
 	JAVA_HOME aren't set.
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-25 07:16:58 UTC (rev 4016)
+++ trunk/configure.ac	2009-10-25 07:49:18 UTC (rev 4017)
@@ -112,7 +112,7 @@
 #
 # Allow users to specify any Boost library name suffix
 #
-AS_IF([test $BOOST_LIB_SUFFIX], , [BOOST_LIB_SUFFIX=-mt])
+AS_IF([test -n "${BOOST_LIB_SUFFIX-x}"], [BOOST_LIB_SUFFIX=-mt])
 AC_ARG_VAR([BOOST_LIB_SUFFIX], [Boost library name suffix [default=-mt]])
 
 AC_CACHE_CHECK([for boost_thread$BOOST_LIB_SUFFIX library],
@@ -134,7 +134,7 @@
 # The XmlTextReader interface appears in libxml 2.5.
 #
 PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.5], , [have_libxml=no])
-AS_IF([test X$have_libxml = Xno -a -z "$XML_LIBS"],
+AS_IF([test X$have_libxml = Xno -a -n "${XML_LIBS-x}"],
       [AC_MSG_FAILURE([libxml not found])])
 
 PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
@@ -318,9 +318,9 @@
               [AC_HELP_STRING([--disable-render-text-node],
                               [disable support for rendering Text nodes])])
 AS_IF([test X$enable_render_text_node != Xno],
-      [AS_IF([test X$have_fontconfig = Xno -a -z "$FONTCONFIG_LIBS"],
+      [AS_IF([test X$have_fontconfig = Xno -a -n "${FONTCONFIG_LIBS-x}"],
              [AC_MSG_FAILURE([fontconfig is required for rendering Text nodes])])
-       AS_IF([test X$have_freetype = Xno -a -z "$FREETYPE_LIBS"],
+       AS_IF([test X$have_freetype = Xno -a -n "${FREETYPE_LIBS-x}"],
              [AC_MSG_FAILURE([FreeType is required for rendering Text nodes])])
        AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1],
                  [Defined if support for rendering Text nodes is enabled.])
@@ -340,9 +340,9 @@
 AS_IF([test X$enable_script_node_javascript = Xno],
 [JS_CFLAGS="" JS_LIBS=""],
 [AS_IF([test X$with_libjs = Xyes -a X$have_libjs = Xyes],
-       [AS_IF([test -z "$JS_CFLAGS"], [JS_CFLAGS=""])
-        AS_IF([test -z "$JS_LIBS"], [JS_LIBS="-ljs"])])
-AS_IF([test \( \( X$have_libmozjs = Xno -o \( X$with_libjs = Xyes -a X$have_libjs = Xno \) \) -a -z "$JS_LIBS" \) -o X$have_jsapi_h != Xyes],
+       [AS_IF([test -n "${JS_CFLAGS-x}"], [JS_CFLAGS=""])
+        AS_IF([test -n "${JS_LIBS-x}"], [JS_LIBS="-ljs"])])
+AS_IF([test \( \( X$have_libmozjs = Xno -o \( X$with_libjs = Xyes -a X$have_libjs = Xno \) \) -a -n "${JS_LIBS-x}" \) -o X$have_jsapi_h != Xyes],
       [AC_MSG_FAILURE([SpiderMonkey is required for Script node JavaScript support])])
 #
 # Figure out whether we need to add -DJS_THREADSAFE to JS_CFLAGS.
@@ -372,7 +372,8 @@
 # Script node Java support
 #
 AC_ARG_VAR([JAVA_HOME], [Path to Java installation])
-AS_IF([test $JRE_HOME], , [AS_IF([test $JAVA_HOME], [JRE_HOME=$JAVA_HOME])])
+AS_IF([test -n "${JRE_HOME-x}"],
+      [AS_IF([test -n "${JAVA_HOME+x}"], [JRE_HOME=$JAVA_HOME])])
 AC_ARG_VAR([JRE_HOME], [Path to Java Runtime Environment [default=JAVA_HOME/jre]])
 AC_ARG_ENABLE([script-node-java],
               [AC_HELP_STRING([--disable-script-node-java],
@@ -390,7 +391,7 @@
        [AC_MSG_FAILURE([The Java Native Interface is required for Script node Java support.])])
 AC_DEFINE_UNQUOTED([OPENVRML_JNI_CONST], [$ov_cv_jni_const],
                    [const for JNI function signatures.])
-AS_IF([test -z "$JRE_HOME"],
+AS_IF([test -n "${JRE_HOME-x}" -o -n "${JAVA_HOME-x}"],
 [AC_MSG_WARN([Neither JRE_HOME nor JAVA_HOME has been set.  If neither of these is set at build time, at least one of them must be set at run time to locate libjvm.])],
 [ov_save_LDFLAGS=$LDFLAGS
 LDFLAGS="-L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/client -L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/server $LDFLAGS"
@@ -429,9 +430,9 @@
               [AC_HELP_STRING([--disable-xembed],
                               [do not build the XEmbed control])])
 AS_IF([test X$enable_xembed != Xno],
-      [AS_IF([test X$have_dbus_glib = Xno -a -z "$DBUS_G_LIBS"],
+      [AS_IF([test X$have_dbus_glib = Xno -a -n "${DBUS_G_LIBS-x}"],
              [AC_MSG_FAILURE([D-Bus GLib bindings are required to build the XEmbed control])])
-       AS_IF([test X$have_gtkgl = Xno -a -z "$GTKGL_LIBS"],
+       AS_IF([test X$have_gtkgl = Xno -a -n "${GTKGL_LIBS-x}"],
              [AC_MSG_FAILURE([GtkGLExt is required to build the XEmbed control])])
        AS_IF([test X$enable_gl_renderer = Xno],
              [AC_MSG_FAILURE([the XEmbed control cannot be built without the GL renderer])])])
@@ -446,11 +447,11 @@
 AS_IF([test X$enable_player != Xno],
       [AS_IF([test X$enable_xembed = Xno],
              [AC_MSG_FAILURE([OpenVRML Player cannot be built without the XEmbed control])])
-       AS_IF([test X$have_gio = Xno -a -z "$GIO_LIBS"],
+       AS_IF([test X$have_gio = Xno -a -n "${GIO_LIBS-x}"],
              [AC_MSG_FAILURE([GIO is required to build OpenVRML Player])])
-       AS_IF([test X$have_gnomeui = Xno -a -z "$GNOMEUI_LIBS"],
+       AS_IF([test X$have_gnomeui = Xno -a -n "${GNOMEUI_LIBS-x}"],
              [AC_MSG_FAILURE([libgnomeui is required to build OpenVRML Player])])
-       AS_IF([test X$have_libcurl = Xno -a -z "$CURL_LIBS"],
+       AS_IF([test X$have_libcurl = Xno -a -n "${CURL_LIBS-x}"],
              [AC_MSG_FAILURE([libcurl is required to build OpenVRML Player])])
 ])
 AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno])
@@ -464,9 +465,9 @@
 AS_IF([test X$enable_mozilla_plugin != Xno],
       [AS_IF([test X$enable_xembed = Xno],
              [AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the XEmbed control])])
-       AS_IF([test X$have_mozilla_plugin = Xno -a -z "$MOZILLA_PLUGIN_CFLAGS"],
+       AS_IF([test X$have_mozilla_plugin = Xno -a -n "${MOZILLA_PLUGIN_CFLAGS-x}"],
              [AC_MSG_FAILURE([Mozilla plug-in development headers are required to build the Mozilla plug-in.])])
-       AS_IF([test X$have_dbus_glib = Xno -a -z "$DBUS_G_LIBS"],
+       AS_IF([test X$have_dbus_glib = Xno -a -n "${DBUS_G_LIBS-x}"],
              [AC_MSG_FAILURE([The D-Bus GLib binding is required to build the Mozilla plug-in])])])
 AM_CONDITIONAL([ENABLE_MOZILLA_PLUGIN],
   [test "X$enable_mozilla_plugin" != "Xno" -a "X$have_dbus_glib" != "Xno"])
@@ -497,7 +498,7 @@
 # Determine whether to apply the -rpath for the Gecko runtime libraries.
 #
 AS_IF([test "X$enable_gecko_rpath" = Xyes],
-[AS_IF([test $GRE_PATH],
+[AS_IF([test -n "${GRE_PATH-x}"],
        [GRE_PATH=`echo $JS_LIBS | sed -e 's/^-L\([[^ ]]*\).*/\1/'`
         AS_IF([test "X$GRE_PATH" = "X$JS_LIBS"],
               [GRE_PATH=""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4019] trunk

[<br...@us...>]

Revision: 4019
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4019&view=rev
Author:   braden
Date:     2009-10-27 17:19:47 +0000 (Tue, 27 Oct 2009)

Log Message:
-----------
Set GError on failure.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-player/curlbrowserhost.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-25 07:54:45 UTC (rev 4018)
+++ trunk/ChangeLog	2009-10-27 17:19:47 UTC (rev 4019)
@@ -1,3 +1,10 @@
+2009-10-27 Braden McDaniel  <br...@en...>
+
+	* src/openvrml-player/curlbrowserhost.cpp
+	(openvrml_player_curl_browser_host_get_url(
+	OpenvrmlPlayerCurlBrowserHost *, const char *, GError **)): Set
+	GError on failure.
+
 2009-10-25 Braden McDaniel  <br...@en...>
 
 	* configure.ac: Improve quality of checks to see whether variables

Modified: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp	2009-10-25 07:54:45 UTC (rev 4018)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp	2009-10-27 17:19:47 UTC (rev 4019)
@@ -34,6 +34,21 @@
 
 using namespace boost::multi_index::detail; // for scope_guard
 
+# define OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR \
+    openvrml_player_curl_browser_host_error_quark()
+
+OPENVRML_LOCAL
+GQuark openvrml_player_curl_browser_host_error_quark()
+{
+    return g_quark_from_static_string(
+        "openvrml-player-curl-browser-host-error-quark");
+}
+
+enum OpenvrmlPlayerCurlBrowserHostError {
+    OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_OUT_OF_MEMORY = 1,
+    OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL
+};
+
 G_DEFINE_TYPE(OpenvrmlPlayerCurlBrowserHost,
               openvrml_player_curl_browser_host,
               GTK_TYPE_SOCKET)
@@ -418,14 +433,29 @@
     return false;
 }
 
-/**
- * @todo We need to do something with the GError here.
- */
+namespace {
+    G_GNUC_INTERNAL
+    CURLcode curl_easy_setopt_with_error(CURL * const handle,
+                                         const CURLoption option,
+                                         void * const parameter,
+                                         GError ** const error)
+    {
+        CURLcode setopt_result = curl_easy_setopt(handle, option, parameter);
+        if (setopt_result != CURLE_OK) {
+            g_set_error(error,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL,
+                        curl_easy_strerror(setopt_result));
+        }
+        return setopt_result;
+    }
+}
+
 int
 openvrml_player_curl_browser_host_get_url(
     OpenvrmlPlayerCurlBrowserHost * const host,
     const char * const url,
-    GError ** /* error */)
+    GError ** const error)
 {
     CURL * const handle = curl_easy_init();
     try {
@@ -441,28 +471,65 @@
         CURLcode setopt_result;
         setopt_result = curl_easy_setopt(handle,
                                          CURLOPT_FAILONERROR, true);
-        CURL_BROWSER_HOST_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false);
+        if (setopt_result != CURLE_OK) {
+            g_set_error(error,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL,
+                        curl_easy_strerror(setopt_result));
+            return 1;
+        }
+
         setopt_result = curl_easy_setopt(handle,
                                          CURLOPT_ENCODING, "");
-        CURL_BROWSER_HOST_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false);
+        if (setopt_result != CURLE_OK) {
+            g_set_error(error,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL,
+                        curl_easy_strerror(setopt_result));
+            return 1;
+        }
+
         setopt_result = curl_easy_setopt(handle,
                                          CURLOPT_URL, stream_data->url());
-        CURL_BROWSER_HOST_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false);
+        if (setopt_result != CURLE_OK) {
+            g_set_error(error,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL,
+                        curl_easy_strerror(setopt_result));
+            return 1;
+        }
 
         setopt_result =
             curl_easy_setopt(handle,
                              CURLOPT_WRITEFUNCTION,
                              openvrml_player_curl_browser_host_curl_write);
-        CURL_BROWSER_HOST_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false);
+        if (setopt_result != CURLE_OK) {
+            g_set_error(error,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL,
+                        curl_easy_strerror(setopt_result));
+            return 1;
+        }
 
         setopt_result = curl_easy_setopt(handle,
                                          CURLOPT_WRITEDATA, stream_data);
-        CURL_BROWSER_HOST_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false);
+        if (setopt_result != CURLE_OK) {
+            g_set_error(error,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL,
+                        curl_easy_strerror(setopt_result));
+            return 1;
+        }
 
         const CURLMcode add_handle_result =
             curl_multi_add_handle(host->priv->multi_handle, handle);
-        CURL_BROWSER_HOST_CURL_MULTI_RETURN_VAL_IF_ERROR(add_handle_result,
-                                                         false);
+        if (setopt_result != CURLE_OK) {
+            g_set_error(error,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                        OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_CURL,
+                        curl_multi_strerror(add_handle_result));
+            return 1;
+        }
 
         CURLSource * curl_source =
             static_cast<CURLSource *>(
@@ -483,6 +550,10 @@
                 host->priv->multi_handle);
         }
     } catch (std::bad_alloc & ex) {
+        g_set_error(error,
+                    OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR,
+                    OPENVRML_PLAYER_CURL_BROWSER_HOST_ERROR_OUT_OF_MEMORY,
+                    ex.what());
         return 1;
     }
     return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4021] trunk

[<br...@us...>]

Revision: 4021
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4021&view=rev
Author:   braden
Date:     2009-10-30 09:48:22 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Use AS_IF consistently.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-27 17:23:24 UTC (rev 4020)
+++ trunk/ChangeLog	2009-10-30 09:48:22 UTC (rev 4021)
@@ -1,3 +1,7 @@
+2009-10-30 Braden McDaniel  <br...@en...>
+
+	* configure.ac: Use AS_IF consistently.
+
 2009-10-27 Braden McDaniel  <br...@en...>
 
 	* src/openvrml-player/curlbrowserhost.cpp

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-27 17:23:24 UTC (rev 4020)
+++ trunk/configure.ac	2009-10-30 09:48:22 UTC (rev 4021)
@@ -242,19 +242,16 @@
 
 AC_PATH_PROG([SDL_CONFIG], [sdl-config])
 have_sdl=no
-if test -n "${SDL_CONFIG}"; then
-    have_sdl=yes
-    SDL_CFLAGS=`$SDL_CONFIG --cflags`
-    SDL_LIBS=`$SDL_CONFIG --libs`
-    #
-    # sdl-config sometimes emits an rpath flag pointing at its library
-    # installation directory.  We don't want this, as it prevents users from
-    # linking sdl-viewer against, for example, a locally compiled libGL when a
-    # version of the library also exists in SDL's library installation
-    # directory, typically /usr/lib.
-    #
-    SDL_LIBS=`echo $SDL_LIBS | sed 's/-Wl,-rpath,[[^ ]]* //'`
-fi
+#
+# sdl-config sometimes emits an rpath flag pointing at its library
+# installation directory.  We don't want this, as it prevents users from
+# linking sdl-viewer against, for example, a locally compiled libGL when a
+# version of the library also exists in SDL's library installation
+# directory, typically /usr/lib.
+#
+AS_IF([test -n "${SDL_CONFIG}"],
+      [have_sdl=yes SDL_CFLAGS=`$SDL_CONFIG --cflags` SDL_LIBS=`$SDL_CONFIG --libs`
+       SDL_LIBS=`echo $SDL_LIBS | sed 's/-Wl,-rpath,[[^ ]]* //'`])
 AC_SUBST([SDL_CFLAGS])
 AC_SUBST([SDL_LIBS])
 
@@ -287,13 +284,11 @@
 AC_ARG_ENABLE([png-textures],
               [AC_HELP_STRING([--disable-png-textures],
                               [disable support for rendering PNG textures])])
-if test X$enable_png_textures = Xno; then
-  PNG_LIBS=""
-else
-  PNG_LIBS="-lpng -lz"
-  AC_DEFINE([OPENVRML_ENABLE_PNG_TEXTURES], [1],
-            [Defined if support for rendering PNG textures is enabled.])
-fi
+AS_IF([test X$enable_png_textures = Xno],
+      [PNG_LIBS=""],
+      [PNG_LIBS="-lpng -lz"
+       AC_DEFINE([OPENVRML_ENABLE_PNG_TEXTURES], [1],
+                 [Defined if support for rendering PNG textures is enabled.])])
 AC_SUBST([PNG_LIBS])
 
 #
@@ -302,13 +297,11 @@
 AC_ARG_ENABLE([jpeg-textures],
               [AC_HELP_STRING([--disable-jpeg-textures],
                               [disable support for rendering JPEG textures])])
-if test X$enable_jpeg_textures = Xno; then
-  JPEG_LIBS=""
-else
-  JPEG_LIBS="-ljpeg"
-  AC_DEFINE([OPENVRML_ENABLE_JPEG_TEXTURES], [1],
-            [Defined if support for rendering JPEG textures is enabled.])
-fi
+AS_IF([test X$enable_jpeg_textures = Xno],
+      [JPEG_LIBS=""]
+      [JPEG_LIBS="-ljpeg"
+       AC_DEFINE([OPENVRML_ENABLE_JPEG_TEXTURES], [1],
+                 [Defined if support for rendering JPEG textures is enabled.])])
 AC_SUBST([JPEG_LIBS])
 
 #
@@ -411,17 +404,14 @@
 AC_ARG_ENABLE([gl-renderer],
               [AC_HELP_STRING([--disable-gl-renderer],
                               [do not build GL renderer])])
-if test "X$enable_gl_renderer" != "Xno"; then
-  if test "X$no_gl" = "Xyes"; then
-    AC_MSG_FAILURE([OpenGL/Mesa (libGL) is required for the GL renderer])
-  fi
-  if test "X$no_glu" = "Xyes"; then
-    AC_MSG_FAILURE([the OpenGL Utility library (libGLU) is required for the GL renderer])
-  fi
-  AC_CONFIG_FILES([openvrml-gl.pc])
-fi
+AS_IF([test X$enable_gl_renderer != Xno],
+      [AS_IF([test X$no_gl = Xyes],
+             [AC_MSG_FAILURE([OpenGL/Mesa (libGL) is required for the GL renderer])])
+       AS_IF([test X$no_glu = Xyes],
+             [AC_MSG_FAILURE([the OpenGL Utility library (libGLU) is required for the GL renderer])])
+       AC_CONFIG_FILES([openvrml-gl.pc])])
 AM_CONDITIONAL([ENABLE_GL_RENDERER],
-               [test "X$enable_gl_renderer" != "Xno" -a "X$no_gl" != "Xyes"])
+               [test X$enable_gl_renderer != Xno -a X$no_gl != Xyes])
 
 #
 # build the XEmbed control
@@ -478,11 +468,8 @@
 AC_ARG_ENABLE([examples],
               [AC_HELP_STRING([--disable-examples],
                               [do not build the example programs])])
-if test "X$enable_examples" != "Xno"; then
-  if test "X$have_sdl" != "Xyes"; then
-    AC_MSG_FAILURE([SDL is required for the example programs])
-  fi
-fi
+AS_IF([test "X$enable_examples" != "Xno" -a "X$have_sdl" != "Xyes"],
+      [AC_MSG_FAILURE([SDL is required for the example programs])])
 AM_CONDITIONAL([ENABLE_EXAMPLES],
                [test "X$enable_examples" != "Xno" -a "X$have_sdl" = "Xyes"])
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4024] trunk

[<br...@us...>]

Revision: 4024
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4024&view=rev
Author:   braden
Date:     2009-10-30 17:18:06 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Use pkg-config to check for libpng.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-30 09:53:06 UTC (rev 4023)
+++ trunk/ChangeLog	2009-10-30 17:18:06 UTC (rev 4024)
@@ -1,5 +1,11 @@
 2009-10-30 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Use pkg-config to check for libpng.  This allows
+	us to be a little smarter about linking and avoid linking directly
+	with zlib on platforms that don't need it.
+
+2009-10-30 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Use AS_IF consistently.
 
 2009-10-27 Braden McDaniel  <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-30 09:53:06 UTC (rev 4023)
+++ trunk/configure.ac	2009-10-30 17:18:06 UTC (rev 4024)
@@ -137,6 +137,7 @@
 AS_IF([test X$have_libxml = Xno -a -n "${XML_LIBS-x}"],
       [AC_MSG_FAILURE([libxml not found])])
 
+PKG_CHECK_MODULES([PNG], [libpng], , [have_libpng=no])
 PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
 PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no])
 #
@@ -284,12 +285,11 @@
 AC_ARG_ENABLE([png-textures],
               [AC_HELP_STRING([--disable-png-textures],
                               [disable support for rendering PNG textures])])
-AS_IF([test X$enable_png_textures = Xno],
-      [PNG_LIBS=""],
-      [PNG_LIBS="-lpng -lz"
+AS_IF([test X$enable_png_textures != Xno],
+      [AS_IF([test X$have_libpng = Xno],
+             [AC_MSG_FAILURE([libpng is required for PNG texture support])])
        AC_DEFINE([OPENVRML_ENABLE_PNG_TEXTURES], [1],
                  [Defined if support for rendering PNG textures is enabled.])])
-AC_SUBST([PNG_LIBS])
 
 #
 # JPEG texture support


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4026] trunk

[<br...@us...>]

Revision: 4026
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4026&view=rev
Author:   braden
Date:     2009-10-30 17:47:15 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Added libxml-2.0 to Requires.private.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/openvrml.pc.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-30 17:42:27 UTC (rev 4025)
+++ trunk/ChangeLog	2009-10-30 17:47:15 UTC (rev 4026)
@@ -1,5 +1,9 @@
 2009-10-30 Braden McDaniel  <br...@en...>
 
+	* openvrml.pc.in: Added libxml-2.0 to Requires.private.
+
+2009-10-30 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Use pkg-config to check for libpng.  This allows
 	us to be a little smarter about linking and avoid linking directly
 	with zlib on platforms that don't need it.

Modified: trunk/openvrml.pc.in
===================================================================
--- trunk/openvrml.pc.in	2009-10-30 17:42:27 UTC (rev 4025)
+++ trunk/openvrml.pc.in	2009-10-30 17:47:15 UTC (rev 4026)
@@ -6,6 +6,7 @@
 Name: @PACKAGE_NAME@
 Description: VRML/X3D run-time library.
 Version: @PACKAGE_VERSION@
+Requires.private: libxml-2.0 >= 2.5
 Libs: -L${libdir} -lopenvrml
 Libs.private: -lboost_thread@BOOST_LIB_SUFFIX@ -lboost_filesystem@BOOST_LIB_SUFFIX@ -lltdl
 Cflags: -I${includedir}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4028] trunk

[<br...@us...>]

Revision: 4028
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4028&view=rev
Author:   braden
Date:     2009-10-31 04:49:22 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Added URL.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/openvrml.pc.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-30 18:26:01 UTC (rev 4027)
+++ trunk/ChangeLog	2009-10-31 04:49:22 UTC (rev 4028)
@@ -1,3 +1,7 @@
+2009-10-31 Braden McDaniel  <br...@en...>
+
+	* openvrml.pc.in: Added URL.
+
 2009-10-30 Braden McDaniel  <br...@en...>
 
 	* openvrml.pc.in: Added libxml-2.0 to Requires.private.

Modified: trunk/openvrml.pc.in
===================================================================
--- trunk/openvrml.pc.in	2009-10-30 18:26:01 UTC (rev 4027)
+++ trunk/openvrml.pc.in	2009-10-31 04:49:22 UTC (rev 4028)
@@ -5,6 +5,7 @@
 
 Name: @PACKAGE_NAME@
 Description: VRML/X3D run-time library.
+URL: http://openvrml.org
 Version: @PACKAGE_VERSION@
 Requires.private: libxml-2.0 >= 2.5
 Libs: -L${libdir} -lopenvrml


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: openvrml:[4030] trunk

[<br...@us...>]

Revision: 4030
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4030&view=rev
Author:   braden
Date:     2009-10-31 06:19:13 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Fixed checks for unset shell variables.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-31 04:55:01 UTC (rev 4029)
+++ trunk/ChangeLog	2009-10-31 06:19:13 UTC (rev 4030)
@@ -1,5 +1,9 @@
 2009-10-31 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Fixed checks for unset shell variables.
+
+2009-10-31 Braden McDaniel  <br...@en...>
+
 	* openvrml.pc.in: Added URL.
 
 2009-10-30 Braden McDaniel  <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-31 04:55:01 UTC (rev 4029)
+++ trunk/configure.ac	2009-10-31 06:19:13 UTC (rev 4030)
@@ -112,7 +112,7 @@
 #
 # Allow users to specify any Boost library name suffix
 #
-AS_IF([test -n "${BOOST_LIB_SUFFIX-x}"], [BOOST_LIB_SUFFIX=-mt])
+AS_IF([test -z "${BOOST_LIB_SUFFIX+x}"], [BOOST_LIB_SUFFIX=-mt])
 AC_ARG_VAR([BOOST_LIB_SUFFIX], [Boost library name suffix [default=-mt]])
 
 AC_CACHE_CHECK([for boost_thread$BOOST_LIB_SUFFIX library],
@@ -134,7 +134,7 @@
 # The XmlTextReader interface appears in libxml 2.5.
 #
 PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.5], , [have_libxml=no])
-AS_IF([test X$have_libxml = Xno -a -n "${XML_LIBS-x}"],
+AS_IF([test X$have_libxml = Xno -a -z "${XML_LIBS+x}"],
       [AC_MSG_FAILURE([libxml not found])])
 
 PKG_CHECK_MODULES([PNG], [libpng], , [have_libpng=no])
@@ -311,9 +311,9 @@
               [AC_HELP_STRING([--disable-render-text-node],
                               [disable support for rendering Text nodes])])
 AS_IF([test X$enable_render_text_node != Xno],
-      [AS_IF([test X$have_fontconfig = Xno -a -n "${FONTCONFIG_LIBS-x}"],
+      [AS_IF([test X$have_fontconfig = Xno -a -z "${FONTCONFIG_LIBS+x}"],
              [AC_MSG_FAILURE([fontconfig is required for rendering Text nodes])])
-       AS_IF([test X$have_freetype = Xno -a -n "${FREETYPE_LIBS-x}"],
+       AS_IF([test X$have_freetype = Xno -a -z "${FREETYPE_LIBS+x}"],
              [AC_MSG_FAILURE([FreeType is required for rendering Text nodes])])
        AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1],
                  [Defined if support for rendering Text nodes is enabled.])
@@ -333,9 +333,9 @@
 AS_IF([test X$enable_script_node_javascript = Xno],
 [JS_CFLAGS="" JS_LIBS=""],
 [AS_IF([test X$with_libjs = Xyes -a X$have_libjs = Xyes],
-       [AS_IF([test -n "${JS_CFLAGS-x}"], [JS_CFLAGS=""])
-        AS_IF([test -n "${JS_LIBS-x}"], [JS_LIBS="-ljs"])])
-AS_IF([test \( \( X$have_libmozjs = Xno -o \( X$with_libjs = Xyes -a X$have_libjs = Xno \) \) -a -n "${JS_LIBS-x}" \) -o X$have_jsapi_h != Xyes],
+       [AS_IF([test -z "${JS_CFLAGS+x}"], [JS_CFLAGS=""])
+        AS_IF([test -z "${JS_LIBS+x}"], [JS_LIBS="-ljs"])])
+AS_IF([test \( \( X$have_libmozjs = Xno -o \( X$with_libjs = Xyes -a X$have_libjs = Xno \) \) -a -z "${JS_LIBS+x}" \) -o X$have_jsapi_h != Xyes],
       [AC_MSG_FAILURE([SpiderMonkey is required for Script node JavaScript support])])
 #
 # Figure out whether we need to add -DJS_THREADSAFE to JS_CFLAGS.
@@ -365,7 +365,7 @@
 # Script node Java support
 #
 AC_ARG_VAR([JAVA_HOME], [Path to Java installation])
-AS_IF([test -n "${JRE_HOME-x}"],
+AS_IF([test -z "${JRE_HOME+x}"],
       [AS_IF([test -n "${JAVA_HOME+x}"], [JRE_HOME=$JAVA_HOME])])
 AC_ARG_VAR([JRE_HOME], [Path to Java Runtime Environment [default=JAVA_HOME/jre]])
 AC_ARG_ENABLE([script-node-java],
@@ -384,7 +384,7 @@
        [AC_MSG_FAILURE([The Java Native Interface is required for Script node Java support.])])
 AC_DEFINE_UNQUOTED([OPENVRML_JNI_CONST], [$ov_cv_jni_const],
                    [const for JNI function signatures.])
-AS_IF([test -n "${JRE_HOME-x}" -o -n "${JAVA_HOME-x}"],
+AS_IF([test -z "${JRE_HOME+x}" -a -z "${JAVA_HOME+x}"],
 [AC_MSG_WARN([Neither JRE_HOME nor JAVA_HOME has been set.  If neither of these is set at build time, at least one of them must be set at run time to locate libjvm.])],
 [ov_save_LDFLAGS=$LDFLAGS
 LDFLAGS="-L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/client -L$JRE_HOME/lib/$OPENVRML_JVM_ARCH/server $LDFLAGS"
@@ -420,9 +420,9 @@
               [AC_HELP_STRING([--disable-xembed],
                               [do not build the XEmbed control])])
 AS_IF([test X$enable_xembed != Xno],
-      [AS_IF([test X$have_dbus_glib = Xno -a -n "${DBUS_G_LIBS-x}"],
+      [AS_IF([test X$have_dbus_glib = Xno -a -z "${DBUS_G_LIBS+x}"],
              [AC_MSG_FAILURE([D-Bus GLib bindings are required to build the XEmbed control])])
-       AS_IF([test X$have_gtkgl = Xno -a -n "${GTKGL_LIBS-x}"],
+       AS_IF([test X$have_gtkgl = Xno -a -z "${GTKGL_LIBS+x}"],
              [AC_MSG_FAILURE([GtkGLExt is required to build the XEmbed control])])
        AS_IF([test X$enable_gl_renderer = Xno],
              [AC_MSG_FAILURE([the XEmbed control cannot be built without the GL renderer])])])
@@ -437,11 +437,11 @@
 AS_IF([test X$enable_player != Xno],
       [AS_IF([test X$enable_xembed = Xno],
              [AC_MSG_FAILURE([OpenVRML Player cannot be built without the XEmbed control])])
-       AS_IF([test X$have_gio = Xno -a -n "${GIO_LIBS-x}"],
+       AS_IF([test X$have_gio = Xno -a -z "${GIO_LIBS+x}"],
              [AC_MSG_FAILURE([GIO is required to build OpenVRML Player])])
-       AS_IF([test X$have_gnomeui = Xno -a -n "${GNOMEUI_LIBS-x}"],
+       AS_IF([test X$have_gnomeui = Xno -a -z "${GNOMEUI_LIBS+x}"],
              [AC_MSG_FAILURE([libgnomeui is required to build OpenVRML Player])])
-       AS_IF([test X$have_libcurl = Xno -a -n "${CURL_LIBS-x}"],
+       AS_IF([test X$have_libcurl = Xno -a -z "${CURL_LIBS+x}"],
              [AC_MSG_FAILURE([libcurl is required to build OpenVRML Player])])
 ])
 AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno])
@@ -455,9 +455,9 @@
 AS_IF([test X$enable_mozilla_plugin != Xno],
       [AS_IF([test X$enable_xembed = Xno],
              [AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the XEmbed control])])
-       AS_IF([test X$have_mozilla_plugin = Xno -a -n "${MOZILLA_PLUGIN_CFLAGS-x}"],
+       AS_IF([test X$have_mozilla_plugin = Xno -a -z "${MOZILLA_PLUGIN_CFLAGS+x}"],
              [AC_MSG_FAILURE([Mozilla plug-in development headers are required to build the Mozilla plug-in.])])
-       AS_IF([test X$have_dbus_glib = Xno -a -n "${DBUS_G_LIBS-x}"],
+       AS_IF([test X$have_dbus_glib = Xno -a -z "${DBUS_G_LIBS+x}"],
              [AC_MSG_FAILURE([The D-Bus GLib binding is required to build the Mozilla plug-in])])])
 AM_CONDITIONAL([ENABLE_MOZILLA_PLUGIN],
   [test "X$enable_mozilla_plugin" != "Xno" -a "X$have_dbus_glib" != "Xno"])
@@ -485,7 +485,7 @@
 # Determine whether to apply the -rpath for the Gecko runtime libraries.
 #
 AS_IF([test "X$enable_gecko_rpath" = Xyes],
-[AS_IF([test -n "${GRE_PATH-x}"],
+[AS_IF([test -z "${GRE_PATH+x}"],
        [GRE_PATH=`echo $JS_LIBS | sed -e 's/^-L\([[^ ]]*\).*/\1/'`
         AS_IF([test "X$GRE_PATH" = "X$JS_LIBS"],
               [GRE_PATH=""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.