Skip to content

config/ie/buildAll : Allow for version overrides from command arguments #1317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanimanishi merged 4 commits into from
Dec 19, 2022
Merged

config/ie/buildAll : Allow for version overrides from command arguments #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e78fde2
config/ie : Use latest IEBuild
ivanimanishi Dec 19, 2022
0d1f6b9
config/ie/buildAll : Do not lock to a specific python version
ivanimanishi Dec 19, 2022
8cc7a13
config/ie/buildAll : Small fix when running DRYRUN=1
ivanimanishi Dec 19, 2022
6b1fb5a
config/ie/buildAll : Allow for version overrides from command arguments
ivanimanishi Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions config/ie/buildAll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
#!/usr/bin/env iePython2.7
#!/usr/bin/env iePython

import IEEnv
import subprocess
import sys
import os
import os.path
import shutil
import VersionControl
VersionControl.setVersion( "IEBuild" )
import IEBuild

##########################################################################
# parse SConstruct file for the cortex version
Expand Down Expand Up @@ -92,51 +95,59 @@ def installDocs() :
buildArgs = [ "INSTALL_PREFIX=/software" ]
buildArgs.extend( sysArgs )

if subprocess.call( [ "scons", "installDoc" ] + buildArgs ) != 0 :
cmd = [ "scons", "installDoc" ]
print( " ".join( cmd + buildArgs ) )
if "DRYRUN=1" in sysArgs :
return

if subprocess.call( cmd + buildArgs ) != 0 :

raise RuntimeError("Error : scons installDoc " + str( " ".join( buildArgs ) ) )

##########################################################################
# Loop over all builds
##########################################################################

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" )
rvVersions = IEBuild.utils.versionsToInstall( "rv" )

if platform in ( "cent7.x86_64", ) :

for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]):
for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
for compilerVersion in compilerVersions:
for pythonVersion in pythonVersions :
build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION=UNDEFINED" ] )

for dlVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["3delight"] ):
for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]):
for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
build( [ "COMPILER_VERSION="+compilerVersion, "PYTHON_VERSION="+pythonVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION="+dlVersion ] )

appleseedCompilerMap = { x : [] for x in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]) }
for appleseedVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ):
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 IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
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" )

for mayaVersion in IEEnv.activeAppVersions( "maya" ) :
for mayaVersion in mayaVersions :
compilerVersion = IEEnv.registry["apps"]["maya"][mayaVersion][platform]["compilerVersion"]
appleseedVersion = appleseedCompilerMap.get( compilerVersion, IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ) )[-1]
appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
build( [ "APP=maya", "APP_VERSION="+mayaVersion, "APPLESEED_VERSION={0}".format(appleseedVersion)] )

for nukeVersion in IEEnv.activeAppVersions( "nuke" ) :
for nukeVersion in nukeVersions :
compilerVersion = IEEnv.registry["apps"]["nuke"][nukeVersion][platform]["compilerVersion"]
appleseedVersion = appleseedCompilerMap.get( compilerVersion, IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ) )[-1]
appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
build( [ "APP=nuke", "APP_VERSION="+nukeVersion, "APPLESEED_VERSION={0}".format(appleseedVersion) ] )

for houdiniVersion in IEEnv.activeAppVersions( "houdini" ) :
for houdiniVersion in houdiniVersions :
compilerVersion = IEEnv.registry["apps"]["houdini"][houdiniVersion][platform]["compilerVersion"]
appleseedVersion = appleseedCompilerMap.get( compilerVersion, IEEnv.activeVersions( IEEnv.registry["apps"]["appleseed"] ) )[-1]
appleseedVersion = appleseedCompilerMap.get( compilerVersion, appleseedVersions )[-1]
build( [ "APP=houdini", "APP_VERSION="+houdiniVersion, "APPLESEED_VERSION={0}".format(appleseedVersion) ] )

for rvVersion in IEEnv.activeAppVersions( "rv" ) :
for rvVersion in rvVersions :
build( [ "APP=rv", "APP_VERSION="+rvVersion, "APPLESEED_VERSION=UNDEFINED", "DL_VERSION=UNDEFINED" ] )

installDocs()
Expand Down
2 changes: 1 addition & 1 deletion config/ie/postCoreImageInstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import sys

import VersionControl
VersionControl.setVersion('IEBuild', '7.1.0')
VersionControl.setVersion('IEBuild')
import IEBuild

IEBuild.Config(
Expand Down
2 changes: 1 addition & 1 deletion config/ie/postCoreMayaInstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import sys

import VersionControl
VersionControl.setVersion('IEBuild', '7.1.0')
VersionControl.setVersion('IEBuild')
import IEBuild

IEBuild.Config(
Expand Down
2 changes: 1 addition & 1 deletion config/ie/postCoreSceneInstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import sys

import VersionControl
VersionControl.setVersion('IEBuild', '7.1.0')
VersionControl.setVersion('IEBuild')
import IEBuild

IEBuild.Config(
Expand Down