PATCH: update developers guide.

9 views
Skip to first unread message

Jamie Kimberley

unread,
Nov 27, 2009, 10:24:47 AM11/27/09
to golden-che...@googlegroups.com
All,

I've made a few changes to the developers guide, mostly related to
the fact that we are using a locally patched version of Qwt.

I also updated the build instructions to better reflect the process
outlined in the README.

Thanks,
Jamie

"It is a mistake to think you can solve any major problems with just
potatoes."--Douglas Adams
__________________
Jamie Kimberley
Postdoctoral Fellow
Department of Mechanical Engineering
The Johns Hopkins University
Office: 410.516.5162
Mobile: 217.621.8272
Fax: 410.516.4316
E-Mail:jamie.k...@jhu.edu
0001-Update-developers-guide-to-reflect-our-use-of-a-patc.patch

Sean Rhea

unread,
Nov 28, 2009, 5:04:30 PM11/28/09
to Jamie Kimberley, golden-che...@googlegroups.com
Jamie,

It doesn't apply cleanly for me. Can you try regenerating it?


srhea:src:master$ git am
~/Desktop/Downloads/0001-Update-developers-guide-to-reflect-our-use-of-a-patc.patch
Applying: Update developers guide to reflect our use of a patched
version of qwt Removed qwt from the list of dependencies. Changed
build instructions to reflect the use of the patched version of qwt.
/Users/srhea/src/GoldenCheetah/.git/rebase-apply/patch:14: trailing whitespace.
<td>qt4-mac</td>
/Users/srhea/src/GoldenCheetah/.git/rebase-apply/patch:32: trailing whitespace.
directory. Additionally, GoldenCheetah uses a patched version of <a
href="http://sourceforge.net/projects/qwt/">Qwt</a> which is located
in the <code>GoldenCheetah/qwt</code> directory. You'll need to copy
the configuration file <code>qwtconfig.pri.in</code> to
<code>qwtconfig.pri</code> and edit that file if needed. The steps
you'll take are as follows:</p>
/Users/srhea/src/GoldenCheetah/.git/rebase-apply/patch:35: trailing whitespace.
In the top level GoldenCheetah directory
/Users/srhea/src/GoldenCheetah/.git/rebase-apply/patch:41: trailing whitespace.
cp src/gcconfig.pri.in src/gcconfig.pri
/Users/srhea/src/GoldenCheetah/.git/rebase-apply/patch:42: trailing whitespace.
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
error: patch failed: doc/developers-guide.content:29
error: doc/developers-guide.content: patch does not apply
Patch failed at 0001 Update developers guide to reflect our use of a
patched version of qwt Removed qwt from the list of dependencies.
Changed build instructions to reflect the use of the patched version
of qwt.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


Sean
> --
> _______________________________________________
> Golden-Cheetah-Users mailing list
> golden-che...@googlegroups.com
> http://groups.google.com/group/golden-cheetah-users?hl=en



--
“We’re borrowing money from China to buy oil from the Persian Gulf to
burn it in ways that destroy the planet. Every bit of that’s got to
change.” -- Al Gore

Jamie Kimberley

unread,
Nov 28, 2009, 5:21:30 PM11/28/09
to Sean Rhea, golden-che...@googlegroups.com
Sean,

that is odd, I applied cleanly for me, and had no whitespace
errors; I know how much you (Err git) hates them.

attached is a newly generated patch and a zip archive of the patch.
Wasn't there a problem with certain mail clients butchering ASCII
downloads?

Jamie
> ?We?re borrowing money from China to buy oil from the Persian Gulf to
> burn it in ways that destroy the planet. Every bit of that?s got to
> change.? -- Al Gore
0001-Update-developers-guide-to-reflect-our-use-of-a-patc.patch
0001-Update-developers-guide-to-reflect-our-use-of-a-patc.patch.zip

Sean Rhea

unread,
Nov 28, 2009, 6:53:47 PM11/28/09
to Jamie Kimberley, golden-che...@googlegroups.com
Worked! Committed. I added a little line-wrapping and reformatted
the commit message.

Sean

Mitsukuni

unread,
Nov 28, 2009, 9:36:10 PM11/28/09
to golden-cheetah-users
Jamie,

nice.

Yesterday, I confused to make gc while reading README.
I agree with you.

--
Mitsukuni
> E-Mail:jamie.kimber...@jhu.edu
>
> 0001-Update-developers-guide-to-reflect-our-use-of-a-patc.patch
> 3K表示ダウンロード
Reply all
Reply to author
Forward
0 new messages