Bug 53607 - Add DerivedSources.make to some Visual Studio projects
Summary: Add DerivedSources.make to some Visual Studio projects
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Windows 7
: P2 Normal
Assignee: Jeff Miller
URL:
Keywords:
Depends on: 53625
Blocks:
  Show dependency treegraph
 
Reported: 2011-02-02 11:18 PST by Jeff Miller
Modified: 2011-02-02 14:40 PST (History)
5 users (show)

See Also:


Attachments
Patch (2.15 KB, patch)
2011-02-02 11:37 PST, Jeff Miller
darin: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff
add a newline to the end of the last patch manually, I'm not sure why the generated patch failed but this seems to fix it (2.15 KB, patch)
2011-02-02 13:37 PST, Jeff Miller
sfalken: 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 Jeff Miller 2011-02-02 11:18:10 PST
Add DerivedSources.make to some Visual Studio projects
Comment 1 Jeff Miller 2011-02-02 11:37:33 PST
Created attachment 80936 [details]
Patch
Comment 2 WebKit Commit Bot 2011-02-02 12:47:23 PST
Comment on attachment 80936 [details]
Patch

Rejecting attachment 80936 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2

Last 500 characters of output:
le Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj.rej
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
Hunk #1 FAILED at 85.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj.rej

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Darin Adler', u'--force']" exit_code: 1

Full output: http://queues.webkit.org/results/7689262
Comment 3 Jeff Miller 2011-02-02 13:37:38 PST
Created attachment 80961 [details]
add a newline to the end of the last patch manually, I'm not sure why the generated patch failed but this seems to fix it
Comment 4 Eric Seidel (no email) 2011-02-02 13:39:28 PST
Adam was just telling me that svn-apply may have trouble applying vcproj changes on git checkouts.  If that's true, we need a bug and a fix. :)  I'm not certain if that's the apply error your'e hitting or not (because I just heard of this 5 minutes ago).
Comment 5 Eric Seidel (no email) 2011-02-02 13:40:37 PST
bug 53573 is where Adam had trouble with vcproj files and svn-apply.
Comment 6 Daniel Bates 2011-02-02 13:46:03 PST
(In reply to comment #4)
> Adam was just telling me that svn-apply may have trouble applying vcproj changes on git checkouts.  If that's true, we need a bug and a fix. :)

Filed bug #53625 for this issue.
Comment 7 Jeff Miller 2011-02-02 13:49:45 PST
I am not using git, and downloading the original patch attachment manually and applying it to my local sources also failed.  I added a newline to the patch file, and the local apply worked.
Comment 8 Jeff Miller 2011-02-02 13:51:21 PST
And FWIW, I was using patch, not svn-apply, to apply the patch locally.
Comment 9 WebKit Commit Bot 2011-02-02 13:56:20 PST
Comment on attachment 80961 [details]
add a newline to the end of the last patch manually, I'm not sure why the generated patch failed but this seems to fix it

Rejecting attachment 80961 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-4', 'apply-..." exit_code: 2

Last 500 characters of output:
le Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj.rej
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
Hunk #1 FAILED at 85.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj.rej

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Steve Falkenburg', u'-..." exit_code: 1

Full output: http://queues.webkit.org/results/7685990
Comment 10 Daniel Bates 2011-02-02 13:59:05 PST
(In reply to comment #8)
> And FWIW, I was using patch, not svn-apply, to apply the patch locally.

What OS are you using? What version of patch(1) are you using?
Comment 11 Jeff Miller 2011-02-02 14:12:07 PST
(In reply to comment #10)
> (In reply to comment #8)
> > And FWIW, I was using patch, not svn-apply, to apply the patch locally.
> 
> What OS are you using? What version of patch(1) are you using?

Windows 7. patch 2.5.8.

In any case, it looks like the commit bot can't commit the updated patch, either, so, I'll have to find someone with commit privileges to do it for me.
Comment 12 Eric Seidel (no email) 2011-02-02 14:17:46 PST
The commit-bots use Snow Leopard 10.6.6 with a git checkout.  I suspect you're hitting bug 53625, just like Adam did. :(
Comment 13 Jeff Miller 2011-02-02 14:20:26 PST
(In reply to comment #12)
> The commit-bots use Snow Leopard 10.6.6 with a git checkout.  I suspect you're hitting bug 53625, just like Adam did. :(

Thanks for the info, that would explain it.
Comment 14 Adam Roben (:aroben) 2011-02-02 14:40:59 PST
Committed r77420: <http://trac.webkit.org/changeset/77420>