@@ -108,43 +108,46 @@ def installDocs() :
108108# Loop over all builds
109109##########################################################################
110110
111+ compilerVersions = IEBuild.utils.versionsToInstall( "gcc" )
112+ pythonVersions = IEBuild.utils.versionsToInstall( "python" )
113+ appleseedVersions = IEBuild.utils.versionsToInstall( "appleseed" )
114+ mayaVersions = IEBuild.utils.versionsToInstall( "maya" )
115+ nukeVersions = IEBuild.utils.versionsToInstall( "nuke" )
116+ houdiniVersions = IEBuild.utils.versionsToInstall( "houdini" )
117+ rvVersions = IEBuild.utils.versionsToInstall( "rv" )
118+
111119if platform in ( "cent7.x86_64", ) :
112120
113- for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]) :
114- for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
121+ for compilerVersion in compilerVersions :
122+ for pythonVersion in pythonVersions :
115123 build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION=UNDEFINED" ] )
116124
117- for dlVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["3delight"] ):
118- for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]):
119- for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
120- build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION="+dlVersion ] )
121-
122- appleseedCompilerMap = { x : [] for x in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]) }
123- for appleseedVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ):
125+ appleseedCompilerMap = { x : [] for x in compilerVersions }
126+ for appleseedVersion in appleseedVersions:
124127 compilerVersion = IEEnv.registry["apps"]["appleseed"][appleseedVersion][platform]["compilerVersion"]
125128 appleseedCompilerMap[compilerVersion].append( appleseedVersion )
126- for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
129+ for pythonVersion in pythonVersions :
127130 build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "APPLESEED_VERSION="+appleseedVersion, "DL_VERSION=UNDEFINED" ] )
128131 for appleseedCompiler, versions in appleseedCompilerMap.items() :
129132 if len(versions) == 0 :
130133 appleseedCompilerMap[appleseedCompiler].append( "UNDEFINED" )
131134
132- for mayaVersion in IEEnv.activeAppVersions( "maya" ) :
135+ for mayaVersion in mayaVersions :
133136 compilerVersion = IEEnv.registry["apps"]["maya"][mayaVersion][platform]["compilerVersion"]
134- appleseedVersion = appleseedCompilerMap.get( compilerVersion, IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ) )[-1]
137+ appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
135138 build( [ "APP=maya", "APP_VERSION="+mayaVersion, "APPLESEED_VERSION={0}".format(appleseedVersion)] )
136139
137- for nukeVersion in IEEnv.activeAppVersions( "nuke" ) :
140+ for nukeVersion in nukeVersions :
138141 compilerVersion = IEEnv.registry["apps"]["nuke"][nukeVersion][platform]["compilerVersion"]
139- appleseedVersion = appleseedCompilerMap.get( compilerVersion, IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ) )[-1]
142+ appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
140143 build( [ "APP=nuke", "APP_VERSION="+nukeVersion, "APPLESEED_VERSION={0}".format(appleseedVersion) ] )
141144
142- for houdiniVersion in IEEnv.activeAppVersions( "houdini" ) :
145+ for houdiniVersion in houdiniVersions :
143146 compilerVersion = IEEnv.registry["apps"]["houdini"][houdiniVersion][platform]["compilerVersion"]
144- appleseedVersion = appleseedCompilerMap.get( compilerVersion, IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ) )[-1]
147+ appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
145148 build( [ "APP=houdini", "APP_VERSION="+houdiniVersion, "APPLESEED_VERSION={0}".format(appleseedVersion) ] )
146149
147- for rvVersion in IEEnv.activeAppVersions( "rv" ) :
150+ for rvVersion in rvVersions :
148151 build( [ "APP=rv", "APP_VERSION="+rvVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION=UNDEFINED" ] )
149152
150153 installDocs()
0 commit comments