Bug 120178 - Win64 really needs PlatformArchitecture macro
Summary: Win64 really needs PlatformArchitecture macro
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Windows 7
: P2 Normal
Assignee: Nobody
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2013-08-22 16:12 PDT by Alex Christensen
Modified: 2013-11-18 17:27 PST (History)
3 users (show)

See Also:


Attachments
Patch (25.95 KB, patch)
2013-08-22 16:22 PDT, Alex Christensen
bfulgham: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Christensen 2013-08-22 16:12:30 PDT
r154436 rolled out r154416, which didn't actually break the open source build, just the bots.  The original change, https://webkit.org/b/120137, is actually needed.  I made one modification: I export PlatformArchitecture as an environment variable in common.props instead of setting it in the nmake command, which is only needed for nmake clean.
Comment 1 Alex Christensen 2013-08-22 16:22:20 PDT
Created attachment 209404 [details]
Patch
Comment 2 Alex Christensen 2013-08-22 16:39:51 PDT
This should be double-checked on a machine besides mine before r+ing to avoid the problems that this caused last time.
Comment 3 WebKit Commit Bot 2013-08-23 11:51:26 PDT
Comment on attachment 209404 [details]
Patch

Rejecting attachment 209404 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 209404, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
md.cmd
patching file Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd
patching file Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd
patching file WebKitLibraries/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebKitLibraries/win/tools/vsprops/common.props

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Brent Fulgham']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: http://webkit-queues.appspot.com/results/1542360
Comment 4 Alex Christensen 2013-08-23 13:15:32 PDT
r154513
Comment 5 Brent Fulgham 2013-11-18 17:27:24 PST
<rdar://problem/15498763>