diff options
| author | Jens Peters <jp7677@gmail.com> | 2022-11-12 17:03:27 +0300 |
|---|---|---|
| committer | Jens Peters <jp7677@gmail.com> | 2022-11-12 17:03:43 +0300 |
| commit | 19aaabf0f94230cf988bfce9a836dcbb979a2ec1 (patch) | |
| tree | c53a0c7a98aad95ef6ff55b08541b9c726020a42 | |
| parent | 6fc2b6832600423cab4b947cb697cba5631cc5ab (diff) | |
build: Run setup command explicitely
Newer meson warns rightfully when not doing so.
Also improve formatting.
| -rwxr-xr-x | package-release.sh | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/package-release.sh b/package-release.sh index 25bed10..de48c0f 100755 --- a/package-release.sh +++ b/package-release.sh @@ -45,16 +45,16 @@ done function prepare { python3 validate-methods.py \ - src/nvapi.cpp \ - src/nvapi_sys.cpp \ - src/nvapi_disp.cpp \ - src/nvapi_mosaic.cpp \ - src/nvapi_drs.cpp \ - src/nvapi_gpu.cpp \ - src/nvapi_d3d.cpp \ - src/nvapi_d3d11.cpp \ - src/nvapi_d3d12.cpp \ - src/nvapi_interface.cpp \ + src/nvapi.cpp \ + src/nvapi_sys.cpp \ + src/nvapi_disp.cpp \ + src/nvapi_mosaic.cpp \ + src/nvapi_drs.cpp \ + src/nvapi_gpu.cpp \ + src/nvapi_d3d.cpp \ + src/nvapi_d3d11.cpp \ + src/nvapi_d3d12.cpp \ + src/nvapi_interface.cpp \ inc/nvapi_interface.h # remove existing version.h, because otherwise the existing one gets into the build instead of the generated one @@ -66,14 +66,15 @@ function prepare { function build_arch { cd "$SRC_DIR" - meson --cross-file "$SRC_DIR/$crossfile$1.txt" \ - --buildtype "release" \ - --prefix "$BUILD_DIR" \ - --strip \ - --bindir "x$1" \ - --libdir "x$1" \ - -Denable_tests=$opt_enabletests \ - "$BUILD_DIR/build.$1" + meson setup \ + --cross-file "$SRC_DIR/$crossfile$1.txt" \ + --buildtype "release" \ + --prefix "$BUILD_DIR" \ + --strip \ + --bindir "x$1" \ + --libdir "x$1" \ + -Denable_tests=$opt_enabletests \ + "$BUILD_DIR/build.$1" cd "$BUILD_DIR/build.$1" ninja install |