On 11 Nov 2007, at 7:08 PM, Adam R. Maxwell wrote: > > On Nov 11, 2007, at 9:54 AM, Christiaan Hofman wrote: > >> >> On 11 Nov 2007, at 6:49 PM, Adam R. Maxwell wrote: >> >>> >>> On Nov 11, 2007, at 9:44 AM, Christiaan Hofman wrote: >>> >>>> >>>> On 11 Nov 2007, at 6:32 PM, Adam R. Maxwell wrote: >>>> >>>>> >>>>> On Nov 11, 2007, at 9:04 AM, Christiaan Hofman wrote: >>>>> >>>>>> But I've no idea what has to be changed for the new Omni >>>>>> frameworks. >>>>> >>>>> Well, how about if we just leave it for a week as-is, release >>>>> 1.3.12 >>>>> next week, then move the branch stuff to the trunk? The longer we >>>>> go, >>>>> the more complicated the merge will be, and it's going to be hard >>>>> to >>>>> maintain a branch. >>>>> >>>>> -- >>>>> adam >>>> >>>> I think I'm very much confused. It seems the branch has the changed >>>> frameworks, is that correct? But the source files were not adapted >>>> to >>>> it. I just fixed that. >>> >>> No, the branch should have its own frameworks. I made some >>> modifications to them for 10.5 compatibility (which is why they're >>> different from the trunk). >>> >>> adam >> >> I'm even more confused. The new OmniFoundation has an int for the >> code in _OFError. That's also what I see in the branch. In the old >> framework it apparently there was a C-string identifier, as that was >> what was used in the source. > > Now I'm confused too :). Omni's NSError stuff reminds me why I > dislike cpp macros. > > Branch (on my machine): > > extern void _OFError(NSError **error, NSString *bundleIdentifier, > const char *name, const char *fileName, unsigned int line, NSString > *firstKey, ...); > > #define OFErrorWithInfo(error, name, ...) _OFError_(error, > OMNI_BUNDLE_IDENTIFIER, name, __FILE__, __LINE__, ## __VA_ARGS__) > > > Trunk (on my machine): > > extern void _OFError(NSError **error, NSString *domain, int code, > const char *fileName, unsigned int line, NSString *firstKey, ...); > > #define OFErrorWithInfo(error, code, ...) _OFError(error, > OMNI_BUNDLE_IDENTIFIER, code, __FILE__, __LINE__, ## __VA_ARGS__) > > So the branch has the name c-string instead of the int code, as you > said. I checked svn status -u and I'm up-to-date on the branch > vendorsrc.
My branch has: extern void _OFError(NSError **error, NSString *domain, int code, const char *fileName, unsigned int line, NSString *firstKey, ...); And I'm also up to date :) Christiaan ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Bibdesk-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bibdesk-develop
