--- /dev/null
+--- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py.orig 2023-03-14 17:17:16.999765487 +0100
++++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwbuild.py 2023-03-14 17:19:47.165472173 +0100
+@@ -46,7 +46,7 @@ class fwBuildRoot:
+ \r
+ \r
+ if self.dctFwVars['thread'] == 'systemboost':\r
+- self.dctFwVars['thread'] = 'boost_thread-mt'\r
++ self.dctFwVars['thread'] = 'boost_thread-mt'\r
+ \r
+ # Set correct default wincrt\r
+ if self.dctFwVars['wincrt'] == '---':\r
+@@ -91,13 +91,13 @@ class fwBuildRoot:
+ curEnviron = createEnviron()\r
+ self.oEnv = Environment( CCFLAGS = self.dctFwVars['CCFLAGS'] , toolpath=buildtoolspath, tools=buildtools, ENV=curEnviron, FWVARS=self.dctFwVars )\r
+ \r
+- # fixup paths back to what they were before scons messed them up [BUGBUG: SCons issue, this is the workaround]\r
++ # fixup paths back to what they were before scons messed them up [BUGBUG: SCons issue, this is the workaround]\r
+ if ((sys.platform=='win32') and (self.dctFwVars['bitness']!='32')):\r
+- self.oEnv['ENV'] = curEnviron\r
++ self.oEnv['ENV'] = curEnviron\r
+ \r
+ def subProject(self, sProjectName, lstDependencies = None, altProjectDir = None, libtypeOverride = None):\r
+- if altProjectDir == None: pthProjectDir = join( self.dctFwVars['pthProjectRoot'], sProjectName )\r
+- else: pthProjectDir = altProjectDir\r
++ if altProjectDir == None: pthProjectDir = join( self.dctFwVars['pthProjectRoot'], sProjectName )\r
++ else: pthProjectDir = altProjectDir\r
+ \r
+ libtype = self.dctFwVars['libtype']\r
+ if libtypeOverride:\r
+@@ -105,20 +105,20 @@ class fwBuildRoot:
+ self.dctFwVars['libtypeOverride'+sProjectName] = libtypeOverride\r
+ \r
+ pthBuildDir = join( self.dctFwVars['pthScratch'], \\r
+- sProjectName + "_" + \\r
+- self.dctFwVars['variant'] + "_" +\\r
+- libtype + "_" + \\r
+- self.dctFwVars['bitness'] )\r
++ sProjectName + "_" + \\r
++ self.dctFwVars['variant'] + "_" +\\r
++ libtype + "_" + \\r
++ self.dctFwVars['bitness'] )\r
+ \r
+ self.dctFwVars[sProjectName+'BuildDir'] = pthBuildDir\r
+ self.oEnv['FWVARS'] = self.dctFwVars # in case of changes to the internal dictionary\r
+- oProject = self.oEnv.SConscript( join( pthProjectDir, sProjectName+'.sconscript' ),\\r
++ oProject = self.oEnv.SConscript( join( pthProjectDir, sProjectName+'.sconscript' ),\\r
+ src_dir = pthProjectDir,\\r
+ variant_dir = pthBuildDir,\\r
+ duplicate = 0 )\r
+- if lstDependencies != None:\r
+- for dep in lstDependencies:\r
+- self.oEnv.Depends( oProject, dep )\r
++ if lstDependencies != None:\r
++ for dep in lstDependencies:\r
++ self.oEnv.Depends( oProject, dep )\r
+ \r
+ return oProject\r
+ \r
+@@ -172,7 +172,7 @@ class fwProject():
+ PROJECTNAMEU = self.dctFwVars['sProjectName'].upper(), \\r
+ BUILDDIR = self.dctFwVars['pthBuildDir'],\\r
+ BITNESS = self.dctFwVars['bitness'],\\r
+- PROJECTDIR = self.dctFwVars['pthProjectDir'])\r
++ PROJECTDIR = self.dctFwVars['pthProjectDir'])\r
+ \r
+ \r
+ def initBuildObjects(self, lstExtraCPPs = None, lstDepends = None, lstDependPaths = None, pthSrcDir=None):\r
+@@ -260,7 +260,7 @@ class fwProject():
+ \r
+ # BUGBUG: <one last hack; can't get rid of this for a bit>\r
+ if (self.dctFwVars['toolset'] == 'suncc') and (self.dctFwVars['sProjectName'] == 'fwImage'):\r
+- pthBuildHFile = appendToFilename(pthBuildHFile, '_sol')\r
++ pthBuildHFile = appendToFilename(pthBuildHFile, '_sol')\r
+ # </one last hack>\r
+ \r
+ dctFunctions = constructMultipassCPP( self.dctFwVars['pthProjectDir'], \\r
+@@ -365,10 +365,10 @@ def createDefFile ( pthDevLabRoot, pthPr
+ #os.system( sCommandStr )\r
+ \r
+ if win_sys == 0 and isfile(exe_name_path):\r
+- os.system('chmod 755 ' + exe_name_path)\r
++ os.system('chmod 755 ' + exe_name_path)\r
+ \r
+ if isfile(exe_name_path):\r
+- os.system( sCommandStr )\r
++ os.system( sCommandStr )\r
+ \r
+ def_file_path = join(pthProjectRoot,sProjectName,sProjectName + '.def')\r
+ if win_sys == 0 and isfile(def_file_path) :\r
+--- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwutil.py.orig 2009-07-09 11:16:55.000000000 +0200
++++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwutil.py 2023-03-14 17:45:45.643343147 +0100
+@@ -71,8 +71,8 @@ def setupIncludePaths ( oEnv, pthStartPa
+ \r
+ def createEnviron ():\r
+ # Do any environment modifications here\r
+- oEnviron = os.environ\r
+- return oEnviron\r
++ oEnviron = os.environ\r
++ return oEnviron\r
+ \r
+ def src2obj( pth ):\r
+ pthRootDir, sRootName = split(pth)\r
+@@ -84,14 +84,14 @@ def src2obj( pth ):
+ \r
+ def buildPath( pthBuildRoot ):\r
+ return join( pthBuildRoot,\\r
+- ARGUMENTS.get('variant','debug') + "_" +\\r
+- ARGUMENTS.get('libtype','shared') + "_" +\\r
+- ARGUMENTS.get('bitness','32') )\r
++ ARGUMENTS.get('variant','debug') + "_" +\\r
++ ARGUMENTS.get('libtype','shared') + "_" +\\r
++ ARGUMENTS.get('bitness','32') )\r
+ \r
+ \r
+ def turnOnZi( oEnv ):\r
+- import SCons.Util\r
+- oEnv['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Gm /ZI /Fd%s" % File(PDB)) or ""}'])\r
++ import SCons.Util\r
++ oEnv['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Gm /ZI /Fd%s" % File(PDB)) or ""}'])\r
+ \r
+ def fixLinuxSharedLib( target = None, source = None, env = None ):\r
+ if target:\r
projects / packages / framewave.git / blobdiff