- updated patches set for python 3/scons 4

[packages/framewave.git] / framewave-scons.patch

--- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py.orig	2020-08-16 21:42:10.972877391 +0200
+++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py	2020-08-21 22:07:28.111946704 +0200
@@ -114,7 +114,7 @@
         self.oEnv['FWVARS'] = self.dctFwVars  # in case of changes to the internal dictionary\r
     	oProject = self.oEnv.SConscript( join( pthProjectDir, sProjectName+'.sconscript' ),\\r
                                          src_dir = pthProjectDir,\\r
-                                         build_dir = pthBuildDir,\\r
+                                         variant_dir = pthBuildDir,\\r
                                          duplicate = 0 )\r
     	if lstDependencies != None:\r
     		for dep in lstDependencies:\r
--- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwutil.py.orig	2023-03-14 18:13:43.493122918 +0100
+++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwutil.py	2023-03-14 18:15:01.991235213 +0100
@@ -58,7 +58,7 @@ def setupIncludePaths ( oEnv, pthStartPa
     else:           lstAllHeaders = (os.path.dirname(f) for f in globtree(join( pthStartPath, "*.h" )))\r
 \r
     lstIncludes = []\r
-    if oEnv.has_key('CPPPATH'):\r
+    if 'CPPPATH' in oEnv:\r
         if ('#/'+pthStartPath) not in oEnv['CPPPATH']: lstIncludes = ['#/'+pthStartPath]\r
     else:\r
         oEnv.Append( CPPPATH= ['#/'+pthStartPath])\r