framewave-python-tabs.patch

   1 --- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py.orig 2023-03-14 17:17:16.999765487 +0100
   2 +++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py      2023-03-14 17:19:47.165472173 +0100
   3 @@ -46,7 +46,7 @@ class fwBuildRoot:
   4  \r
   5  \r
   6          if self.dctFwVars['thread'] == 'systemboost':\r
   7 -               self.dctFwVars['thread'] = 'boost_thread-mt'\r
   8 +            self.dctFwVars['thread'] = 'boost_thread-mt'\r
   9  \r
  10          # Set correct default wincrt\r
  11          if self.dctFwVars['wincrt'] == '---':\r
  12 @@ -91,13 +91,13 @@ class fwBuildRoot:
  13          curEnviron = createEnviron()\r
  14          self.oEnv = Environment( CCFLAGS = self.dctFwVars['CCFLAGS'] , toolpath=buildtoolspath, tools=buildtools, ENV=curEnviron, FWVARS=self.dctFwVars )\r
  15  \r
  16 -               # fixup paths back to what they were before scons messed them up [BUGBUG: SCons issue, this is the workaround]\r
  17 +        # fixup paths back to what they were before scons messed them up [BUGBUG: SCons issue, this is the workaround]\r
  18          if ((sys.platform=='win32') and (self.dctFwVars['bitness']!='32')):\r
  19 -                       self.oEnv['ENV'] = curEnviron\r
  20 +            self.oEnv['ENV'] = curEnviron\r
  21  \r
  22      def subProject(self, sProjectName, lstDependencies = None, altProjectDir = None, libtypeOverride = None):\r
  23 -       if altProjectDir == None: pthProjectDir = join( self.dctFwVars['pthProjectRoot'], sProjectName )\r
  24 -       else:                     pthProjectDir = altProjectDir\r
  25 +        if altProjectDir == None: pthProjectDir = join( self.dctFwVars['pthProjectRoot'], sProjectName )\r
  26 +        else:                     pthProjectDir = altProjectDir\r
  27  \r
  28          libtype = self.dctFwVars['libtype']\r
  29          if libtypeOverride:\r
  30 @@ -105,20 +105,20 @@ class fwBuildRoot:
  31              self.dctFwVars['libtypeOverride'+sProjectName] = libtypeOverride\r
  32  \r
  33          pthBuildDir = join( self.dctFwVars['pthScratch'],    \\r
  34 -                                                       sProjectName + "_" +              \\r
  35 -                                                       self.dctFwVars['variant'] + "_" +\\r
  36 -                                                       libtype + "_" +                   \\r
  37 -                                                       self.dctFwVars['bitness'] )\r
  38 +                            sProjectName + "_" +              \\r
  39 +                            self.dctFwVars['variant'] + "_" +\\r
  40 +                            libtype + "_" +                   \\r
  41 +                            self.dctFwVars['bitness'] )\r
  42  \r
  43          self.dctFwVars[sProjectName+'BuildDir'] = pthBuildDir\r
  44          self.oEnv['FWVARS'] = self.dctFwVars  # in case of changes to the internal dictionary\r
  45 -       oProject = self.oEnv.SConscript( join( pthProjectDir, sProjectName+'.sconscript' ),\\r
  46 +        oProject = self.oEnv.SConscript( join( pthProjectDir, sProjectName+'.sconscript' ),\\r
  47                                           src_dir = pthProjectDir,\\r
  48                                           variant_dir = pthBuildDir,\\r
  49                                           duplicate = 0 )\r
  50 -       if lstDependencies != None:\r
  51 -               for dep in lstDependencies:\r
  52 -                       self.oEnv.Depends( oProject, dep )\r
  53 +        if lstDependencies != None:\r
  54 +            for dep in lstDependencies:\r
  55 +                self.oEnv.Depends( oProject, dep )\r
  56  \r
  57          return oProject\r
  58  \r
  59 @@ -172,7 +172,7 @@ class fwProject():
  60                      PROJECTNAMEU = self.dctFwVars['sProjectName'].upper(), \\r
  61                      BUILDDIR     = self.dctFwVars['pthBuildDir'],\\r
  62                      BITNESS      = self.dctFwVars['bitness'],\\r
  63 -                                       PROJECTDIR   = self.dctFwVars['pthProjectDir'])\r
  64 +                    PROJECTDIR   = self.dctFwVars['pthProjectDir'])\r
  65  \r
  66  \r
  67      def initBuildObjects(self, lstExtraCPPs = None, lstDepends = None, lstDependPaths = None, pthSrcDir=None):\r
  68 @@ -260,7 +260,7 @@ class fwProject():
  69  \r
  70          # BUGBUG: <one last hack; can't get rid of this for a bit>\r
  71          if (self.dctFwVars['toolset'] == 'suncc') and (self.dctFwVars['sProjectName'] == 'fwImage'):\r
  72 -               pthBuildHFile = appendToFilename(pthBuildHFile, '_sol')\r
  73 +            pthBuildHFile = appendToFilename(pthBuildHFile, '_sol')\r
  74          # </one last hack>\r
  75  \r
  76          dctFunctions = constructMultipassCPP( self.dctFwVars['pthProjectDir'],          \\r
  77 @@ -365,10 +365,10 @@ def createDefFile ( pthDevLabRoot, pthPr
  78      #os.system( sCommandStr )\r
  79  \r
  80      if win_sys == 0 and isfile(exe_name_path):\r
  81 -       os.system('chmod 755 ' + exe_name_path)\r
  82 +        os.system('chmod 755 ' + exe_name_path)\r
  83  \r
  84      if isfile(exe_name_path):\r
  85 -       os.system( sCommandStr )\r
  86 +        os.system( sCommandStr )\r
  87  \r
  88      def_file_path = join(pthProjectRoot,sProjectName,sProjectName + '.def')\r
  89      if win_sys == 0 and isfile(def_file_path) :\r
  90 --- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwutil.py.orig  2009-07-09 11:16:55.000000000 +0200
  91 +++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwutil.py       2023-03-14 17:45:45.643343147 +0100
  92 @@ -71,8 +71,8 @@ def setupIncludePaths ( oEnv, pthStartPa
  93  \r
  94  def createEnviron ():\r
  95      # Do any environment modifications here\r
  96 -       oEnviron = os.environ\r
  97 -       return oEnviron\r
  98 +    oEnviron = os.environ\r
  99 +    return oEnviron\r
 100  \r
 101  def src2obj( pth ):\r
 102      pthRootDir, sRootName = split(pth)\r
 103 @@ -84,14 +84,14 @@ def src2obj( pth ):
 104  \r
 105  def buildPath( pthBuildRoot ):\r
 106      return join( pthBuildRoot,\\r
 107 -                                ARGUMENTS.get('variant','debug')  + "_" +\\r
 108 -                                ARGUMENTS.get('libtype','shared') + "_" +\\r
 109 -                                ARGUMENTS.get('bitness','32') )\r
 110 +                 ARGUMENTS.get('variant','debug')  + "_" +\\r
 111 +                 ARGUMENTS.get('libtype','shared') + "_" +\\r
 112 +                 ARGUMENTS.get('bitness','32') )\r
 113  \r
 114  \r
 115  def turnOnZi( oEnv ):\r
 116 -       import SCons.Util\r
 117 -       oEnv['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Gm /ZI /Fd%s" % File(PDB)) or ""}'])\r
 118 +    import SCons.Util\r
 119 +    oEnv['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Gm /ZI /Fd%s" % File(PDB)) or ""}'])\r
 120  \r
 121  def fixLinuxSharedLib( target = None, source = None, env = None ):\r
 122      if target:\r