Skip to content

Commit

Permalink
Temporary fix for #3, but an upstream fix would be better.
Browse files Browse the repository at this point in the history
  • Loading branch information
karurochari committed Dec 7, 2024
1 parent 4238528 commit 7e22c6b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
11 changes: 6 additions & 5 deletions com.karurochari.vs.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
id: com.karurochari.vs
runtime: org.freedesktop.Platform
runtime-version: '24.08'
runtime-version: "24.08"
sdk: org.freedesktop.Sdk
sdk-extensions :
- "org.freedesktop.Sdk.Extension.llvm19"
- "org.freedesktop.Sdk.Extension.swift6"
sdk-extensions:
- "org.freedesktop.Sdk.Extension.llvm19"
- "org.freedesktop.Sdk.Extension.swift6"
build-options:
append-path: "/usr/lib/sdk/llvm19/bin:/usr/lib/sdk/swift6/bin"
prepend-ld-library-path: "/usr/lib/sdk/llvm19/lib:/usr/lib/sdk/swift6/lib"
Expand All @@ -14,6 +14,7 @@ modules:
- name: vs-fltk
buildsystem: meson
config-opts:
- --prefix=/usr
- --native-file=/run/build/vs-fltk/toolchains/flatpak.ini
- --buildtype=release
- -Dtests=false
Expand All @@ -37,4 +38,4 @@ finish-args:
# Home folder
- --filesystem=home/.vs-fltk
#cleanup:
# - '*'
# - '*'
2 changes: 1 addition & 1 deletion docs/developers/releasing.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Todo list for release
## Todo list for releases

Ideally all these steps should be made automatic when a release request is triggered.
But for now they are not, so use this as a checklist for reference:
Expand Down
3 changes: 1 addition & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ vs_fltk = shared_library(

'./src/loader.cpp',


src_components,
autogen_components,

Expand Down Expand Up @@ -300,4 +299,4 @@ pconf.generate(
vs_fltk,
description: 'VS fltk library (C interface only)',
url: 'https://github.com/KaruroChori/vs-fltk/',
)
)
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"codegen": "bun ./scripts/codegen/index.ts",
"codegen.quick": "bun ./scripts/codegen/index.ts quick",
"meson-devenv": "meson devenv -C build",
"meson-setup.release": "meson setup --reconfigure build/ --buildtype=release",
"meson-setup.clang-release": "meson setup --reconfigure build/ --buildtype=release --native-file toolchains/clang.ini",
"meson-setup.clang-debug": "meson setup --reconfigure build/ --buildtype=debug --native-file toolchains/clang.ini",
"meson-setup.zig-release": "meson setup --reconfigure build/ --buildtype=release --native-file toolchains/zig.ini",
"meson-setup.release": "meson setup --prefix=/usr --reconfigure build/ --buildtype=release",
"meson-setup.clang-release": "meson setup --prefix=/usr --reconfigure build/ --buildtype=release --native-file toolchains/clang.ini",
"meson-setup.clang-debug": "meson setup --prefix=/usr --reconfigure build/ --buildtype=debug --native-file toolchains/clang.ini",
"meson-setup.zig-release": "meson setup --prefix=/usr --reconfigure build/ --buildtype=release --native-file toolchains/zig.ini",
"vs.example": "meson compile -C build/ vs:executable && VS_COMMONS_DIR=$(pwd)/build/commons/ ./build/vs run vs://examples/example-0.xml",
"test": "meson test -C build/ --suite=vs-fltk",
"benchmark": "meson test --benchmark -C build/ --suite=vs-fltk",
Expand Down

0 comments on commit 7e22c6b

Please sign in to comment.