Merge branch 'mingw-ci' into 'master'

Add mingw64 ci Closes #1387 See merge request GNOME/glib!16
2024-11-10 19:36:18 +01:00 · 2018-05-28 14:39:34 +00:00 · 2018-05-28 14:39:34 +00:00 · d16d37bc10
commit d16d37bc10
parent e0a3b0edd5 3145d88f4b
11 changed files with 87 additions and 16 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib/master:v2
+image: registry.gitlab.gnome.org/gnome/glib/master:v3

 stages:
  - build
@ -44,6 +44,18 @@ fedora-meson-android_ndk_r16_api21_arm64:
    paths:
      - "${CI_PROJECT_DIR}/_build/meson-logs"

+fedora-meson-mingw64:
+  stage: build
+  except:
+    - tags
+  script:
+    # FIXME: Add --werror
+    - meson --cross-file=/opt/cross_file_mingw64.txt --buildtype debug _build
+    - ninja -C _build
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
+
 msys2-mingw32:
  stage: build
  tags:
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@ -28,6 +28,11 @@ RUN dnf -y install \
    wget \
    unzip \
    make \
+    mingw64-gcc \
+    mingw64-gcc-c++ \
+    mingw64-gettext \
+    mingw64-zlib \
+    mingw64-libffi \
 && dnf clean all

 RUN pip3 install meson
@ -35,6 +40,8 @@ RUN pip3 install meson
 COPY setup-android-ndk.sh .
 RUN ./setup-android-ndk.sh

+COPY cross_file_mingw64.txt /opt
+
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
--- a/.gitlab-ci/cross_file_mingw64.txt
+++ b/.gitlab-ci/cross_file_mingw64.txt
@ -0,0 +1,17 @@
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
+
+[properties]
+c_args = []
+c_link_args = []
+
+[binaries]
+c = 'x86_64-w64-mingw32-gcc'
+cpp = 'x86_64-w64-mingw32-g++'
+ar = 'x86_64-w64-mingw32-ar'
+strip = 'x86_64-w64-mingw32-strip'
+pkgconfig = 'x86_64-w64-mingw32-pkg-config'
+windres = 'x86_64-w64-mingw32-windres'
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@ -61,7 +61,9 @@ IGNORE_HFILES = \
 	gtranslit-data.h	\
 	glib-init.h		\
 	gconstructor.h		\
-	valgrind.h
+	valgrind.h		\
+	gvalgrind.h		\
+	$(NULL)

 # Images to copy into HTML directory
 HTML_IMAGES =  						\
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@ -34,6 +34,7 @@ if get_option('gtk_doc')
    'glib-init.h',
    'gconstructor.h',
    'valgrind.h',
+    'gvalgrind.h',
  ]

  ignore_decorators = [
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@ -188,6 +188,7 @@ libglib_2_0_la_SOURCES = 	\
 	gurifuncs.c 		\
 	gutils.c		\
 	guuid.c			\
+	gvalgrind.h		\
 	gvariant.h		\
 	gvariant.c		\
 	gvariant-core.h		\
--- a/glib/gslice.c
+++ b/glib/gslice.c
@ -52,7 +52,7 @@
 #include "glib_trace.h"
 #include "gprintf.h"

-#include "valgrind.h"
+#include "gvalgrind.h"

 /**
 * SECTION:memory_slices
@ -389,8 +389,10 @@ slice_config_init (SliceConfig *config)
       * This way it's possible to force gslice to be enabled under
       * valgrind just by setting G_SLICE to the empty string.
       */
+#ifdef ENABLE_VALGRIND
      if (RUNNING_ON_VALGRIND)
        config->always_malloc = TRUE;
+#endif
    }
 }

--- a/glib/gvalgrind.h
+++ b/glib/gvalgrind.h
@ -0,0 +1,32 @@
+/*
+ * Copyright 2018 Collabora ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Xavier Claessens <xavier.claessens@collabora.com>
+ */
+
+#ifndef __G_VALGRIND_H__
+#define __G_VALGRIND_H__
+
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifndef _MSC_VER
+#include "valgrind.h"
+#define ENABLE_VALGRIND 1
+#endif
+
+#endif /* __G_VALGRIND_H__ */
--- a/glib/valgrind.h
+++ b/glib/valgrind.h
@ -171,16 +171,6 @@
 #  endif
 #endif

-/* XXX: Unfortunately x64 Visual C++ does not suport inline asms,
- * so disable the use of valgrind's inline asm's for x64 Visual C++
- * builds, so that x64 Visual C++ builds of GLib can be maintained
- */
-#if defined (PLAT_amd64_win64) && defined (_MSC_VER)
-#  if !defined(NVALGRIND)
-#    define NVALGRIND 1
-#  endif
-#endif
-

 /* ------------------------------------------------------------------ */
 /* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS.  There is nothing */
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@ -22,6 +22,7 @@

 #include "config.h"

+#include "../glib/gvalgrind.h"
 #include <string.h>

 #include <ffi.h>
@ -34,7 +35,6 @@
 #include "gvaluetypes.h"
 #include "gtype-private.h"

-#include "../glib/valgrind.h"

 /**
 * SECTION:gclosure
@ -200,6 +200,7 @@ g_closure_new_simple (guint           sizeof_closure,

  private_size = sizeof (GRealClosure) - sizeof (GClosure);

+#ifdef ENABLE_VALGRIND
  /* See comments in gtype.c about what's going on here... */
  if (RUNNING_ON_VALGRIND)
    {
@ -213,6 +214,7 @@ g_closure_new_simple (guint           sizeof_closure,
      VALGRIND_MALLOCLIKE_BLOCK (allocated + sizeof (gpointer), private_size - sizeof (gpointer), 0, TRUE);
    }
  else
+#endif
    allocated = g_malloc0 (private_size + sizeof_closure);

  closure = (GClosure *) (allocated + private_size);
@ -613,6 +615,7 @@ g_closure_unref (GClosure *closure)
      closure_invoke_notifiers (closure, FNOTIFY);
      g_free (closure->notifiers);

+#ifdef ENABLE_VALGRIND
      /* See comments in gtype.c about what's going on here... */
      if (RUNNING_ON_VALGRIND)
        {
@ -627,6 +630,7 @@ g_closure_unref (GClosure *closure)
          VALGRIND_FREELIKE_BLOCK (closure, 0);
        }
      else
+#endif
        g_free (G_REAL_CLOSURE (closure));
    }
 }
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@ -21,6 +21,7 @@

 #include "config.h"

+#include "../glib/gvalgrind.h"
 #include <string.h>

 #include "gtype.h"
@ -37,8 +38,6 @@
 #include <windows.h>
 #endif

-#include "../glib/valgrind.h"
-
 #ifdef	G_ENABLE_DEBUG
 #define	IF_DEBUG(debug_type)	if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type)
 #endif
@ -1832,6 +1831,7 @@ g_type_create_instance (GType type)
  private_size = node->data->instance.private_size;
  ivar_size = node->data->instance.instance_size;

+#ifdef ENABLE_VALGRIND
  if (private_size && RUNNING_ON_VALGRIND)
    {
      private_size += ALIGN_STRUCT (1);
@ -1846,6 +1846,7 @@ g_type_create_instance (GType type)
      VALGRIND_MALLOCLIKE_BLOCK (allocated + ALIGN_STRUCT (1), private_size - ALIGN_STRUCT (1), 0, TRUE);
    }
  else
+#endif
    allocated = g_slice_alloc0 (private_size + ivar_size);

  instance = (GTypeInstance *) (allocated + private_size);
@ -1924,6 +1925,7 @@ g_type_free_instance (GTypeInstance *instance)
  memset (allocated, 0xaa, ivar_size + private_size);
 #endif

+#ifdef ENABLE_VALGRIND
  /* See comment in g_type_create_instance() about what's going on here.
   * We're basically unwinding what we put into motion there.
   */
@ -1941,6 +1943,7 @@ g_type_free_instance (GTypeInstance *instance)
      VALGRIND_FREELIKE_BLOCK (instance, 0);
    }
  else
+#endif
    g_slice_free1 (private_size + ivar_size, allocated);

 #ifdef	G_ENABLE_DEBUG