--- a/sbsv2/raptor/python/raptor_meta.py Wed May 19 15:47:58 2010 +0100
+++ b/sbsv2/raptor/python/raptor_meta.py Tue May 25 10:23:35 2010 +0100
@@ -35,6 +35,7 @@
from mmpparser import *
import time
+import generic_path
PiggyBackedBuildPlatforms = {'ARMV5':['GCCXML']}
@@ -768,9 +769,13 @@
biloc="." # Someone building with a relative raptor path
self.__StandardVariables = {}
- # Relative step-down to the root - let's try ignoring this for now, as it
- # should amount to the same thing in a world where absolute paths are king
- self.__StandardVariables['TO_ROOT'] = ""
+ # Relative step-down to the root. Amount to env variable SRCROOT
+ # in case SBS_BUILD_DIR is on a different drive
+ if 'SRCROOT' in os.environ:
+ self.__StandardVariables['TO_ROOT'] = str(generic_path.Path(os.environ['SRCROOT']))
+ else:
+ self.__StandardVariables['TO_ROOT'] = ""
+
# Top-level bld.inf location
self.__StandardVariables['TO_BLDINF'] = biloc
self.__StandardVariables['EXTENSION_ROOT'] = eiloc
@@ -838,9 +843,12 @@
eiloc="." # Someone building with a relative raptor path
self.__StandardVariables = {}
- # Relative step-down to the root - let's try ignoring this for now, as it
- # should amount to the same thing in a world where absolute paths are king
- self.__StandardVariables['TO_ROOT'] = ""
+ # Relative step-down to the root. Amount to env variable SRCROOT
+ # in case SBS_BUILD_DIR is on a different drive
+ if 'SRCROOT' in os.environ:
+ self.__StandardVariables['TO_ROOT'] = str(generic_path.Path(os.environ['SRCROOT']))
+ else:
+ self.__StandardVariables['TO_ROOT'] = ""
# Top-level bld.inf location
self.__StandardVariables['TO_BLDINF'] = biloc
# Location of bld.inf file containing the current EXTENSION block
@@ -3082,7 +3090,6 @@
value = options[option].replace('$(EPOCROOT)', '$(EPOCROOT)/')
value = value.replace('$(', '$$$$(')
value = value.replace('$/', '/').replace('$;', ':')
- value = value.replace('$/', '/').replace('$;', ':')
if customInterface:
var.AddOperation(raptor_data.Set(option, value))