luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib-compile-resources: Fix code generation for MSVC builds

Browse Source 
glib-compile-resources was updated to generate octal byte
representation in a string, but unfortunately this breaks the build
on Visual Studio when the generated string sequence exceeds 65535
characters, which is the imposed limit on Visual Studio compilers.

To make things work on Visual Studio builds and to not slow down things
on other compilers, generate a code path for Visual Studio an array of
octal byte representations, as well as a code path for other compilers
that use the new string representation of octal values, and let the
compiler take the appropriate code path when compiling the
generated code.

Fixes issue #1580.
This commit is contained in:
Chun-wei Fan 2018-11-29 16:12:26 +08:00 committed by Chun-wei Fan
parent 1ba843b8a0
commit 4501807d73
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gio/glib-compile-resources.c
View File

@ -1086,9 +1086,33 @@ main (int argc, char **argv)
"#else\n"
"# define SECTION\n"
"#endif\n"
"\n"
"\n",
c_name_no_underscores);
/* For Visual Studio builds: Avoid surpassing the 65535-character limit for a string, GitLab issue #1580 */
g_fprintf (file, "#ifdef _MSC_VER\n");
g_fprintf (file,
"static const SECTION union { const guint8 data[%"G_GSIZE_FORMAT"]; const double alignment; void * const ptr;} %s_resource_data = { {\n",
data_size + 1 /* nul terminator */, c_name);
for (i = 0; i < data_size; i++)
{
if (i % 16 == 0)
g_fprintf (file, " ");
g_fprintf (file, "0%3.3o", (int)data[i]);
if (i != data_size - 1)
g_fprintf (file, ", ");
if (i % 16 == 15 || i == data_size - 1)
g_fprintf (file, "\n");
}
g_fprintf (file, "} };\n");
/* For other compilers, use the long string approach */
g_fprintf (file, "#else /* _MSC_VER */\n");
g_fprintf (file,
"static const SECTION union { const guint8 data[%"G_GSIZE_FORMAT"]; const double alignment; void * const ptr;} %s_resource_data = {\n \"",
c_name_no_underscores, data_size + 1 /* nul terminator */, c_name);
data_size + 1 /* nul terminator */, c_name);
for (i = 0; i < data_size; i++) {
g_fprintf (file, "\\%3.3o", (int)data[i]);
@ -1097,6 +1121,7 @@ main (int argc, char **argv)
}
g_fprintf (file, "\" };\n");
g_fprintf (file, "#endif /* !_MSC_VER */\n");
g_fprintf (file,
"\n"