mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-03-14 19:55:12 +01:00
parent
707106c7a5
commit
3145d88f4b
@ -1,4 +1,4 @@
|
|||||||
image: registry.gitlab.gnome.org/gnome/glib/master:v2
|
image: registry.gitlab.gnome.org/gnome/glib/master:v3
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
@ -44,6 +44,18 @@ fedora-meson-android_ndk_r16_api21_arm64:
|
|||||||
paths:
|
paths:
|
||||||
- "${CI_PROJECT_DIR}/_build/meson-logs"
|
- "${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:
|
msys2-mingw32:
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -28,6 +28,11 @@ RUN dnf -y install \
|
|||||||
wget \
|
wget \
|
||||||
unzip \
|
unzip \
|
||||||
make \
|
make \
|
||||||
|
mingw64-gcc \
|
||||||
|
mingw64-gcc-c++ \
|
||||||
|
mingw64-gettext \
|
||||||
|
mingw64-zlib \
|
||||||
|
mingw64-libffi \
|
||||||
&& dnf clean all
|
&& dnf clean all
|
||||||
|
|
||||||
RUN pip3 install meson
|
RUN pip3 install meson
|
||||||
@ -35,6 +40,8 @@ RUN pip3 install meson
|
|||||||
COPY setup-android-ndk.sh .
|
COPY setup-android-ndk.sh .
|
||||||
RUN ./setup-android-ndk.sh
|
RUN ./setup-android-ndk.sh
|
||||||
|
|
||||||
|
COPY cross_file_mingw64.txt /opt
|
||||||
|
|
||||||
ARG HOST_USER_ID=5555
|
ARG HOST_USER_ID=5555
|
||||||
ENV HOST_USER_ID ${HOST_USER_ID}
|
ENV HOST_USER_ID ${HOST_USER_ID}
|
||||||
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
|
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
|
||||||
|
17
.gitlab-ci/cross_file_mingw64.txt
Normal file
17
.gitlab-ci/cross_file_mingw64.txt
Normal file
@ -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'
|
@ -61,7 +61,9 @@ IGNORE_HFILES = \
|
|||||||
gtranslit-data.h \
|
gtranslit-data.h \
|
||||||
glib-init.h \
|
glib-init.h \
|
||||||
gconstructor.h \
|
gconstructor.h \
|
||||||
valgrind.h
|
valgrind.h \
|
||||||
|
gvalgrind.h \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
# Images to copy into HTML directory
|
# Images to copy into HTML directory
|
||||||
HTML_IMAGES = \
|
HTML_IMAGES = \
|
||||||
|
@ -34,6 +34,7 @@ if get_option('gtk_doc')
|
|||||||
'glib-init.h',
|
'glib-init.h',
|
||||||
'gconstructor.h',
|
'gconstructor.h',
|
||||||
'valgrind.h',
|
'valgrind.h',
|
||||||
|
'gvalgrind.h',
|
||||||
]
|
]
|
||||||
|
|
||||||
ignore_decorators = [
|
ignore_decorators = [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user