From 4f940099da0da5c99cff120ca008940e6e123f95 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Thu, 10 Aug 2023 19:53:20 -0400 Subject: [PATCH] Added the build scripts for kifu-gtk --- Cargo.lock | 65 ++++++++++++------- Cargo.toml | 3 +- build.sh | 2 + kifu/gtk/Cargo.toml | 14 ++-- .../bin => kifu-gtk-screenplay}/screenplay.rs | 0 5 files changed, 54 insertions(+), 30 deletions(-) rename kifu/{gtk/src/bin => kifu-gtk-screenplay}/screenplay.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 9891333..76e05d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -367,7 +367,7 @@ dependencies = [ "geo-types", "gio", "glib", - "glib-build-tools", + "glib-build-tools 0.16.3", "gtk4", "ifc", "lazy_static", @@ -869,6 +869,12 @@ version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "251935cb159350458a627642b0852a7fb8e027e3c5916dc2cebcd70f025de3fc" +[[package]] +name = "glib-build-tools" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a65d79efe318ef2cbbbb37032b125866fd82c34ea44c816132621bbc552e716" + [[package]] name = "glib-macros" version = "0.17.10" @@ -1085,7 +1091,7 @@ dependencies = [ "coordinates", "gio", "glib", - "glib-build-tools", + "glib-build-tools 0.16.3", "gtk4", "image", ] @@ -1313,6 +1319,21 @@ dependencies = [ "typeshare", ] +[[package]] +name = "kifu-gtk" +version = "0.1.0" +dependencies = [ + "cairo-rs", + "gio", + "glib", + "glib-build-tools 0.17.10", + "gtk4", + "image", + "kifu-core", + "screenplay", + "tokio", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1736,9 +1757,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2262,9 +2283,9 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -2743,9 +2764,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f51fb4c64f8b770a823c043c7fad036323e1c48f55287b7bbb7987b2fcdf3b" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2758,45 +2779,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde1bb55ae4ce76a597a8566d82c57432bc69c039449d61572a7a353da28f68c" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1513e8d48365a78adad7322fd6b5e4c4e99d92a69db8df2d435b25b1f1f286d4" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60587c0265d2b842298f5858e1a5d79d146f9ee0c37be5782e92a6eb5e1d7a83" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224fe0e0ffff5d2ea6a29f82026c8f43870038a0ffc247aa95a52b47df381ac4" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc52a0f50a088de499712cbc012df7ebd94e2d6eb948435449d76a6287e7ad" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2093925509d91ea3d69bcd20238f4c2ecdb1a29d3c281d026a09705d0dd35f3d" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.3" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ade45bc8bf02ae2aa34a9d54ba660a1a58204da34ba793c00d83ca3730b5f1" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" diff --git a/Cargo.toml b/Cargo.toml index 25f3e94..2d81067 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,10 +9,11 @@ members = [ "emseries", "flow", "fluent-ergonomics", - "kifu/core", "geo-types", "hex-grid", "ifc", + "kifu/core", + "kifu/gtk", "memorycache", "screenplay", "sgf", diff --git a/build.sh b/build.sh index 579cc62..ebfc926 100755 --- a/build.sh +++ b/build.sh @@ -16,6 +16,8 @@ RUST_ALL_TARGETS=( "geo-types" "hex-grid" "ifc" + "kifu-core" + "kifu-gtk" "memorycache" "screenplay" "sgf" diff --git a/kifu/gtk/Cargo.toml b/kifu/gtk/Cargo.toml index c66cf17..fe09ef7 100644 --- a/kifu/gtk/Cargo.toml +++ b/kifu/gtk/Cargo.toml @@ -21,12 +21,12 @@ screenplay = { path = "../../screenplay" } [build-dependencies] glib-build-tools = "0.17" -[[bin]] -name = "kifu-gtk" -path = "src/main.rs" +# [[bin]] +# name = "kifu-gtk" +# path = "src/main.rs" -[[bin]] -name = "screenplay" -path = "src/bin/screenplay.rs" -required-features = [ "screenplay" ] +# [[bin]] +# name = "screenplay" +# path = "src/bin/screenplay.rs" +# required-features = [ "screenplay" ] diff --git a/kifu/gtk/src/bin/screenplay.rs b/kifu/kifu-gtk-screenplay/screenplay.rs similarity index 100% rename from kifu/gtk/src/bin/screenplay.rs rename to kifu/kifu-gtk-screenplay/screenplay.rs