Merge pull request #5758 from MrPetru/EL9_build_fixes

Remove the platform check and use the one from the current environment.
GafferHQ · Apr 3, 2024 · 4beed22 · 4beed22
2 parents 2fe0423 + a92ecf7
commit 4beed22
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 38 deletions.
diff --git a/SConstruct b/SConstruct
@@ -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()
 

diff --git a/config/ie/installAll b/config/ie/installAll
@@ -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 ),
+				] )