After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 749622 - The demos.h Distributed in Release Tarballs breaks MSVC builds.
The demos.h Distributed in Release Tarballs breaks MSVC builds.
Status: RESOLVED FIXED
Product: gtk+
Classification: Platform
Component: .General
3.17.x
Other Windows
: Normal normal
: ---
Assigned To: gtk-bugs
gtk-bugs
Depends on:
Blocks:
 
 
Reported: 2015-05-20 09:23 UTC by Fan, Chun-wei
Modified: 2015-06-19 15:48 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Dist a demos.h.win32 instead of demos.h (9.85 KB, patch)
2015-05-29 10:17 UTC, Fan, Chun-wei
committed Details | Review

Description Fan, Chun-wei 2015-05-20 09:23:25 UTC
Hi,

Nowadays, since we only build the page setup demo on *NIX platforms, we need to generate demos.h according to the platform for which GTK+ is built for, as the default demos.h that is distributed in the tarballs (that is generated by the scripts) will include the *NIX-only pagesetup.c, which will break the build on Visual Studio, as it does not use the autotools build.

I will enclose a patch shortly to:
-Stop the distribution of the demos.h
-Distribute instead a demos.h.win32 that can be used by Visual Studio builds.

With blessings, thank you!
Comment 1 Matthias Clasen 2015-05-26 11:53:08 UTC
Fan, patch still coming ?
Comment 2 Fan, Chun-wei 2015-05-29 01:15:13 UTC
Hi Matthias,

Sorry, I must have forgotten and I thought I did that.

I will get to it later today, as I am away at this time.

With blessings.
Comment 3 Fan, Chun-wei 2015-05-29 10:17:44 UTC
Created attachment 304233 [details] [review]
Dist a demos.h.win32 instead of demos.h

Hi,

This patch generates demos.h.win32 for use for Visual Studio builds (which contains only the demos that are suitable for Windows builds), as the default demos.h that was shipped contains items for *NIX builds, which will break the build of gtk3-demo.exe on Visual Studio builds.

Let me know if generating a .bat to generate demos.h on Windows would be preferable, but that would mean that a Windows PERL installation will be required at build time.

With blessings, thank you!
Comment 4 Fan, Chun-wei 2015-06-17 02:03:53 UTC
ping...?  As this will affect the patches I will come up with for bug 681965.

With blessings, thank you!
Comment 5 Matthias Clasen 2015-06-19 10:46:23 UTC
Review of attachment 304233 [details] [review]:

I only looked at the Makefile.am changes - they look fine.
Comment 6 Fan, Chun-wei 2015-06-19 15:47:50 UTC
Hello Matthias,

Thanks for the review, I pushed the patch to master as c207b8d.  As this was fixing the Visual Studio build, I decided to have the Visual Studio build file updates needed for this bug in the same patch :).

With blessings, thank you!