From 4a6ef023f5db016b65ad1674e87424cacf85a202 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sun, 15 Aug 2021 20:37:36 +0100 Subject: [PATCH 1/3] Rename agb-entry to agb-macro in cargo.tomls --- agb-entry/Cargo.lock | 2 +- agb-entry/Cargo.toml | 2 +- agb/Cargo.lock | 22 +++++++++++----------- agb/Cargo.toml | 2 +- agb/src/lib.rs | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/agb-entry/Cargo.lock b/agb-entry/Cargo.lock index 304e5599..f30d061f 100644 --- a/agb-entry/Cargo.lock +++ b/agb-entry/Cargo.lock @@ -3,7 +3,7 @@ version = 3 [[package]] -name = "agb_entry" +name = "agb_macros" version = "0.1.0" dependencies = [ "proc-macro2", diff --git a/agb-entry/Cargo.toml b/agb-entry/Cargo.toml index f88f91a6..6727c20f 100644 --- a/agb-entry/Cargo.toml +++ b/agb-entry/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "agb_entry" +name = "agb_macros" version = "0.1.0" authors = ["Gwilym Kuiper "] edition = "2018" diff --git a/agb/Cargo.lock b/agb/Cargo.lock index fa875b72..59d531b2 100644 --- a/agb/Cargo.lock +++ b/agb/Cargo.lock @@ -12,21 +12,11 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" name = "agb" version = "0.6.0" dependencies = [ - "agb_entry", "agb_image_converter", + "agb_macros", "bitflags", ] -[[package]] -name = "agb_entry" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "rand", - "syn", -] - [[package]] name = "agb_image_converter" version = "0.6.0" @@ -39,6 +29,16 @@ dependencies = [ "toml", ] +[[package]] +name = "agb_macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "rand", + "syn", +] + [[package]] name = "autocfg" version = "1.0.1" diff --git a/agb/Cargo.toml b/agb/Cargo.toml index 675ce260..99c47433 100644 --- a/agb/Cargo.toml +++ b/agb/Cargo.toml @@ -20,7 +20,7 @@ debug = true [dependencies] bitflags = "1.2" agb_image_converter = { version = "0.6.0", path = "../agb-image-converter" } -agb_entry = { version = "0.1.0", path = "../agb-entry" } +agb_macros = { version = "0.1.0", path = "../agb-entry" } [package.metadata.docs.rs] default-target = "thumbv6m-none-eabi" diff --git a/agb/src/lib.rs b/agb/src/lib.rs index 70f7ef6e..cb2a98fd 100644 --- a/agb/src/lib.rs +++ b/agb/src/lib.rs @@ -22,7 +22,7 @@ pub mod sound; pub use agb_image_converter::include_gfx; -pub use agb_entry::entry; +pub use agb_macros::entry; mod bitarray; pub mod interrupt; From a2da434013df9d0c8bd19262a3df1e450a4d174b Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sun, 15 Aug 2021 20:39:17 +0100 Subject: [PATCH 2/3] Rename the directory --- {agb-entry => agb-macros}/Cargo.lock | 0 {agb-entry => agb-macros}/Cargo.toml | 0 {agb-entry => agb-macros}/src/lib.rs | 0 agb/Cargo.toml | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename {agb-entry => agb-macros}/Cargo.lock (100%) rename {agb-entry => agb-macros}/Cargo.toml (100%) rename {agb-entry => agb-macros}/src/lib.rs (100%) diff --git a/agb-entry/Cargo.lock b/agb-macros/Cargo.lock similarity index 100% rename from agb-entry/Cargo.lock rename to agb-macros/Cargo.lock diff --git a/agb-entry/Cargo.toml b/agb-macros/Cargo.toml similarity index 100% rename from agb-entry/Cargo.toml rename to agb-macros/Cargo.toml diff --git a/agb-entry/src/lib.rs b/agb-macros/src/lib.rs similarity index 100% rename from agb-entry/src/lib.rs rename to agb-macros/src/lib.rs diff --git a/agb/Cargo.toml b/agb/Cargo.toml index 99c47433..8b651160 100644 --- a/agb/Cargo.toml +++ b/agb/Cargo.toml @@ -20,7 +20,7 @@ debug = true [dependencies] bitflags = "1.2" agb_image_converter = { version = "0.6.0", path = "../agb-image-converter" } -agb_macros = { version = "0.1.0", path = "../agb-entry" } +agb_macros = { version = "0.1.0", path = "../agb-macros" } [package.metadata.docs.rs] default-target = "thumbv6m-none-eabi" From 00debe98e85b3dc415c2c3310192fead4fd72256 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sun, 15 Aug 2021 20:40:48 +0100 Subject: [PATCH 3/3] Update all other references to agb-entry --- .github/workflows/publish-agb-entry.yml | 8 ++++---- .github/workflows/rust.yml | 4 ++-- release.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish-agb-entry.yml b/.github/workflows/publish-agb-entry.yml index c132ca60..53783780 100644 --- a/.github/workflows/publish-agb-entry.yml +++ b/.github/workflows/publish-agb-entry.yml @@ -1,9 +1,9 @@ -name: Publish agb-entry +name: Publish agb-macros on: push: tags: - - agb-entry/v* + - agb-macros/v* jobs: build: @@ -15,6 +15,6 @@ jobs: uses: actions/checkout@v2 - name: Login to crates.io run: cargo login ${{ secrets.CRATE_API }} - - name: Publish agb-entry + - name: Publish agb-macros run: cargo publish - working-directory: ./agb-entry \ No newline at end of file + working-directory: ./agb-macros \ No newline at end of file diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 8f32d62b..aa504826 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,8 +38,8 @@ jobs: - name: Run Clippy on agb image converter working-directory: agb-image-converter run: cargo clippy --verbose - - name: Run Clippy on agb entry - working-directory: agb-entry + - name: Run Clippy on agb macros + working-directory: agb-macros run: cargo clippy --verbose - name: Run Tests for agb in debug mode working-directory: agb diff --git a/release.sh b/release.sh index bd45f28f..6083308d 100755 --- a/release.sh +++ b/release.sh @@ -28,9 +28,9 @@ case "$PROJECT" in DIRECTORY="agb-image-converter" TAGNAME="agb-image-converter/v$VERSION" ;; - agb-entry) - DIRECTORY="agb-entry" - TAGNAME="agb-entry/v$VERSION" + agb-macros) + DIRECTORY="agb-macros" + TAGNAME="agb-macros/v$VERSION" ;; mgba-test-runner) DIRECTORY="mgba-test-runner"