framewave-scons.patch

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