Allow the whole library to be wrapped in a (potentially versioned) cu…

…stom namespace to be determined at compile time with 'make NAMESPACE=foo'. By default, no such enclosing namespace is used. git-svn-id: https://openshadinglanguage.googlecode.com/svn/trunk@140 a3683778-fedd-11de-87c3-653bb6514e15
AcademySoftwareFoundation · Jul 20, 2009 · 4e50a72 · 4e50a72
1 parent e3422fc
commit 4e50a72
Show file tree

Hide file tree

Showing 33 changed files with 243 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -40,6 +40,14 @@ ifneq (${VERBOSE},)
 MY_MAKE_FLAGS += VERBOSE=${VERBOSE}
 endif
 
+ifneq (${USE_TBB},)
+MY_CMAKE_FLAGS += -DUSE_TBB:BOOL=${USE_TBB}
+endif
+
+ifneq (${NAMESPACE},)
+MY_CMAKE_FLAGS += -DOSL_NAMESPACE:STRING=${NAMESPACE}
+endif
+
 ifdef DEBUG
 MY_CMAKE_FLAGS += -DCMAKE_BUILD_TYPE:STRING=Debug
 endif
@@ -158,4 +166,6 @@ help:
 	@echo "Helpful modifiers:"
 	@echo "  make VERBOSE=1 ...          Show all compilation commands"
 	@echo "  make MYCC=xx MYCXX=yy ...   Use custom compilers"
+	@echo "  make USE_TBB=0 ...          Don't use TBB"
+	@echo "  make NAMESPACE=name         Wrap everything in another namespace"
 	@echo ""
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -40,6 +40,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     add_definitions ("-DDEBUG=1")
 endif ()
 
+if (OSL_NAMESPACE)
+    add_definitions ("-DOSL_NAMESPACE=${OSL_NAMESPACE}")
+endif ()
+
 # use, i.e. don't skip the full RPATH for the build tree
 set (CMAKE_SKIP_BUILD_RPATH  FALSE)
 # when building, don't use the install RPATH already

diff --git a/src/include/osl_pvt.h b/src/include/osl_pvt.h
@@ -34,6 +34,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OpenImageIO/ustring.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {
 
@@ -519,5 +523,9 @@ typedef std::vector<Opcode> OpcodeVec;
 }; // namespace OSL::pvt
 }; // namespace OSL
 
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+using namespace OSL_NAMESPACE;
+#endif
 
 #endif /* OSL_PVT_H */
diff --git a/src/include/oslcomp.h b/src/include/oslcomp.h
@@ -30,6 +30,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define OSLCOMP_H
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 
 
@@ -54,5 +58,10 @@ class OSLCompiler {
 
 }; // namespace OSL
 
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+using namespace OSL_NAMESPACE;
+#endif
+
 
 #endif /* OSLCOMP_H */
diff --git a/src/include/oslexec.h b/src/include/oslexec.h
@@ -41,6 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 
 class ShadingAttribState;
@@ -214,5 +218,10 @@ class ShaderGlobals
 
 }; // namespace OSL
 
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+using namespace OSL_NAMESPACE;
+#endif
+
 
 #endif /* OSLEXEC_H */
diff --git a/src/include/oslquery.h b/src/include/oslquery.h
@@ -47,6 +47,10 @@ Sony Pictures Imageworks terms, above.
 #include "OpenImageIO/typedesc.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 
 namespace pvt {
@@ -138,5 +142,10 @@ class DLLPUBLIC OSLQuery {
 
 }; /* end namespace OSL */
 
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+using namespace OSL_NAMESPACE;
+#endif
+
 
 #endif /* OSLQUERY_H */
diff --git a/src/liboslcomp/ast.cpp b/src/liboslcomp/ast.cpp
@@ -38,6 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ast.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {   // OSL::pvt
 
@@ -687,3 +691,7 @@ ASTliteral::print (std::ostream &out, int indentlevel) const
 
 }; // namespace pvt
 }; // namespace OSL
+
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslcomp/ast.h b/src/liboslcomp/ast.h
@@ -40,6 +40,10 @@ class oslFlexLexer;
 extern int oslparse ();
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {
 
@@ -686,5 +690,10 @@ class ASTliteral : public ASTNode
 }; // namespace pvt
 }; // namespace OSL
 
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+using namespace OSL_NAMESPACE;
+#endif
+
 
 #endif /* OSL_AST_H */
diff --git a/src/liboslcomp/codegen.cpp b/src/liboslcomp/codegen.cpp
@@ -40,6 +40,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ast.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {   // OSL::pvt
 
@@ -381,3 +385,7 @@ ASTliteral::codegen (Symbol *dest)
 
 }; // namespace pvt
 }; // namespace OSL
+
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslcomp/oslcomp.cpp b/src/liboslcomp/oslcomp.cpp
@@ -48,6 +48,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FlexLexer.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 
 
@@ -539,3 +543,7 @@ OSLCompilerImpl::retrieve_source (ustring filename, int line)
 
 }; // namespace pvt
 }; // namespace OSL
+
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslcomp/oslcomp_pvt.h b/src/liboslcomp/oslcomp_pvt.h
@@ -40,6 +40,10 @@ class oslFlexLexer;
 extern int oslparse ();
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {
 
@@ -208,5 +212,10 @@ extern OSLCompilerImpl *oslcompiler;
 }; // namespace pvt
 }; // namespace OSL
 
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+using namespace OSL_NAMESPACE;
+#endif
+
 
 #endif /* OSLCOMP_PVT_H */
diff --git a/src/liboslcomp/oslgram.y b/src/liboslcomp/oslgram.y
@@ -55,11 +55,17 @@ using namespace OSL::pvt;
 
 
 // Forward declaration
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
 namespace OSL {
 namespace pvt {
 TypeDesc lextype (int lex);
 };
 };
+#ifdef OSL_NAMESPACE {
+};
+#endif
 
 %}
 

diff --git a/src/liboslcomp/symtab.cpp b/src/liboslcomp/symtab.cpp
@@ -38,6 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ast.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {   // OSL::pvt
 
@@ -255,3 +259,7 @@ SymbolTable::print ()
 
 }; // namespace pvt
 }; // namespace OSL
+
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslcomp/symtab.h b/src/liboslcomp/symtab.h
@@ -50,6 +50,10 @@ using std::hash_set;
 #include "osl_pvt.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {
 
@@ -256,5 +260,10 @@ class SymbolTable {
 }; // namespace pvt
 }; // namespace OSL
 
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+using namespace OSL_NAMESPACE;
+#endif
+
 
 #endif /* OSL_SYMTAB_H */
diff --git a/src/liboslcomp/typecheck.cpp b/src/liboslcomp/typecheck.cpp
@@ -38,6 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ast.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
+
 namespace OSL {
 namespace pvt {   // OSL::pvt
 
@@ -899,3 +903,7 @@ OSLCompilerImpl::typelist_from_code (const char *code)
 
 }; // namespace pvt
 }; // namespace OSL
+
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslexec/loadshader.cpp b/src/liboslexec/loadshader.cpp
@@ -43,8 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
 namespace OSL {
-
 namespace pvt {   // OSL::pvt
 
 
@@ -369,3 +371,7 @@ ShadingSystemImpl::loadshader (const char *cname)
 
 }; // namespace pvt
 }; // namespace OSL
+
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslexec/master.cpp b/src/liboslexec/master.cpp
@@ -42,8 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
 namespace OSL {
-
 namespace pvt {   // OSL::pvt
 
 
@@ -228,3 +230,6 @@ ShaderMaster::resolve_ops ()
 
 }; // namespace pvt
 }; // namespace OSL
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslexec/opassign.cpp b/src/liboslexec/opassign.cpp
@@ -42,6 +42,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OpenImageIO/varyingref.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
 namespace OSL {
 namespace pvt {
 
@@ -162,3 +165,6 @@ DECLOP (OP_assign)
 
 }; // namespace pvt
 }; // namespace OSL
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslexec/opcompare.cpp b/src/liboslexec/opcompare.cpp
@@ -42,6 +42,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OpenImageIO/varyingref.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
 namespace OSL {
 namespace pvt {
 
@@ -417,3 +420,6 @@ DECLOP (OP_ge)
 
 }; // namespace pvt
 }; // namespace OSL
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif
diff --git a/src/liboslexec/opcontrol.cpp b/src/liboslexec/opcontrol.cpp
@@ -43,6 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OpenImageIO/sysutil.h"
 
 
+#ifdef OSL_NAMESPACE
+namespace OSL_NAMESPACE {
+#endif
 namespace OSL {
 namespace pvt {
 
@@ -124,3 +127,6 @@ DECLOP (OP_if)
 
 }; // namespace pvt
 }; // namespace OSL
+#ifdef OSL_NAMESPACE
+}; // end namespace OSL_NAMESPACE
+#endif