portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use meson setup <dir> instead of meson <dir>

Browse source
This commit is contained in:
Anton Kochkov 2023-04-26 17:21:57 +08:00 committed by Anton Kochkov
parent 59080758fb
commit d2de771c3d
8 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.appveyor.yml
View file

@ -71,13 +71,13 @@ install:
build_script: build_script:
- appveyor AddMessage "Compiling rizin %RZ_VERSION% (%builder%)" - appveyor AddMessage "Compiling rizin %RZ_VERSION% (%builder%)"
- cmd: if %builder% == vs2017_64 ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2017%" x64 && %PYTHON%\Scripts\meson --buildtype=release --prefix="%CD%\%DIST_FOLDER%" --default-library=static -Db_vscrt=static_from_buildtype build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% ) - cmd: if %builder% == vs2017_64 ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2017%" x64 && %PYTHON%\Scripts\meson setup --buildtype=release --prefix="%CD%\%DIST_FOLDER%" --default-library=static -Db_vscrt=static_from_buildtype build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% )
- cmd: if %builder% == vs2022_64 ( choco install mingw && refreshenv && set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2022%" x64 && %PYTHON%\Scripts\meson --buildtype=release --prefix="%CD%\%DIST_FOLDER%" --default-library=static -Db_vscrt=static_from_buildtype build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% ) - cmd: if %builder% == vs2022_64 ( choco install mingw && refreshenv && set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2022%" x64 && %PYTHON%\Scripts\meson setup --buildtype=release --prefix="%CD%\%DIST_FOLDER%" --default-library=static -Db_vscrt=static_from_buildtype build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% )
- cmd: if %builder% == vs2017_64_dyn ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2017%" x64 && %PYTHON%\Scripts\meson --buildtype=release --prefix="%CD%\%DIST_FOLDER%" build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% ) - cmd: if %builder% == vs2017_64_dyn ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2017%" x64 && %PYTHON%\Scripts\meson setup --buildtype=release --prefix="%CD%\%DIST_FOLDER%" build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% )
- cmd: if %builder% == clang_cl_64_dyn ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2019%" x64 && set CC=clang-cl && %PYTHON%\Scripts\meson --buildtype=release --prefix="%CD%\%DIST_FOLDER%" build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% ) - cmd: if %builder% == clang_cl_64_dyn ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "%VSVARSALLPATH2019%" x64 && set CC=clang-cl && %PYTHON%\Scripts\meson setup --buildtype=release --prefix="%CD%\%DIST_FOLDER%" build && %PYTHON%\Scripts\ninja -C build install && 7z a %ARTIFACT_ZIP% %DIST_FOLDER% )
# Run tests only conditionally # Run tests only conditionally
for: for:

2
.builds/freebsd.yml
View file

@ -20,7 +20,7 @@ tasks:
sudo python3 -m pip install 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python' sudo python3 -m pip install 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python'
- build: | - build: |
cd rizin cd rizin
meson --prefix=${HOME} build meson setup --prefix=${HOME} build
ninja -C build ninja -C build
- install: | - install: |
cd rizin cd rizin

2
.builds/netbsd.yml
View file

@ -23,7 +23,7 @@ tasks:
# Workaround to avoid running rz-pipe test since there is no python3 symlink but a python3.8 binary available. # Workaround to avoid running rz-pipe test since there is no python3 symlink but a python3.8 binary available.
rm -f test/db/cmd/cmd_pipe rm -f test/db/cmd/cmd_pipe
rm -f test/db/archos/not-windows-any/cmd_pipe rm -f test/db/archos/not-windows-any/cmd_pipe
meson --prefix=${HOME} build meson setup --prefix=${HOME} build
ninja -C build ninja -C build
- install: | - install: |
cd rizin cd rizin

2
.builds/openbsd.yml
View file

@ -18,7 +18,7 @@ tasks:
/usr/local/bin/python3 -m pip install --user 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python' /usr/local/bin/python3 -m pip install --user 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python'
- build: | - build: |
cd rizin cd rizin
meson --prefix=${HOME} build meson setup --prefix=${HOME} build
ninja -C build ninja -C build
- install: | - install: |
cd rizin cd rizin

26
.github/workflows/ci.yml vendored
View file

@ -215,7 +215,7 @@ jobs:
export LD_LIBRARY_PATH=$(dirname $(clang -print-file-name=libclang_rt.asan-x86_64.so)):${LD_LIBRARY_PATH} export LD_LIBRARY_PATH=$(dirname $(clang -print-file-name=libclang_rt.asan-x86_64.so)):${LD_LIBRARY_PATH}
fi fi
fi fi
meson --prefix=${HOME} ${{ matrix.meson_options }} build && ninja -C build meson setup --prefix=${HOME} ${{ matrix.meson_options }} build && ninja -C build
env: env:
ASAN: ${{ matrix.asan }} ASAN: ${{ matrix.asan }}
CC: ${{ matrix.compiler }} CC: ${{ matrix.compiler }}
@ -332,7 +332,7 @@ jobs:
run: git clone https://github.com/rizinorg/rizin-testbins test/bins run: git clone https://github.com/rizinorg/rizin-testbins test/bins
working-directory: rizin working-directory: rizin
- name: Build - name: Build
run: meson --prefix=/usr build && ninja -C build run: meson setup --prefix=/usr build && ninja -C build
working-directory: rizin working-directory: rizin
- name: Install - name: Install
run: ninja -C build install run: ninja -C build install
@ -402,7 +402,7 @@ jobs:
run: git clone https://github.com/rizinorg/rizin-testbins test/bins run: git clone https://github.com/rizinorg/rizin-testbins test/bins
working-directory: rizin working-directory: rizin
- name: Build with Meson + Ninja - name: Build with Meson + Ninja
run: meson --prefix=/usr build && ninja -C build run: meson setup --prefix=/usr build && ninja -C build
working-directory: rizin working-directory: rizin
- name: Install with Ninja - name: Install with Ninja
run: ninja -C build install run: ninja -C build install
@ -448,7 +448,7 @@ jobs:
run: git clone https://github.com/rizinorg/rizin-testbins test/bins run: git clone https://github.com/rizinorg/rizin-testbins test/bins
working-directory: rizin working-directory: rizin
- name: Build with Meson + Ninja - name: Build with Meson + Ninja
run: meson --prefix=/usr -Dbuildtype=debugoptimized -Db_sanitize=address,undefined --werror build && ninja -C build run: meson setup --prefix=/usr -Dbuildtype=debugoptimized -Db_sanitize=address,undefined --werror build && ninja -C build
working-directory: rizin working-directory: rizin
env: env:
CFLAGS: -DASAN=1 -DRZ_ASSERT_STDOUT=1 -Wno-cpp CFLAGS: -DASAN=1 -DRZ_ASSERT_STDOUT=1 -Wno-cpp
@ -496,7 +496,7 @@ jobs:
run: git clone https://github.com/rizinorg/rizin-testbins test/bins run: git clone https://github.com/rizinorg/rizin-testbins test/bins
working-directory: rizin working-directory: rizin
- name: Build with Meson + Ninja - name: Build with Meson + Ninja
run: meson --prefix=/usr -Dbuildtype=release --werror build && ninja -C build run: meson setup --prefix=/usr -Dbuildtype=release --werror build && ninja -C build
working-directory: rizin working-directory: rizin
env: env:
CFLAGS: -Wno-cpp CFLAGS: -Wno-cpp
@ -531,7 +531,7 @@ jobs:
- name: Compile with meson - name: Compile with meson
run: | run: |
mkdir -p ${HOME}/rizin-static mkdir -p ${HOME}/rizin-static
meson --prefix=${HOME}/rizin-static --buildtype release --default-library static -Dinstall_sigdb=true -Dstatic_runtime=true -Dportable=true build meson setup --prefix=${HOME}/rizin-static --buildtype release --default-library static -Dinstall_sigdb=true -Dstatic_runtime=true -Dportable=true build
ninja -C build && ninja -C build install ninja -C build && ninja -C build install
tar -C ${HOME}/rizin-static --xz -cf rizin-static.tar.xz $(ls ${HOME}/rizin-static) tar -C ${HOME}/rizin-static --xz -cf rizin-static.tar.xz $(ls ${HOME}/rizin-static)
working-directory: rizin working-directory: rizin
@ -580,7 +580,7 @@ jobs:
- name: Create archive - name: Create archive
run: | run: |
export PATH=${HOME}/.local/bin:${PATH} export PATH=${HOME}/.local/bin:${PATH}
meson build meson setup build
cd build cd build
meson dist --include-subprojects --no-tests meson dist --include-subprojects --no-tests
ls -l meson-dist ls -l meson-dist
@ -610,7 +610,7 @@ jobs:
- name: Install rizin - name: Install rizin
run: | run: |
export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH} export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}
meson --prefix=/usr --buildtype=release build && ninja -C build && sudo ninja -C build install meson setup --prefix=/usr --buildtype=release build && ninja -C build && sudo ninja -C build install
working-directory: rizin working-directory: rizin
- name: Check that installed rizin runs - name: Check that installed rizin runs
run: rizin -qcq /bin/ls run: rizin -qcq /bin/ls
@ -713,7 +713,7 @@ jobs:
run: | run: |
export PATH=${HOME}/.local/bin:${PATH} export PATH=${HOME}/.local/bin:${PATH}
sed -i 's@\${ANDROID_NDK}@'"${ANDROID_NDK}"'@' .github/meson-android-${{ matrix.name }}.ini sed -i 's@\${ANDROID_NDK}@'"${ANDROID_NDK}"'@' .github/meson-android-${{ matrix.name }}.ini
meson --buildtype release --default-library static --prefix=/tmp/android-dir -Dportable=true -Dblob=true -Dstatic_runtime=true build --cross-file .github/meson-android-${{ matrix.name }}.ini meson setup --buildtype release --default-library static --prefix=/tmp/android-dir -Dportable=true -Dblob=true -Dstatic_runtime=true build --cross-file .github/meson-android-${{ matrix.name }}.ini
ninja -C build && ninja -C build install ninja -C build && ninja -C build install
- name: Create rizin-android-${{ matrix.name }}.tar.gz - name: Create rizin-android-${{ matrix.name }}.tar.gz
run: | run: |
@ -739,12 +739,12 @@ jobs:
- name: Compile & Install Rizin - name: Compile & Install Rizin
run: | run: |
export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH} export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}
meson --buildtype release --prefix=/usr build meson setup --buildtype release --prefix=/usr build
ninja -C build && sudo ninja -C build install ninja -C build && sudo ninja -C build install
- name: Compile C++ test - name: Compile C++ test
run: | run: |
export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH} export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}
meson --prefix=/usr build-cpp-test ./test/unit/cpp meson setup --prefix=/usr build-cpp-test ./test/unit/cpp
meson compile -C build-cpp-test meson compile -C build-cpp-test
- name: Run C++ test - name: Run C++ test
run: | run: |
@ -771,7 +771,7 @@ jobs:
- name: Install rizin - name: Install rizin
run: | run: |
export PATH=$PATH:/usr/local/bin export PATH=$PATH:/usr/local/bin
meson --prefix=/usr --buildtype=release build && ninja -C build && sudo ninja -C build install meson setup --prefix=/usr --buildtype=release build && ninja -C build && sudo ninja -C build install
working-directory: rizin working-directory: rizin
- name: Install rz-pipe-py - name: Install rz-pipe-py
run: | run: |
@ -800,7 +800,7 @@ jobs:
- name: Install rizin - name: Install rizin
run: | run: |
export PATH=$PATH:/usr/local/bin export PATH=$PATH:/usr/local/bin
meson --prefix=/usr --buildtype=release build && ninja -C build && sudo ninja -C build install meson setup --prefix=/usr --buildtype=release build && ninja -C build && sudo ninja -C build install
working-directory: rizin working-directory: rizin
- name: Checkout rz-bindgen - name: Checkout rz-bindgen
uses: actions/checkout@v3 uses: actions/checkout@v3

2
.github/workflows/coverity-scan.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
if: steps.determine-repo.outputs.repo == 'rizinorg/rizin' if: steps.determine-repo.outputs.repo == 'rizinorg/rizin'
- name: Meson - name: Meson
run: meson build run: meson setup build
if: steps.determine-repo.outputs.repo == 'rizinorg/rizin' if: steps.determine-repo.outputs.repo == 'rizinorg/rizin'
- name: Build with cov-build - name: Build with cov-build

2
.github/workflows/tcc.yml vendored
View file

@ -77,7 +77,7 @@ jobs:
- name: Meson setup - name: Meson setup
env: env:
CC: tcc CC: tcc
run: meson --prefix=/usr build run: meson setup --prefix=/usr build
- name: Meson compile and install - name: Meson compile and install
run: ninja -C build && sudo ninja -C build install run: ninja -C build && sudo ninja -C build install
- name: Run unit tests - name: Run unit tests

2
travis-script
View file

@ -36,7 +36,7 @@ if [ "${COVERAGE}" == "1" ] ; then
OPTS="${OPTS} -Db_coverage=true" OPTS="${OPTS} -Db_coverage=true"
fi fi
meson --prefix=${TRAVIS_BUILD_DIR}/install ${OPTS} build || exit 1 meson setup --prefix=${TRAVIS_BUILD_DIR}/install ${OPTS} build || exit 1
ninja -C build || exit 1 ninja -C build || exit 1
ninja -C build install || exit 1 ninja -C build install || exit 1
export PKG_CONFIG_PATH=$(pwd)/build/meson-private:${PKG_CONFIG_PATH} export PKG_CONFIG_PATH=$(pwd)/build/meson-private:${PKG_CONFIG_PATH}