Bug 53607 – Add DerivedSources.make to some Visual Studio projects

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Jeff Miller]

Add DerivedSources.make to some Visual Studio projects

[Jeff Miller]

Created attachment 80936 [details]
Patch

[WebKit Commit Bot]

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

[Jeff Miller]

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

[Eric Seidel (no email)]

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).

[Eric Seidel (no email)]

bug 53573 is where Adam had trouble with vcproj files and svn-apply.

[Daniel Bates]

(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.

[Jeff Miller]

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.

[Jeff Miller]

And FWIW, I was using patch, not svn-apply, to apply the patch locally.

[WebKit Commit Bot]

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

[Daniel Bates]

(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?

[Jeff Miller]

(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.

[Eric Seidel (no email)]

The commit-bots use Snow Leopard 10.6.6 with a git checkout.  I suspect you're hitting bug 53625, just like Adam did. :(

[Jeff Miller]

(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.

[Adam Roben (:aroben)]

Committed r77420: <http://trac.webkit.org/changeset/77420>