Updated to Cortex 9.0.0-b2

cortex-9.0.0-b2/.travis.yml

@@ -0,0 +1,21 @@
+language: cpp
+
+os:
+    - linux
+
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -qq libboost-all-dev
+    - sudo apt-get install -qq libopenexr-dev
+    - sudo apt-get install -qq libtbb-dev
+    - sudo apt-get install -qq libfreetype6-dev
+
+script:
+    - scons testCore testCorePython CXX=$CXX ENV_VARS_TO_IMPORT="PATH TRAVIS" RMAN_ROOT=$DELIGHT BOOST_LIB_SUFFIX=""
+
+compiler:
+    ## \todo Enable clang here too. We can't with the default Ubuntu boost
+    # install though, because it is broken for Clang :
+    #
+    # https://svn.boost.org/trac/boost/ticket/6156
+    - gcc

cortex-9.0.0-a10/Changes → cortex-9.0.0-b2/Changes

@@ -1,3 +1,83 @@
+# 9.0.0-b2
+
+#### IECore
+
+- Removed SimpleSubsurface
+- Removed Marschner code
+- Removed HitMissTransform
+- Removed TypeInfoCmp
+- Removed UniformRandomPointDistributionOp
+- Removed MappedRandomPointDistributionOp
+- Removed AttributeCache
+- Removed InterpolatedCache
+- Removed spherical harmonics code
+- Removed FileExampiners
+- Improved MurmurHash performance
+
+#### IECoreGL
+
+- Added mip mapping to ColorTexture.
+
+#### IECoreAppleseed
+
+- Added visibility attributes support.
+- Fixed bug converting OSL int shader parameters.
+
+#### Build
+
+- Windows build fixes.
+- Updated default build arguments to work with standard packages on Ubuntu 12.04.
+- Configured Travis automated testing.
+
+# 9.0.0-b1
+
+#### IECore
+
+- Fixed GILReleasePtr crash.
+- Adding the export macros for proper exporting of symbols.
+
+#### IECoreMaya
+
+- Fixed ieSceneShape component selection bug.
+- Fixed crash when expanding ieSceneShapes containing coordinate systems.
+
+#### IECoreGL
+
+- Added ToGLSphereConverter.
+- Adding the export macros for proper exporting of symbols.
+
+#### IECoreRI
+
+- Adding the export macros for proper exporting of symbols.
+
+#### IECoreArnold
+
+- Adding the export macros for proper exporting of symbols.
+
+#### IECoreAppleseed
+
+- Added initial support for Appleseed.
+- Added crop window support.
+- Fixed OSX compilation and linking issues.
+
+#### IECoreAlembic
+
+- Adding the export macros for proper exporting of symbols.
+
+# 9.0.0-a11
+
+#### IECore
+
+- Optimised Object::memoryUsage() 
+
+#### IECoreGL
+
+- Added support for setting array uniforms in shader parameters
+
+#### IECoreAppleseed
+
+- Added initial support for Appleseed
+
 # 9.0.0-a10
 
 #### IECore

cortex-9.0.0-a10/SConstruct → cortex-9.0.0-b2/SConstruct

@@ -53,7 +53,7 @@ SConsignFile()
 ieCoreMajorVersion=9
 ieCoreMinorVersion=0
 ieCorePatchVersion=0
-ieCoreVersionSuffix="a10"	# used for alpha/beta releases. Example: "a1", "b2", etc.
+ieCoreVersionSuffix="b2"	# used for alpha/beta releases. Example: "a1", "b2", etc.
 
 ###########################################################################################
 # Command line options
@@ -123,13 +123,13 @@ o.Add(
 o.Add(
 	"BOOST_INCLUDE_PATH",
 	"The path to the boost include directory.",
-	"/usr/local/include/boost-1_34_1",
+	"/usr/include",
 )
 
 o.Add(
 	"BOOST_LIB_PATH",
 	"The path to the boost library directory.",
-	"/usr/local/lib",
+	"/usr/lib",
 )
 
 o.Add(
@@ -145,13 +145,13 @@ o.Add(
 o.Add(
 	"OPENEXR_INCLUDE_PATH",
 	"The path to the OpenEXR include directory.",
-	"/usr/local/include/OpenEXR",
+	"/usr/include/OpenEXR",
 )
 
 o.Add(
 	"OPENEXR_LIB_PATH",
 	"The path to the OpenEXR lib directory.",
-	"/usr/local/lib",
+	"/usr/lib",
 )
 
 o.Add(
@@ -227,7 +227,7 @@ o.Add(
 o.Add(
 	"FREETYPE_INCLUDE_PATH",
 	"The path to the FreeType include directory.",
-	"/usr/local/include/freetype2",
+	"/usr/include/freetype2",
 )
 
 o.Add(
@@ -481,6 +481,20 @@ o.Add(
 	"",
 )
 
+# appleseed options
+
+o.Add(
+	"APPLESEED_INCLUDE_PATH",
+	"The path to the appleseed include directory.",
+	"/usr/local/appleseed/include",
+)
+
+o.Add(
+	"APPLESEED_LIB_PATH",
+	"The path to the appleseed lib directory.",
+	"/usr/local/appleseed/lib",
+)
+
 # Build options
 
 o.Add(
@@ -591,6 +605,14 @@ o.Add(
 	"$INSTALL_PREFIX/lib/$IECORE_NAME",
 )
 
+o.Add(
+	"INSTALL_APPLESEEDLIB_NAME",
+	"The name under which to install the appleseed libraries. This "
+	"can be used to build and install the library for multiple "
+	"appleseed versions.",
+	"$INSTALL_PREFIX/lib/$IECORE_NAME",
+)
+
 o.Add(
 	"INSTALL_PYTHON_DIR",
 	"The directory in which to install python modules.",
@@ -711,6 +733,12 @@ o.Add(
 	"$INSTALL_PREFIX/mtoaExtensions/$IECORE_NAME",
 )
 
+o.Add(
+	"INSTALL_APPLESEEDOUTPUTDRIVER_NAME",
+	"The name under which to install the appleseed output driver.",
+	"$INSTALL_PREFIX/appleseedDisplays/$IECORE_NAME",
+)
+
 o.Add(
 	"INSTALL_DOC_DIR",
 	"The directory in which to install the documentation.",
@@ -738,8 +766,6 @@ o.Add(
 		( "IECore.RenamePrimitiveVariables", "common/primitive/renameVariables" ), 
 		( "IECore.PointsExpressionOp", "common/primitive/pointsExpression" ),
 		( "IECore.ClassLsOp", "common/classes/classLs" ), 
-		( "IECore.FileDependenciesOp", "common/fileSystem/depLs" ), 
-		( "IECore.CheckFileDependenciesOp", "common/fileSystem/depCheck" ), 
 		( "IECore.LsHeaderOp", "common/fileSystem/lsHeader" ),
 		( "IECore.SearchReplaceOp", "common/fileSystem/searchReplace" ),
 		( "IECore.CheckImagesOp", "common/fileSystem/checkImages" ),
@@ -934,6 +960,14 @@ o.Add(
 	"contrib/IECoreAlembic/test/IECoreAlembic/All.py"
 )
 
+o.Add(
+	"TEST_APPLESEED_SCRIPT",
+	"The python script to run for the appleseed tests. The default will run all the tests, "
+	"but it can be useful to override this to run just the test for the functionality "
+	"you're working on.",
+	"contrib/IECoreAppleseed/test/IECoreAppleseed/All.py"
+)
+
 o.Add(
 	"TEST_LIBPATH",
 	"Additional colon separated paths to be prepended to the library path"
@@ -1447,16 +1481,6 @@ if doConfigure :
 			e.Append( CPPFLAGS = '-DIECORE_WITH_BOOSTFACTORIAL' )
 	else :
 		sys.stderr.write( "WARNING: boost/math/special_functions/factorials.hpp not found, some functionality will be disabled.\n" )
-		coreSources.remove( "src/IECore/AssociatedLegendre.cpp" )
-		coreSources.remove( "src/IECore/SphericalHarmonics.cpp" )
-		coreSources.remove( "src/IECore/SphericalHarmonicsTensor.cpp" )
-		coreSources.remove( "src/IECore/SphericalHarmonicsRotationMatrix.cpp" )
-		coreSources.remove( "src/IECore/SphericalHarmonicsTransferMatrix.cpp" )
-		coreSources.remove( "src/IECore/SphericalHarmonicsProjector.cpp" )
-		coreSources.remove( "src/IECore/EnvMapSHProjector.cpp" )
-		coreSources.remove( "src/IECore/ImageConvolveOp.cpp" )
-		corePythonSources.remove( "src/IECorePython/EnvMapSHProjectorBinding.cpp" )
-		corePythonSources.remove( "src/IECorePython/ImageConvolveOpBinding.cpp" )
 
 	if c.CheckHeader( "OpenEXR/ImfDeepFrameBuffer.h", "\"\"", "C++" ) :
 		for e in allCoreEnvs :
@@ -3124,6 +3148,140 @@ if doConfigure :
 			alembicTestEnv.Depends( arnoldTest, glob.glob( "contrib/IECoreAlembic/test/IECoreAlembic/*.py" ) )
 		alembicTestEnv.Alias( "testAlembic", alembicTest )
 
+###########################################################################################
+# Build, install and test the IECoreAppleseed library and bindings
+###########################################################################################
+
+appleseedEnv = coreEnv.Clone( IECORE_NAME = "IECoreAppleseed" )
+appleseedEnv.Append(
+	CXXFLAGS = [
+		"-isystem", "$APPLESEED_INCLUDE_PATH",
+	],
+	CPPPATH = [
+		"contrib/IECoreAppleseed/include",
+	],
+	CPPFLAGS = [
+		"-DAPPLESEED_ENABLE_IMATH_INTEROP",
+		"-DAPPLESEED_WITH_OSL",
+		"-DAPPLESEED_USE_SSE",
+	]
+)
+appleseedEnv.Append( LIBPATH = [ "$APPLESEED_LIB_PATH" ] )
+
+appleseedPythonModuleEnv = pythonModuleEnv.Clone( IECORE_NAME = "IECoreAppleseed" )
+appleseedPythonModuleEnv.Append(
+	CXXFLAGS = [
+		"-isystem", "$APPLESEED_INCLUDE_PATH",
+	],
+	CPPPATH = [
+		"contrib/IECoreAppleseed/include",
+		"contrib/IECoreAppleseed/include/bindings",
+	],
+	CPPFLAGS = [
+		"-DAPPLESEED_ENABLE_IMATH_INTEROP",
+		"-DAPPLESEED_WITH_OSL",
+		"-DAPPLESEED_USE_SSE",
+	],
+	LIBPATH = [
+		"$APPLESEED_LIB_PATH",
+	],
+)
+
+
+appleseedDriverEnv = appleseedEnv.Clone( IECORE_NAME = "ieDisplay" )
+appleseedDriverEnv["SHLIBPREFIX"] = ""
+appleseedDriverEnv["SHLIBSUFFIX"] = ".so"
+
+haveAppleseed = False
+
+if doConfigure :
+
+	c = Configure( appleseedEnv )
+
+	if not c.CheckLibWithHeader( "appleseed", "renderer/api/rendering.h", "CXX" ) :
+
+		sys.stderr.write( "WARNING : no appleseed library found, not building IECoreAppleseed - check APPLESEED_INCLUDE_PATH and APPLESEED_LIB_PATH.\n" )
+		c.Finish()
+
+	else :
+
+		haveAppleseed = True
+
+		appleseedSources = sorted( glob.glob( "contrib/IECoreAppleseed/src/IECoreAppleseed/*.cpp" ) )
+		appleseedHeaders = glob.glob( "contrib/IECoreAppleseed/include/IECoreAppleseed/*.h" ) + glob.glob( "contrib/IECoreAppleseed/include/IECoreAppleseed/*.inl" )
+		appleseedPythonSources = sorted( glob.glob( "contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/*.cpp" ) )
+		appleseedPythonScripts = glob.glob( "contrib/IECoreAppleseed/python/IECoreAppleseed/*.py" )
+
+		c.Finish()
+
+		# we can't append this before configuring, as then it gets built as
+		# part of the configure process
+		appleseedEnv.Append( LIBS = os.path.basename( coreEnv.subst( "$INSTALL_LIB_NAME" ) ) )
+		appleseedPythonModuleEnv.Append( LIBS = os.path.basename( corePythonEnv.subst( "$INSTALL_PYTHONLIB_NAME" ) ) )
+
+		appleseedDriverEnv.Append(
+			LIBS = [
+				"appleseed",
+				os.path.basename( coreEnv.subst( "$INSTALL_LIB_NAME" ) ),
+				os.path.basename( appleseedEnv.subst( "$INSTALL_LIB_NAME" ) ),
+			]
+		)
+
+		# library
+		appleseedLibrary = appleseedEnv.SharedLibrary( "lib/" + os.path.basename( appleseedEnv.subst( "$INSTALL_APPLESEEDLIB_NAME" ) ), appleseedSources )
+		appleseedLibraryInstall = appleseedEnv.Install( os.path.dirname( appleseedEnv.subst( "$INSTALL_APPLESEEDLIB_NAME" ) ), appleseedLibrary )
+		appleseedEnv.NoCache( appleseedLibraryInstall )
+		appleseedEnv.AddPostAction( appleseedLibraryInstall, lambda target, source, env : makeLibSymLinks( appleseedEnv ) )
+		appleseedEnv.Alias( "install", appleseedLibraryInstall )
+		appleseedEnv.Alias( "installAppleseed", appleseedLibraryInstall )
+		appleseedEnv.Alias( "installLib", [ appleseedLibraryInstall ] )
+
+		# headers
+		appleseedHeaderInstall = appleseedEnv.Install( "$INSTALL_HEADER_DIR/IECoreAppleseed", appleseedHeaders )
+		appleseedEnv.AddPostAction( "$INSTALL_HEADER_DIR/IECoreAppleseed", lambda target, source, env : makeSymLinks( appleseedEnv, appleseedEnv["INSTALL_HEADER_DIR"] ) )
+		appleseedEnv.Alias( "install", appleseedHeaderInstall )
+		appleseedEnv.Alias( "installAppleseed", appleseedHeaderInstall )
+
+		# python module
+		appleseedPythonModuleEnv.Append(
+			LIBS = [
+				os.path.basename( coreEnv.subst( "$INSTALL_LIB_NAME" ) ),
+				os.path.basename( appleseedEnv.subst( "$INSTALL_LIB_NAME" ) ),
+				"appleseed",
+			]
+		)
+		appleseedPythonModule = appleseedPythonModuleEnv.SharedLibrary( "contrib/IECoreAppleseed/python/IECoreAppleseed/_IECoreAppleseed", appleseedPythonSources )
+		appleseedPythonModuleEnv.Depends( appleseedPythonModule, appleseedLibrary )
+
+		appleseedPythonModuleInstall = appleseedPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreAppleseed", appleseedPythonScripts + appleseedPythonModule )
+		appleseedPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreAppleseed", lambda target, source, env : makeSymLinks( appleseedPythonModuleEnv, appleseedPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
+		appleseedPythonModuleEnv.Alias( "install", appleseedPythonModuleInstall )
+		appleseedPythonModuleEnv.Alias( "installAppleseed", appleseedPythonModuleInstall )
+
+
+		# output driver
+		appleseedDriver = appleseedDriverEnv.SharedLibrary( "contrib/IECoreAppleseed/src/IECoreAppleseed/outputDriver/" + os.path.basename( appleseedDriverEnv.subst( "$INSTALL_APPLESEEDOUTPUTDRIVER_NAME" ) ), "contrib/IECoreAppleseed/src/IECoreAppleseed/outputDriver/DisplayTileCallback.cpp" )
+		appleseedDriverInstall = appleseedDriverEnv.Install( os.path.dirname( appleseedDriverEnv.subst( "$INSTALL_APPLESEEDOUTPUTDRIVER_NAME" ) ), appleseedDriver )
+		appleseedDriverEnv.NoCache( appleseedDriverInstall )
+		appleseedDriverEnv.AddPostAction( appleseedDriverInstall, lambda target, source, env : makeLibSymLinks( appleseedDriverEnv, libNameVar="INSTALL_APPLESEEDOUTPUTDRIVER_NAME" ) )
+		appleseedDriverEnv.Alias( "install", appleseedDriverInstall )
+		appleseedDriverEnv.Alias( "installAppleseed", appleseedDriverInstall )
+		appleseedDriverForTest = appleseedDriverEnv.Command( "contrib/IECoreAppleseed/test/IECoreAppleseed/plugins/ieOutputDriver.so", appleseedDriver, Copy( "$TARGET", "$SOURCE" ) )
+
+		Default( [ appleseedLibrary, appleseedPythonModule, appleseedDriver, appleseedDriverForTest ] )
+
+		# tests
+		appleseedTestEnv = testEnv.Clone()
+		appleseedTestEnv["ENV"]["PYTHONPATH"] += ":./contrib/IECoreAppleseed/python"
+		appleseedTestEnv["ENV"][testEnv["TEST_LIBRARY_PATH_ENV_VAR"]] += ":" + appleseedEnv.subst( ":".join( appleseedPythonModuleEnv["LIBPATH"] ) )
+		appleseedTestEnv["ENV"]["PATH"] = appleseedEnv.subst( "$APPLESEED_ROOT/bin" ) + ":" + appleseedTestEnv["ENV"]["PATH"]
+		appleseedTestEnv["ENV"]["APPLESEED_PLUGIN_PATH"] = "contrib/IECoreAppleseed/test/IECoreAppleseed/plugins"
+		appleseedTest = appleseedTestEnv.Command( "contrib/IECoreAppleseed/test/IECoreAppleseed/results.txt", appleseedPythonModule, pythonExecutable + " $TEST_APPLESEED_SCRIPT" )
+		NoCache( appleseedTest )
+		appleseedTestEnv.Depends( appleseedTest, [ appleseedPythonModule + appleseedDriverForTest ] )
+		appleseedTestEnv.Depends( appleseedTest, glob.glob( "contrib/IECoreAppleseed/test/IECoreAppleseed/*.py" ) )
+		appleseedTestEnv.Alias( "testAppleseed", appleseedTest )
+
 ###########################################################################################
 # Documentation
 ###########################################################################################