Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
preprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pablo Winant
preprocessor
Commits
140c91e9
Verified
Commit
140c91e9
authored
1 year ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
CI: switch to Meson build system
parent
f3acaf32
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+13
-16
13 additions, 16 deletions
.gitlab-ci.yml
scripts/arm64-cross.ini
+11
-0
11 additions, 0 deletions
scripts/arm64-cross.ini
scripts/homebrew-native.ini
+0
-0
0 additions, 0 deletions
scripts/homebrew-native.ini
scripts/windows-cross.ini
+7
-0
7 additions, 0 deletions
scripts/windows-cross.ini
with
31 additions
and
16 deletions
.gitlab-ci.yml
+
13
−
16
View file @
140c91e9
...
...
@@ -7,22 +7,20 @@ variables:
build_linux_x86_64
:
stage
:
build
script
:
-
autoreconf -si
-
./configure --host=x86_64-linux-gnu
-
make -j$(nproc)
-
meson setup -D buildtype=release build
-
meson compile -C build -v
artifacts
:
paths
:
-
src/dynare-preprocessor
-
build/
src/dynare-preprocessor
build_linux_arm64
:
stage
:
build
script
:
-
autoreconf -si
-
./configure --host=aarch64-linux-gnu
-
make -j$(nproc)
-
meson setup -D buildtype=release --cross-file scripts/arm64-cross.ini build
-
meson compile -C build -v
artifacts
:
paths
:
-
src/dynare-preprocessor
-
build/
src/dynare-preprocessor
build_windows_x86_64
:
stage
:
build
...
...
@@ -31,9 +29,9 @@ build_windows_x86_64:
-
'
[[
-f
tarballs/mingw-w64-x86_64-boost-$MINGW64_BOOST_VERSION-any.pkg.tar.zst
]]
||
wget
$WGET_OPTIONS
-P
tarballs
http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-boost-$MINGW64_BOOST_VERSION-any.pkg.tar.zst'
-
mkdir -p deps
-
tar xf tarballs/mingw-w64-x86_64-boost-$MINGW64_BOOST_VERSION-any.pkg.tar.zst --directory deps
-
autoreconf -s
i
-
./configure --host=x86_64-w64-mingw32 --with-boost=$(pwd)/deps/mingw64/include
-
m
ake -j$(nproc)
-
echo -e "[properties]\nboost_root = '$(pwd)/deps/mingw64/'" > boost.in
i
-
meson setup -D buildtype=release --cross-file scripts/windows-cross.ini --cross-file boost.ini build
-
m
eson compile -C build -v
cache
:
# This cache is shared between all branches, to save space
key
:
$CI_JOB_NAME
...
...
@@ -41,16 +39,15 @@ build_windows_x86_64:
-
tarballs/
artifacts
:
paths
:
-
src/dynare-preprocessor.exe
-
build/
src/dynare-preprocessor.exe
build_macos_x86_64
:
stage
:
build
tags
:
-
macOS
script
:
-
autoreconf -si
-
arch -x86_64 ./configure CC=gcc-13 CXX=g++-13 LEX=/usr/local/opt/flex/bin/flex YACC=/usr/local/opt/bison/bin/bison
-
arch -x86_64 make -j$(sysctl -n hw.ncpu)
-
arch -x86_64 meson setup -D buildtype=release --native-file scripts/homebrew-native.ini build
-
arch -x86_64 meson compile -C build -v
artifacts
:
paths
:
-
src/dynare-preprocessor
-
build/
src/dynare-preprocessor
This diff is collapsed.
Click to expand it.
scripts/arm64-cross.ini
0 → 100644
+
11
−
0
View file @
140c91e9
# Meson cross file for targeting Linux arm64
[binaries]
cpp
=
'aarch64-linux-gnu-g++'
strip
=
'aarch64-linux-gnu-strip'
[host_machine]
system
=
'linux'
cpu_family
=
'aarch64'
cpu
=
'aarch64'
endian
=
'little'
This diff is collapsed.
Click to expand it.
homebrew-native.ini
→
scripts/
homebrew-native.ini
+
0
−
0
View file @
140c91e9
File moved
This diff is collapsed.
Click to expand it.
windows-cross.ini
→
scripts/
windows-cross.ini
+
7
−
0
View file @
140c91e9
...
...
@@ -11,5 +11,12 @@ cpu_family = 'x86_64'
cpu
=
'x86_64'
endian
=
'little'
[built-in options]
prefer_static
=
true
# See the comments in the main Dynare Meson cross-file
cpp_args
=
[ '-fstack-protector', '-march=nocona', '-msahf', '-mtune=generic' ]
cpp_link_args
=
[ '-fstack-protector' ]
#[properties]
#boost_root = '/home/sebastien/dynare/unstable/preprocessor/deps/mingw64/'
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment