IE config : Remove IECoreAppleseed

Author: murraystevenson

config/ie/buildAll

@@ -110,7 +110,6 @@ def installDocs() :
 
 compilerVersions = IEBuild.utils.versionsToInstall( "gcc" )
 pythonVersions = IEBuild.utils.versionsToInstall( "python" )
-appleseedVersions = IEBuild.utils.versionsToInstall( "appleseed" )
 mayaVersions = IEBuild.utils.versionsToInstall( "maya" )
 nukeVersions = IEBuild.utils.versionsToInstall( "nuke" )
 houdiniVersions = IEBuild.utils.versionsToInstall( "houdini" )
@@ -120,35 +119,22 @@ if platform in ( "cent7.x86_64", ) :
 
 	for compilerVersion in compilerVersions:
 		for pythonVersion in pythonVersions :
-			build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION=UNDEFINED" ] )
-
-	appleseedCompilerMap = { x : [] for x in compilerVersions }
-	for appleseedVersion in appleseedVersions:
-		compilerVersion = IEEnv.registry["apps"]["appleseed"][appleseedVersion][platform]["compilerVersion"]
-		appleseedCompilerMap[compilerVersion].append( appleseedVersion )
-		for pythonVersion in pythonVersions :
-			build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "APPLESEED_VERSION="+appleseedVersion, "DL_VERSION=UNDEFINED" ] )
-	for appleseedCompiler, versions in appleseedCompilerMap.items() :
-		if len(versions) == 0 :
-			appleseedCompilerMap[appleseedCompiler].append( "UNDEFINED" )
+			build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "DL_VERSION=UNDEFINED" ] )
 
 	for mayaVersion in mayaVersions :
 		compilerVersion = IEEnv.registry["apps"]["maya"][mayaVersion][platform]["compilerVersion"]
-		appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
-		build( [ "APP=maya", "APP_VERSION="+mayaVersion, "APPLESEED_VERSION={0}".format(appleseedVersion)] )
+		build( [ "APP=maya", "APP_VERSION="+mayaVersion ] )
 
 	for nukeVersion in nukeVersions :
 		compilerVersion = IEEnv.registry["apps"]["nuke"][nukeVersion][platform]["compilerVersion"]
-		appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
-		build( [ "APP=nuke", "APP_VERSION="+nukeVersion, "APPLESEED_VERSION={0}".format(appleseedVersion) ] )
+		build( [ "APP=nuke", "APP_VERSION="+nukeVersion ] )
 
 	for houdiniVersion in houdiniVersions :
 		compilerVersion = IEEnv.registry["apps"]["houdini"][houdiniVersion][platform]["compilerVersion"]
-		appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
-		build( [ "APP=houdini", "APP_VERSION="+houdiniVersion, "APPLESEED_VERSION={0}".format(appleseedVersion) ] )
+		build( [ "APP=houdini", "APP_VERSION="+houdiniVersion ] )
 
 	for rvVersion in rvVersions :
-		build( [ "APP=rv", "APP_VERSION="+rvVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION=UNDEFINED" ] )
+		build( [ "APP=rv", "APP_VERSION="+rvVersion, "DL_VERSION=UNDEFINED" ] )
 
 	installDocs()
 

config/ie/options

@@ -248,23 +248,6 @@ if targetApp :
 	else:
 		appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion )
 
-appleseedReg = None
-appleseedVersion = getOption( "APPLESEED_VERSION", os.environ.get("APPLESEED_VERSION", "") )
-try :
-	appleseedReg = IEEnv.registry["apps"]["appleseed"][appleseedVersion][platform]
-except :
-	pass
-
-if appleseedReg :
-
-	APPLESEED_INCLUDE_PATH = os.path.join( appleseedReg["location"], "include" )
-	APPLESEED_LIB_PATH = os.path.join( appleseedReg["location"], "lib" )
-
-	oslVersion = appleseedReg.get( "OpenShadingLanguageVersion", cortexReg["OpenShadingLanguageVersion"] )
-	oslRoot = os.path.join( "/software", "apps", "OpenShadingLanguage", oslVersion, platform, compiler, compilerVersion )
-	OSL_INCLUDE_PATH = os.path.join( oslRoot, "include" )
-	OSL_LIB_PATH = os.path.join( oslRoot, "lib" )
-
 # ask for opengl support
 WITH_GL=1
 
@@ -464,8 +447,7 @@ testLibs = [
 	os.path.join( pythonReg["location"], compiler, compilerVersion, "lib" ),
 	os.path.join( compilerReg["location"], "lib" ),
 ]
-if appleseedReg :
-	testLibs.extend( [ APPLESEED_LIB_PATH, OSL_LIB_PATH, OIIO_LIB_PATH ] )
+
 TEST_LIBPATH = ":".join( testLibs )
 TEST_LIBRARY_PATH_ENV_VAR = "IEENV_LIBRARY_PREFIX_PATH"
 
@@ -480,18 +462,14 @@ if targetApp :
 	INSTALL_LIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_PYTHONLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION-python$PYTHON_VERSION" )
 	INSTALL_PYTHON_DIR = os.path.join( appPrefix, "python" )
-	INSTALL_APPLESEEDLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_ALEMBICLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_USDLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
-	INSTALL_APPLESEEDOUTPUTDRIVER_NAME = os.path.join( "tmp", os.environ['USER'], "unwantedAppleseedDrivers/$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 else :
 	INSTALL_HEADER_DIR = os.path.join( basePrefix, "include" )
 	INSTALL_USD_RESOURCE_DIR = os.path.join( basePrefix, "resource" )
 	INSTALL_LIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_PYTHONLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION-python$PYTHON_VERSION" )
 	INSTALL_PYTHON_DIR = os.path.join( basePrefix, "python", pythonVersion, compiler, compilerVersion )
-	INSTALL_APPLESEEDLIB_NAME = os.path.join( basePrefix, "appleseed", appleseedVersion, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
-	INSTALL_APPLESEEDOUTPUTDRIVER_NAME = os.path.join( basePrefix, "appleseed", appleseedVersion, "plugins", compiler, compilerVersion, "$IECORE_NAME" )
 	INSTALL_ALEMBICLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
 	INSTALL_USDLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )