Re: [Geany-Devel] Linkage-Cleanup Build System Breakage
Le 09/11/2014 16:15, Enrico Tröger a écrit : > On 29/10/14 16:17, Colomban Wendling wrote: >> [...] >> >> Enrico: would the change on geany_private.rc from >> https://github.com/b4n/geany/commit/a24d9217c3dfb959b4138fe3bffd871d9dc88ba4 >> break Waf or something else? (yes, I could check by running a VM, but I >> can also ask first :) > > I tested it on my VM and assumed it would break the build but > surprisingly it does not. > I don't know why but at least with Waf, using icons/geany.ico works as > well as ../icons/geany.ico. I cannot really explain it but your change > doesn't break the build. Great then. I also tried to build with Waf on Windows with this patch and it didn't complain. So, I made a PR https://github.com/geany/geany/pull/377 please give it a quick look and tell me if you see anything absurd. It should be OK though, as I successfully built a mostly-working executable with it :) Cheers, Colomban signature.asc Description: OpenPGP digital signature ___ Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel
Re: [Geany-Devel] Linkage-Cleanup Build System Breakage
On 14-11-09 07:31 AM, Enrico Tröger wrote: On 27/10/14 02:14, Matthew Brush wrote: On 14-10-26 04:16 PM, Enrico Tröger wrote: On 26/10/14 18:25, Matthew Brush wrote: On 14-10-26 07:14 AM, Enrico Tröger wrote: Hi, I don't really know enough about Waf to fix it. Since it needs Python anyway, we could just use one of its XML libraries to grab the names from the GtkBuilder file, and do the replacements using its text-handling functions. It wouldn't require sed/sort utils. I originally had a Python script[3] doing this, but I'm just not sure how to integrate that code into Waf. I' work on the Waf part but this will take at least two weeks as I'm almost not on the PC during the next two weeks. OK. I got a very basic working version, see attachment. However, I almost didn't test it and things like library versioning are missing. In Autotools libtool versions is not used yet anyway. It's just set to 0:0:0 same as the defaults. I just added that for future use. I got versioning working, for now the library will be installed as 0.0.0 like the autotools based build. How do we want to proceed, should I commit the changes to your repo or PR? Yeah, that'd be fine. I think Colomban added some commits just recently too so you might want to rebase ontop of that before pushing. The `pluginexport.h` header is gone now and `GEANY_API_SYMBOL` needs to be defined by the build system. Cheers, Matthew Brush ___ Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel
Re: [Geany-Devel] Linkage-Cleanup Build System Breakage
On 27/10/14 02:14, Matthew Brush wrote: > On 14-10-26 04:16 PM, Enrico Tröger wrote: >> On 26/10/14 18:25, Matthew Brush wrote: >>> On 14-10-26 07:14 AM, Enrico Tröger wrote: Hi, > I don't really know enough about Waf to fix it. Since it needs Python > anyway, we could just use one of its XML libraries to grab the names > from the GtkBuilder file, and do the replacements using its > text-handling functions. It wouldn't require sed/sort utils. I > originally had a Python script[3] doing this, but I'm just not sure > how > to integrate that code into Waf. I' work on the Waf part but this will take at least two weeks as I'm almost not on the PC during the next two weeks. >>> >>> OK. >> >> I got a very basic working version, see attachment. >> However, I almost didn't test it and things like library versioning are >> missing. > > In Autotools libtool versions is not used yet anyway. It's just set to > 0:0:0 same as the defaults. I just added that for future use. I got versioning working, for now the library will be installed as 0.0.0 like the autotools based build. How do we want to proceed, should I commit the changes to your repo or PR? Regards, Enrico -- Get my GPG key from http://www.uvena.de/pub.asc signature.asc Description: OpenPGP digital signature ___ Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel
Re: [Geany-Devel] Linkage-Cleanup Build System Breakage
On 29/10/14 06:48, Matthew Brush wrote: > On 14-10-26 04:16 PM, Enrico Tröger wrote: >> On 26/10/14 18:25, Matthew Brush wrote: >>> On 14-10-26 07:14 AM, Enrico Tröger wrote: [snip] >> > If the Win32 Nightlies break it will most likely be trivial changes to > the Makefile.ams. I don't have an environment like it uses to test. The Win32 nightlies are built using Waf, so fixing Waf will fix it all :). >>> >>> I thought the nightlies were using Mingw because there's all those >>> duplicate code paths in the Makefile.ams for Mingw. Who uses those? >> >> We added those years ago to support cross-compilation. IIRC this was >> before Waf. >> Yeah, we really should consolidate the available build systems and clean >> up the rest :). >> I don't use autotools based cross-compilation. >> > > I had a try at this for a while and after a number of changes it's > almost working. I got past the build system, compiler, and linker > problems, but now it's giving grief because of the "non-standard" (with > respect to Autotools) directory layout and the special cases we have > about using a "data" directory instead of putting in "share/geany". > > Is there any possibility we could use the same Unixey directory layout > for Win32 builds too? I guess so without having it well thought out. It would be nice indeed. > My dream is in some distant future to have the Autotools build system > able to build natively and cross-compiled and adding rules needed to > make the Windows installer and everything. This would also be great for > continuous integration and/or nightly builds in the future too, as we > would mostly have the exact same build system with the same > compiler/linker options and only minor differences to satisfy the > differences between platforms. That sounds really sweet and would ease development and releasing but would require quite some work before to get it working. Regards, Enrico -- Get my GPG key from http://www.uvena.de/pub.asc signature.asc Description: OpenPGP digital signature ___ Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel
Re: [Geany-Devel] Linkage-Cleanup Build System Breakage
On 29/10/14 16:17, Colomban Wendling wrote: > Le 29/10/2014 06:48, Matthew Brush a écrit : >> On 14-10-26 04:16 PM, Enrico Tröger wrote: >>> […] >>> I don't use autotools based cross-compilation. >>> >> >> I had a try at this for a while and after a number of changes it's >> almost working. I got past the build system, compiler, and linker >> problems, […] > > FWIW I pushed the changes I did myself (hey ;) to > https://github.com/b4n/geany/commits/wip/autotools-mingw-cross just in > case it can be of some use. > > Enrico: would the change on geany_private.rc from > https://github.com/b4n/geany/commit/a24d9217c3dfb959b4138fe3bffd871d9dc88ba4 > break Waf or something else? (yes, I could check by running a VM, but I > can also ask first :) I tested it on my VM and assumed it would break the build but surprisingly it does not. I don't know why but at least with Waf, using icons/geany.ico works as well as ../icons/geany.ico. I cannot really explain it but your change doesn't break the build. Regards, Enrico -- Get my GPG key from http://www.uvena.de/pub.asc signature.asc Description: OpenPGP digital signature ___ Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel
