Skip to content
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

Remove the platform check and use the one from the current environment. #5758

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Remove the platform check and use the one from the current environment. #5758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c487c3a
Install : don't check inkscape capabilities if disableGraphics is True
MrPetru Mar 22, 2024
a92ecf7
IE install : build Gaffer on and for current platform
MrPetru Mar 22, 2024
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
5 changes: 3 additions & 2 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,8 +722,9 @@ if not haveInkscape and env["INKSCAPE"] != "disableGraphics" :
sys.stderr.write( "ERROR : Inkscape not found. Check INKSCAPE build variable.\n" )
Exit( 1 )

inkscapeHelp = subprocess.check_output( [ env["INKSCAPE"], "--help" ], universal_newlines=True )
env["INKSCAPE_USE_EXPORT_FILENAME"] = True if "--export-filename" in inkscapeHelp else False
if haveInkscape:
inkscapeHelp = subprocess.check_output( [ env["INKSCAPE"], "--help" ], universal_newlines=True )
env["INKSCAPE_USE_EXPORT_FILENAME"] = True if "--export-filename" in inkscapeHelp else False

haveSphinx = conf.checkSphinx()

Expand Down
66 changes: 30 additions & 36 deletions config/ie/installAll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,40 +145,34 @@ for app, minimumVersion in appInfos :
# Loop over all builds
##########################################################################

if platform in ( "cent7.x86_64" ) :

for cortexCompatibilityVersion, cortexReg in cortexInfo.items() :

# standalone builds
compilerVersion = cortexReg.get( "compilerVersion", defaultCompilerVersion )
appleseedVersion = appleseedCompilerMap[compilerVersion].get( cortexCompatibilityVersion, "UNDEFINED" )
baseArgs = [
"COMPILER_VERSION={}".format( compilerVersion ),
"CORTEX_VERSION={}".format( cortexCompatibilityVersion ),
"APPLESEED_VERSION={}".format( appleseedVersion ),
"DL_VERSION={}".format( dlVersion ),
]
for variant, variantInfo in variantReg.items() :
for cortexCompatibilityVersion, cortexReg in cortexInfo.items() :

# standalone builds
compilerVersion = cortexReg.get( "compilerVersion", defaultCompilerVersion )
appleseedVersion = appleseedCompilerMap[compilerVersion].get( cortexCompatibilityVersion, "UNDEFINED" )
baseArgs = [
"COMPILER_VERSION={}".format( compilerVersion ),
"CORTEX_VERSION={}".format( cortexCompatibilityVersion ),
"APPLESEED_VERSION={}".format( appleseedVersion ),
"DL_VERSION={}".format( dlVersion ),
]
for variant, variantInfo in variantReg.items() :
for arnoldVersion in arnoldVersions :
variantArgs = [ "GAFFER_BUILD_VARIANT={}".format( variant ) ] + [ "=".join( x ) for x in variantInfo.items() ]
arnoldArgs = [ "ARNOLD_VERSION={}".format( arnoldVersion ) ]
build( baseArgs + variantArgs + arnoldArgs )

# app specific builds
for app, appVersions in appVersionsDict.items() :
for appVersion in appVersions :
compilerVersion = IEEnv.registry["apps"][app][appVersion][platform]["compilerVersion"]
appleseedVersion = appleseedCompilerMap[compilerVersion].get( cortexCompatibilityVersion, "UNDEFINED" )
for arnoldVersion in arnoldVersions :
variantArgs = [ "GAFFER_BUILD_VARIANT={}".format( variant ) ] + [ "=".join( x ) for x in variantInfo.items() ]
arnoldArgs = [ "ARNOLD_VERSION={}".format( arnoldVersion ) ]
build( baseArgs + variantArgs + arnoldArgs )

# app specific builds
for app, appVersions in appVersionsDict.items() :
for appVersion in appVersions :
compilerVersion = IEEnv.registry["apps"][app][appVersion][platform]["compilerVersion"]
appleseedVersion = appleseedCompilerMap[compilerVersion].get( cortexCompatibilityVersion, "UNDEFINED" )
for arnoldVersion in arnoldVersions :
build( [
"APP={}".format( app ),
"APP_VERSION={}".format( appVersion ),
"CORTEX_VERSION={}".format( cortexCompatibilityVersion ),
"APPLESEED_VERSION={}".format( appleseedVersion ),
"ARNOLD_VERSION={}".format( arnoldVersion ),
"DL_VERSION={}".format( dlVersion ),
] )

else :

raise RuntimeError( "Unknown platform" )
build( [
"APP={}".format( app ),
"APP_VERSION={}".format( appVersion ),
"CORTEX_VERSION={}".format( cortexCompatibilityVersion ),
"APPLESEED_VERSION={}".format( appleseedVersion ),
"ARNOLD_VERSION={}".format( arnoldVersion ),
"DL_VERSION={}".format( dlVersion ),
] )
Loading