Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
74f28bda
Commit
74f28bda
authored
May 08, 2020
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
meson: Move glib wrap to download
parent
6c2dc976
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
.gitlab-ci.yml
.gitlab-ci.yml
+5
-3
subprojects/glib.wrap
subprojects/glib.wrap
+5
-5
No files found.
.gitlab-ci.yml
View file @
74f28bda
...
@@ -129,6 +129,8 @@ build msys2:
...
@@ -129,6 +129,8 @@ build msys2:
.build msvc
:
.build msvc
:
extends
:
build msys2
extends
:
build msys2
variables
:
GLIB_VERSION
:
2.64.2
script
:
script
:
# For some reason, options are separated by newline instead of space, so we
# For some reason, options are separated by newline instead of space, so we
# have to replace them first.
# have to replace them first.
...
@@ -145,9 +147,9 @@ build msys2:
...
@@ -145,9 +147,9 @@ build msys2:
-
New-Item -Path subprojects -Name openssl.wrap -Value "[wrap-git]`r`ndirectory=openssl`r`nurl=https://gitlab.freedesktop.org/libnice/openssl-binaries-for-ci.git`r`nrevision=1.1.1c`r`n"
-
New-Item -Path subprojects -Name openssl.wrap -Value "[wrap-git]`r`ndirectory=openssl`r`nurl=https://gitlab.freedesktop.org/libnice/openssl-binaries-for-ci.git`r`nrevision=1.1.1c`r`n"
-
cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-
cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
meson subprojects download &&
meson subprojects download &&
meson wrap promote subprojects\glib\subprojects\libffi.wrap &&
meson wrap promote subprojects\glib
-$env:GLIB_VERSION
\subprojects\libffi.wrap &&
meson wrap promote subprojects\glib\subprojects\zlib.wrap &&
meson wrap promote subprojects\glib
-$env:GLIB_VERSION
\subprojects\zlib.wrap &&
meson wrap promote subprojects\glib\subprojects\proxy-libintl.wrap &&
meson wrap promote subprojects\glib
-$env:GLIB_VERSION
\subprojects\proxy-libintl.wrap &&
meson subprojects download"
meson subprojects download"
-
cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-
cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
meson build $env:MESON_ARGS &&
meson build $env:MESON_ARGS &&
...
...
subprojects/glib.wrap
View file @
74f28bda
[wrap-
git
]
[wrap-
file
]
directory=glib
directory=glib
-2.64.2
url=https://gitlab.gnome.org/GNOME/glib.git
source_url=https://ftp.gnome.org/pub/gnome/sources/glib/2.64/glib-2.64.2.tar.xz
push-url=git@gitlab.gnome.org:GNOME/glib.git
source_filename=glib-2.64.2.tar.xz
revision=glib-2-64
source_hash=9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment