Re: Python error when building gdbus-codegen stuff (in glib / gio)
On Wed, 2018-01-17 at 16:07 +, John Emmas wrote: > On 17/01/2018 11:04, John Emmas wrote: > > > > I'll look a bit further into this and see if I can figure out > > what's > > gone wrong. > > > > This turned out to be a problem with TortoiseGit. Some of glib's > python > files contain lines looking like this:- > >from .whatever import something > > For some reason, I always need to edit them to remove the period - > i.e. > >from whatever import something > > So typically, I can have 4 or 5 such conflicts in any given python > script. TortoiseGit has an option which effectively means "resolve > all > conflicted lines using my version". But I've just realised that it > doesn't confine itself to overwriting the conflicted lines - it > actually > substitutes my whole file (and therefore loses any non-conflicted > changes!!) Good to hear you’ve resolved that problem. > Now I'm past that point I've encountered a new problem (when > compiling > the recently added 'gnetworkmonitorwindows.c'). On my system (MSVC) > it > seems to be #including the wrong version of "iphlpapi.h" and is > consequently failing to pick up one of the symbols > (IP_ADDRESS_PREFIX) > which is needed by function 'win_network_monitor_get_ip_info()'. When you get a chance to investigate it, can you add your findings to https://bugzilla.gnome.org/show_bug.cgi?id=685442 please? That’s where we’re working on the Windows network monitor. Thanks, Philip signature.asc Description: This is a digitally signed message part ___ gtk-devel-list mailing list gtk-devel-list@gnome.org https://mail.gnome.org/mailman/listinfo/gtk-devel-list
Re: Python error when building gdbus-codegen stuff (in glib / gio)
On 17/01/2018 11:04, John Emmas wrote: I'll look a bit further into this and see if I can figure out what's gone wrong. This turned out to be a problem with TortoiseGit. Some of glib's python files contain lines looking like this:- from .whatever import something For some reason, I always need to edit them to remove the period - i.e. from whatever import something So typically, I can have 4 or 5 such conflicts in any given python script. TortoiseGit has an option which effectively means "resolve all conflicted lines using my version". But I've just realised that it doesn't confine itself to overwriting the conflicted lines - it actually substitutes my whole file (and therefore loses any non-conflicted changes!!) Now I'm past that point I've encountered a new problem (when compiling the recently added 'gnetworkmonitorwindows.c'). On my system (MSVC) it seems to be #including the wrong version of "iphlpapi.h" and is consequently failing to pick up one of the symbols (IP_ADDRESS_PREFIX) which is needed by function 'win_network_monitor_get_ip_info()'. That'll have to wait for another day though... :-( John ___ gtk-devel-list mailing list gtk-devel-list@gnome.org https://mail.gnome.org/mailman/listinfo/gtk-devel-list
Re: Python error when building gdbus-codegen stuff (in glib / gio)
On 17/01/2018 10:38, Philip Withnall wrote: What’s the output of `git status`? For both 'codegen_main.py' and 'codegen_docbook.py' I see this output:- # On branch master # Your branch is ahead of 'upstream/master' by 260 commits. # nothing to commit (working directory clean) (I think that's because I push things to my own repo). I'll look a bit further into this and see if I can figure out what's gone wrong. Thanks, John ___ gtk-devel-list mailing list gtk-devel-list@gnome.org https://mail.gnome.org/mailman/listinfo/gtk-devel-list
Re: Python error when building gdbus-codegen stuff (in glib / gio)
On Wed, 2018-01-17 at 10:26 +, John Emmas wrote: > On 17/01/2018 09:51, Philip Withnall wrote: > > Exactly what commit are you building? > > > > > [...] > > > > > > > That’s not what the code currently looks like: > > > > Thanks for the quick response Philip. The latest commit here is > #5fba62ade by Benjamin Berg on 15 Jan 2018 (gmessages: Flush output > stream after logging messages). > > My last 'pull' did flag up some conflicts though - so maybe I didn't > fix > one of them correctly? (or did that change come after the above > commit?) Perhaps. What’s the output of `git status`? Philip signature.asc Description: This is a digitally signed message part ___ gtk-devel-list mailing list gtk-devel-list@gnome.org https://mail.gnome.org/mailman/listinfo/gtk-devel-list
Re: Python error when building gdbus-codegen stuff (in glib / gio)
On 17/01/2018 09:51, Philip Withnall wrote: Exactly what commit are you building? [...] That’s not what the code currently looks like: Thanks for the quick response Philip. The latest commit here is #5fba62ade by Benjamin Berg on 15 Jan 2018 (gmessages: Flush output stream after logging messages). My last 'pull' did flag up some conflicts though - so maybe I didn't fix one of them correctly? (or did that change come after the above commit?) John ___ gtk-devel-list mailing list gtk-devel-list@gnome.org https://mail.gnome.org/mailman/listinfo/gtk-devel-list
Re: Python error when building gdbus-codegen stuff (in glib / gio)
On Wed, 2018-01-17 at 09:44 +, John Emmas wrote: > I'm not yet building with meson so forgive me if this is just down to > my > build system being out-of-date !! > > The problem happens when I try to build glib/gio from yesterday's > git > master. Exactly what commit are you building? > But in the file 'gdbus-2.0/codegen/codegen_main.py' it seems to be > getting called like this, at line 186:- > >docbook_gen = > codegen_docbook.DocbookCodeGenerator(all_ifaces, docbook, outdir); That’s not what the code currently looks like: https://git.gnome.org/browse/glib/tree/gio/gdbus-2.0/codegen/codegen_ma in.py#n226 Is your git checkout completely up to date? Philip signature.asc Description: This is a digitally signed message part ___ gtk-devel-list mailing list gtk-devel-list@gnome.org https://mail.gnome.org/mailman/listinfo/gtk-devel-list
