Allows scons build to use local copy of platformsdk if one is not bundled sid...

Allows scons build to use local copy of platformsdk if one is not bundled side-by-side.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=6305

[sgk, 2008-12-03 20:21:36]

http://codereview.chromium.org/12915/diff/11/203
File build/SConscript.main (left):

http://codereview.chromium.org/12915/diff/11/203#oldcode255
Line 255: PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0',
Yay, glad to see this going away.

http://codereview.chromium.org/12915/diff/11/203
File build/SConscript.main (right):

http://codereview.chromium.org/12915/diff/11/203#newcode253
Line 253: platform_sdk_path =
'$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0'
Shouldn't this have '/files' on the end?  That's where the checked-in hermetic
copies actually live, and it's been removed from the other uses in $CPPPATH and
$LIBPATH settings.

http://codereview.chromium.org/12915/diff/11/204
File build/internal/essential.scons (right):

http://codereview.chromium.org/12915/diff/11/204#newcode50
Line 50: '$PLATFORMSDK_VISTA/VC/INCLUDE',
Example here of '/files' being removed.

http://codereview.chromium.org/12915/diff/11/201
File webkit/activex_shim/SConscript (right):

http://codereview.chromium.org/12915/diff/11/201#newcode28
Line 28: '/LIBPATH:"$PLATFORMSDK_VISTA"', 'Urlmon.Lib',
Is this line even doing anything?  The other /LIBPATH settings all use
$PLATFORMSDK_VISTA/Lib and $PLATFORMSDK_VISTA/VC/Lib.  Seems like this should
either be corrected to use /Lib, or else just removed on the theory it's not
needed.

[bradn, 2008-12-03 20:25:13]

Ok fixes these.

http://codereview.chromium.org/12915/diff/11/203
File build/SConscript.main (right):

http://codereview.chromium.org/12915/diff/11/203#newcode253
Line 253: platform_sdk_path =
'$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0'
On 2008/12/03 20:21:36, sgk wrote:
> Shouldn't this have '/files' on the end?  That's where the checked-in hermetic
> copies actually live, and it's been removed from the other uses in $CPPPATH
and
> $LIBPATH settings.

Done.

http://codereview.chromium.org/12915/diff/11/201
File webkit/activex_shim/SConscript (right):

http://codereview.chromium.org/12915/diff/11/201#newcode28
Line 28: '/LIBPATH:"$PLATFORMSDK_VISTA"', 'Urlmon.Lib',
On 2008/12/03 20:21:36, sgk wrote:
> Is this line even doing anything?  The other /LIBPATH settings all use
> $PLATFORMSDK_VISTA/Lib and $PLATFORMSDK_VISTA/VC/Lib.  Seems like this should
> either be corrected to use /Lib, or else just removed on the theory it's not
> needed.
> 

Done.

[bradn, 2008-12-03 20:41:46]

Ok take another look.

[sgk, 2008-12-03 20:43:53]

lgtm