diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index dd3ec68f6..1615c4cb3 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -144,8 +144,6 @@ jobs: with: command: test args: --release - - name: "Test (tests/sys)" - run: tests/sys/test.sh - name: "Acquire gtk4-rs" uses: actions/checkout@v4 with: diff --git a/.gitignore b/.gitignore index 0bb91dea8..06e2877b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,4 @@ target -/gio -/gtk /src/gir_version.rs /.vscode -tests/gir-files -tests/sys/*-sys/** -tests/sys/sys_build/Cargo.lock -!tests/sys/*-sys/Cargo.toml **.DS_Store diff --git a/Cargo.lock b/Cargo.lock index 419a862e2..483a161b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -85,9 +85,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hprof" @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -126,9 +126,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "once_cell" @@ -136,6 +136,24 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + [[package]] name = "regex" version = "1.10.3" @@ -150,9 +168,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -172,19 +190,44 @@ source = "git+https://github.com/GuillaumeGomez/rustdoc-stripper#1170265c0f2a372 [[package]] name = "serde" -version = "1.0.164" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "toml" version = "0.8.8" @@ -220,17 +263,23 @@ dependencies = [ "winnow", ] +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "winnow" -version = "0.5.7" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f495880723d0999eb3500a9064d8dbcf836460b24c17df80ea7b5794053aac" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] diff --git a/tests/sys/gdk-pixbuf-sys/Cargo.toml b/tests/sys/gdk-pixbuf-sys/Cargo.toml deleted file mode 100644 index 915f32a19..000000000 --- a/tests/sys/gdk-pixbuf-sys/Cargo.toml +++ /dev/null @@ -1,65 +0,0 @@ -[build-dependencies] -pkg-config = "0.3.7" -system-deps = "6" - -[dependencies] -bitflags = "2.2" -libc = "0.2" - -[dependencies.gio] -package = "gio-sys" -path = "../gio-sys" - -[dependencies.glib] -package = "glib-sys" -path = "../glib-sys" - -[dependencies.gobject] -package = "gobject-sys" -path = "../gobject-sys" - -[features] -v2_28 = [] -v2_30 = ["v2_28"] -v2_32 = ["v2_30"] -v2_36 = ["v2_32"] -v2_36_8 = ["v2_36"] -v2_40 = ["v2_36_8"] - -[lib] -name = "gdk_pixbuf_sys" - -[package] -build = "build.rs" -name = "gdk-pixbuf-sys" -version = "0.2.0" -edition = "2021" -[package.metadata.system-deps.gdk_pixbuf_2_0] -name = "gdk-pixbuf-2.0" -version = "2.26" - -[package.metadata.system-deps.gdk_pixbuf_2_0.v2_28] -version = "2.28" - -[package.metadata.system-deps.gdk_pixbuf_2_0.v2_30] -version = "2.30" - -[package.metadata.system-deps.gdk_pixbuf_2_0.v2_32] -version = "2.32" - -[package.metadata.system-deps.gdk_pixbuf_2_0.v2_36] -version = "2.36" - -[package.metadata.system-deps.gdk_pixbuf_2_0.v2_36_8] -version = "2.36.8" - -[package.metadata.system-deps.gdk_pixbuf_2_0.v2_40] -version = "2.40" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dev-dependencies] -shell-words = "1.0.0" -tempfile = "3" diff --git a/tests/sys/gio-sys/Cargo.toml b/tests/sys/gio-sys/Cargo.toml deleted file mode 100644 index 20f32dd8e..000000000 --- a/tests/sys/gio-sys/Cargo.toml +++ /dev/null @@ -1,105 +0,0 @@ -[build-dependencies] -pkg-config = "0.3.7" -system-deps = "6" - -[dependencies] -bitflags = "2.2" -libc = "0.2" - -[dependencies.glib] -package = "glib-sys" -path = "../glib-sys" - -[dependencies.gobject] -package = "gobject-sys" -path = "../gobject-sys" - -[features] -v2_34 = [] -v2_36 = ["v2_34"] -v2_38 = ["v2_36"] -v2_40 = ["v2_38"] -v2_42 = ["v2_40"] -v2_44 = ["v2_42"] -v2_46 = ["v2_44"] -v2_48 = ["v2_46"] -v2_50 = ["v2_48"] -v2_52 = ["v2_50"] -v2_54 = ["v2_52"] -v2_56 = ["v2_54"] -v2_58 = ["v2_56"] -v2_60 = ["v2_58"] -v2_62 = ["v2_60"] -v2_64 = ["v2_62"] -v2_66 = ["v2_64"] - -[lib] -name = "gio_sys" - -[package] -build = "build.rs" -name = "gio-sys" -version = "0.2.0" -edition = "2021" -[package.metadata.system-deps.gio_2_0] -name = "gio-2.0" -version = "2.32" - -[package.metadata.system-deps.gio_2_0.v2_34] -version = "2.34" - -[package.metadata.system-deps.gio_2_0.v2_36] -version = "2.36" - -[package.metadata.system-deps.gio_2_0.v2_38] -version = "2.38" - -[package.metadata.system-deps.gio_2_0.v2_40] -version = "2.40" - -[package.metadata.system-deps.gio_2_0.v2_42] -version = "2.42" - -[package.metadata.system-deps.gio_2_0.v2_44] -version = "2.44" - -[package.metadata.system-deps.gio_2_0.v2_46] -version = "2.46" - -[package.metadata.system-deps.gio_2_0.v2_48] -version = "2.48" - -[package.metadata.system-deps.gio_2_0.v2_50] -version = "2.50" - -[package.metadata.system-deps.gio_2_0.v2_52] -version = "2.52" - -[package.metadata.system-deps.gio_2_0.v2_54] -version = "2.54" - -[package.metadata.system-deps.gio_2_0.v2_56] -version = "2.56" - -[package.metadata.system-deps.gio_2_0.v2_58] -version = "2.58" - -[package.metadata.system-deps.gio_2_0.v2_60] -version = "2.60" - -[package.metadata.system-deps.gio_2_0.v2_62] -version = "2.62" - -[package.metadata.system-deps.gio_2_0.v2_64] -version = "2.64" - -[package.metadata.system-deps.gio_2_0.v2_66] -version = "2.66" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dev-dependencies] -shell-words = "1.0.0" -tempfile = "3" diff --git a/tests/sys/gir-gdk-pixbuf.toml b/tests/sys/gir-gdk-pixbuf.toml deleted file mode 100644 index fe252161b..000000000 --- a/tests/sys/gir-gdk-pixbuf.toml +++ /dev/null @@ -1,12 +0,0 @@ -[options] -work_mode = "sys" -girs_directories = ["../gir-files"] -library = "GdkPixbuf" -version = "2.0" -min_cfg_version = "2.26" -target_path = "./gdk-pixbuf-sys" -external_libraries = [ - "GLib", - "GObject", - "Gio", -] diff --git a/tests/sys/gir-gio.toml b/tests/sys/gir-gio.toml deleted file mode 100644 index 056edf939..000000000 --- a/tests/sys/gir-gio.toml +++ /dev/null @@ -1,11 +0,0 @@ -[options] -work_mode = "sys" -girs_directories = ["../gir-files"] -library = "Gio" -version = "2.0" -min_cfg_version = "2.32" -target_path = "./gio-sys" -external_libraries = [ - "GLib", - "GObject", -] diff --git a/tests/sys/gir-glib.toml b/tests/sys/gir-glib.toml deleted file mode 100644 index d94923a8a..000000000 --- a/tests/sys/gir-glib.toml +++ /dev/null @@ -1,29 +0,0 @@ -[options] -work_mode = "sys" -girs_directories = ["../gir-files"] -library = "GLib" -version = "2.0" -min_cfg_version = "2.32" -target_path = "./glib-sys" -ignore = [ - "GLib.GINT64_FORMAT", - "GLib.GINT64_MODIFIER", - "GLib.GUINT64_FORMAT", - "GLib.GUINT64_MODIFIER", - "GLib.GINTPTR_FORMAT", - "GLib.GINTPTR_MODIFIER", - "GLib.GUINTPTR_FORMAT", - "GLib.GUINTPTR_MODIFIER", - "GLib.GSIZE_FORMAT", - "GLib.GSIZE_MODIFIER", - "GLib.GSSIZE_FORMAT", - "GLib.GSSIZE_MODIFIER", - "GLib.MININT8", - "GLib.MININT16", - "GLib.MININT32", - "GLib.SIZEOF_LONG", - "GLib.SIZEOF_SIZE_T", - "GLib.SIZEOF_SSIZE_T", - "GLib.SIZEOF_VOID_P", - "GLib.VA_COPY_AS_ARRAY", -] diff --git a/tests/sys/gir-gobject.toml b/tests/sys/gir-gobject.toml deleted file mode 100644 index 6211942c0..000000000 --- a/tests/sys/gir-gobject.toml +++ /dev/null @@ -1,15 +0,0 @@ -[options] -work_mode = "sys" -girs_directories = ["../gir-files"] -library = "GObject" -version = "2.0" -min_cfg_version = "2.32" -target_path = "./gobject-sys" -external_libraries = [ - "GLib", -] - -ignore = [ - "GObject.VaClosureMarshal", - "GObject.SignalCVaMarshaller", -] diff --git a/tests/sys/gir-pango.toml b/tests/sys/gir-pango.toml deleted file mode 100644 index 9fed6a215..000000000 --- a/tests/sys/gir-pango.toml +++ /dev/null @@ -1,11 +0,0 @@ -[options] -work_mode = "sys" -girs_directories = ["../gir-files"] -library = "Pango" -version = "1.0" -min_cfg_version = "1.30" -target_path = "./pango-sys" -external_libraries = [ - "GLib", - "GObject", -] diff --git a/tests/sys/glib-sys/Cargo.toml b/tests/sys/glib-sys/Cargo.toml deleted file mode 100644 index 12930adcb..000000000 --- a/tests/sys/glib-sys/Cargo.toml +++ /dev/null @@ -1,93 +0,0 @@ -[build-dependencies] -pkg-config = "0.3.7" -system-deps = "6" - -[dependencies] -bitflags = "2.2" -libc = "0.2" - -[features] -v2_34 = [] -v2_36 = ["v2_34"] -v2_38 = ["v2_36"] -v2_40 = ["v2_38"] -v2_44 = ["v2_40"] -v2_46 = ["v2_44"] -v2_48 = ["v2_46"] -v2_50 = ["v2_48"] -v2_52 = ["v2_50"] -v2_54 = ["v2_52"] -v2_56 = ["v2_54"] -v2_58 = ["v2_56"] -v2_60 = ["v2_58"] -v2_62 = ["v2_60"] -v2_64 = ["v2_62"] -v2_66 = ["v2_64"] - -[lib] -name = "glib_sys" - -[package] -build = "build.rs" -name = "glib-sys" -version = "0.2.0" -edition = "2021" -[package.metadata.system-deps.glib_2_0] -name = "glib-2.0" -version = "2.32" - -[package.metadata.system-deps.glib_2_0.v2_34] -version = "2.34" - -[package.metadata.system-deps.glib_2_0.v2_36] -version = "2.36" - -[package.metadata.system-deps.glib_2_0.v2_38] -version = "2.38" - -[package.metadata.system-deps.glib_2_0.v2_40] -version = "2.40" - -[package.metadata.system-deps.glib_2_0.v2_44] -version = "2.44" - -[package.metadata.system-deps.glib_2_0.v2_46] -version = "2.46" - -[package.metadata.system-deps.glib_2_0.v2_48] -version = "2.48" - -[package.metadata.system-deps.glib_2_0.v2_50] -version = "2.50" - -[package.metadata.system-deps.glib_2_0.v2_52] -version = "2.52" - -[package.metadata.system-deps.glib_2_0.v2_54] -version = "2.54" - -[package.metadata.system-deps.glib_2_0.v2_56] -version = "2.56" - -[package.metadata.system-deps.glib_2_0.v2_58] -version = "2.58" - -[package.metadata.system-deps.glib_2_0.v2_60] -version = "2.60" - -[package.metadata.system-deps.glib_2_0.v2_62] -version = "2.62" - -[package.metadata.system-deps.glib_2_0.v2_64] -version = "2.64" - -[package.metadata.system-deps.glib_2_0.v2_66] -version = "2.66" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dev-dependencies] -shell-words = "1.0.0" -tempfile = "3" diff --git a/tests/sys/gobject-sys/Cargo.toml b/tests/sys/gobject-sys/Cargo.toml deleted file mode 100644 index a2d2456e8..000000000 --- a/tests/sys/gobject-sys/Cargo.toml +++ /dev/null @@ -1,73 +0,0 @@ -[build-dependencies] -pkg-config = "0.3.7" -system-deps = "6" - -[dependencies] -bitflags = "2.2" -libc = "0.2" - -[dependencies.glib] -package = "glib-sys" -path = "../glib-sys" - -[features] -v2_34 = [] -v2_36 = ["v2_34"] -v2_38 = ["v2_36"] -v2_42 = ["v2_38"] -v2_44 = ["v2_42"] -v2_46 = ["v2_44"] -v2_54 = ["v2_46"] -v2_58 = ["v2_54"] -v2_62 = ["v2_58"] -v2_66 = ["v2_62"] - -[lib] -name = "gobject_sys" - -[package] -build = "build.rs" -name = "gobject-sys" -version = "0.2.0" -edition = "2021" -[package.metadata.system-deps.gobject_2_0] -name = "gobject-2.0" -version = "2.32" - -[package.metadata.system-deps.gobject_2_0.v2_34] -version = "2.34" - -[package.metadata.system-deps.gobject_2_0.v2_36] -version = "2.36" - -[package.metadata.system-deps.gobject_2_0.v2_38] -version = "2.38" - -[package.metadata.system-deps.gobject_2_0.v2_42] -version = "2.42" - -[package.metadata.system-deps.gobject_2_0.v2_44] -version = "2.44" - -[package.metadata.system-deps.gobject_2_0.v2_46] -version = "2.46" - -[package.metadata.system-deps.gobject_2_0.v2_54] -version = "2.54" - -[package.metadata.system-deps.gobject_2_0.v2_58] -version = "2.58" - -[package.metadata.system-deps.gobject_2_0.v2_62] -version = "2.62" - -[package.metadata.system-deps.gobject_2_0.v2_66] -version = "2.66" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dev-dependencies] -shell-words = "1.0.0" -tempfile = "3" diff --git a/tests/sys/pango-sys/Cargo.toml b/tests/sys/pango-sys/Cargo.toml deleted file mode 100644 index 9dcf5cb20..000000000 --- a/tests/sys/pango-sys/Cargo.toml +++ /dev/null @@ -1,73 +0,0 @@ -[build-dependencies] -pkg-config = "0.3.7" -system-deps = "6" - -[dependencies] -bitflags = "2.2" -libc = "0.2" - -[dependencies.glib] -package = "glib-sys" -path = "../glib-sys" - -[dependencies.gobject] -package = "gobject-sys" -path = "../gobject-sys" - -[features] -v1_31 = [] -v1_32 = ["v1_31"] -v1_32_4 = ["v1_32"] -v1_34 = ["v1_32_4"] -v1_36_7 = ["v1_34"] -v1_38 = ["v1_36_7"] -v1_42 = ["v1_38"] -v1_44 = ["v1_42"] -v1_46 = ["v1_44"] - -[lib] -name = "pango_sys" - -[package] -build = "build.rs" -name = "pango-sys" -version = "0.2.0" -edition = "2021" -[package.metadata.system-deps.pango] -name = "pango" -version = "1.30" - -[package.metadata.system-deps.pango.v1_31] -version = "1.31" - -[package.metadata.system-deps.pango.v1_32] -version = "1.32" - -[package.metadata.system-deps.pango.v1_32_4] -version = "1.32.4" - -[package.metadata.system-deps.pango.v1_34] -version = "1.34" - -[package.metadata.system-deps.pango.v1_36_7] -version = "1.36.7" - -[package.metadata.system-deps.pango.v1_38] -version = "1.38" - -[package.metadata.system-deps.pango.v1_42] -version = "1.42" - -[package.metadata.system-deps.pango.v1_44] -version = "1.44" - -[package.metadata.system-deps.pango.v1_46] -version = "1.46" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dev-dependencies] -shell-words = "1.0.0" -tempfile = "3" diff --git a/tests/sys/test.sh b/tests/sys/test.sh deleted file mode 100755 index 41b8f37e4..000000000 --- a/tests/sys/test.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -GIR="cargo run --release --" -FEATURES="" -if [ "$1" = "full" ]; then - FEATURES="$FEATURES full" -fi -export RUST_LOG="gir=warn" - -cd "`dirname $0`" -cargo build --release || exit 1 - -for TOML in gir-*.toml; do - $GIR -c ${TOML} || exit 2 -done