kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #16710
Re: OS X help search path patch
I have made the changes as discussed, and tested it on my OS X system.
Wayne, I think this is ready for merging, especially if we can have someone
make sure it doesn't break anything on other system (it really shouldn't...)
Adam Wolf
Cofounder and Engineer
W&L
On Tue, Jan 13, 2015 at 9:43 PM, Garth Corral <gcorral@xxxxxxxxx> wrote:
>
> Yes, very sorry Adam. I looked at this but did not comment. Other than
> the things that Bernhard pointed out, I believe this resolves the issues as
> we discussed them.
>
> Garth
>
>
>
>
> On Jan 13, 2015, at 11:20 AM, Bernhard Stegmaier <stegmaier@xxxxxxxxxxxxx>
> wrote:
>
> Hi,
>
> the patch is basically fine for me (didn’t try it, just reviewed the
> diff), some notes on it:
> * Instead of hard-coding "/Library/Application Support/kicad/“ you could
> use the function “GetOSXKicadMachineDataDir()” I created some while back…
> this probably would make things easier to find/change in future.
> * Most of the other Apple specific stuff is wrapped into a __WXMAC__
> instead of __APPLE__. Should not make any difference, but again it might
> make things easier when having only one define searching for OSX specific
> things.
>
>
> Regards,
> Bernhard
>
>
> On 13.01.2015, at 19:23, Adam Wolf <adamwolf@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> Hi Wayne,
>
> This patch implements something Bernhard and Garth and I discussed and
> agreed to on the list. I haven't heard anyone reject it, but I also
> haven't seen any agreement.
>
> If you could take a look and see if you agree with the APPLE if defined
> stuff, that would be good... Then I think it's ready.
>
> Adam Wolf
> On Jan 13, 2015 12:00 PM, "Wayne Stambaugh" <stambaughw@xxxxxxxxx> wrote:
>
>> Adam,
>>
>> Is this patch ready to be committed? I've got a backlog of OSX patches
>> and I'm not sure what should be committed and what shouldn't. Would the
>> OSX devs please give me a "this is ready to commit" ping so nothing
>> falls through the cracks.
>>
>> Thanks,
>>
>> Wayne
>>
>> On 1/2/2015 4:12 PM, Adam Wolf wrote:
>> > Hi folks,
>> >
>> > I have written a patch that modifies the OS X help search path so it
>> > looks inside of
>> >
>> > /Libraries/Application Support/kicad/help
>> > <whatever.app>/Contents/SharedSupport/help
>> >
>> > per our previous discussion.
>> >
>> > I have wrapped the existing code in a ! __APPLE__ define, and wrapped
>> > the OS X only code in a __APPLE__ define.
>> >
>> > I was thinking about removing the commented __linux__ and __WINDOWS__
>> > ifdefs, but someone on the list recently mentioned both paths with
>> > regards to Windows help files, so I am not sure if they are "canonical"
>> > or not. It will be a 2 second change to switch them from ! __APPLE__ to
>> > __linux__ and __WINDOWS__, so no problem, just let me know if that is
>> > preferable.
>> >
>> > I tried to follow all the coding conventions as well as make the code
>> > blend with the existing code.
>> >
>> > I have tested it, and this works for both the kicad.app and the
>> > symlinked apps as well, like pcbnew.app.
>> >
>> > Thanks everyone! Let me know if there's anything I need to change.
>> >
>> > Adam Wolf
>> > Cofounder and Engineer
>> > W&L
>> >
>> >
>> >
>> > _______________________________________________
>> > Mailing list: https://launchpad.net/~kicad-developers
>> > Post to : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> > Unsubscribe : https://launchpad.net/~kicad-developers
>> > More help : https://help.launchpad.net/ListHelp
>> >
>>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> Post to : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> More help : https://help.launchpad.net/ListHelp
>>
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help : https://help.launchpad.net/ListHelp
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help : https://help.launchpad.net/ListHelp
>
>
>
Attachment:
osx_help_search_path.patch
Description: Binary data
Follow ups
References