diff --git a/.changeset/flat-moles-lie.md b/.changeset/flat-moles-lie.md new file mode 100644 index 0000000..a755890 --- /dev/null +++ b/.changeset/flat-moles-lie.md @@ -0,0 +1,5 @@ +--- +"servify_build": minor +--- + +Initialize crate diff --git a/.changeset/fresh-oranges-move.md b/.changeset/fresh-oranges-move.md new file mode 100644 index 0000000..03d7b34 --- /dev/null +++ b/.changeset/fresh-oranges-move.md @@ -0,0 +1,7 @@ +--- +"servify_build": minor +"servify": minor +"servify_macro": minor +--- + +Added `#[servify::service_collected]` to automatically collect exports using build scripts. diff --git a/.changeset/twelve-teachers-look.md b/.changeset/twelve-teachers-look.md new file mode 100644 index 0000000..a845151 --- /dev/null +++ b/.changeset/twelve-teachers-look.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/.ci-scripts/release.rs b/.ci-scripts/release.rs index 7eef0eb..4674bd5 100755 --- a/.ci-scripts/release.rs +++ b/.ci-scripts/release.rs @@ -45,6 +45,10 @@ static PACKAGES: LazyLock> = LazyLock::new(|| { name: "servify_macro".to_string(), cargo_file: PathBuf::from("servify_macro/Cargo.toml"), }, + Package { + name: "servify_build".to_string(), + cargo_file: PathBuf::from("servify_build/Cargo.toml"), + }, ] }); diff --git a/.ci-scripts/version.rs b/.ci-scripts/version.rs index 1a1feed..c423112 100755 --- a/.ci-scripts/version.rs +++ b/.ci-scripts/version.rs @@ -33,6 +33,11 @@ static PACKAGES: LazyLock> = LazyLock::new(|| { pnpm_file: PathBuf::from("servify_macro/package.json"), cargo_file: PathBuf::from("servify_macro/Cargo.toml"), }, + Package { + name: "servify_build".to_string(), + pnpm_file: PathBuf::from("servify_build/package.json"), + cargo_file: PathBuf::from("servify_build/Cargo.toml"), + }, ] }); diff --git a/.github/workflows/rust-ci.yaml b/.github/workflows/rust-ci.yaml index e16fe26..1ef4d4e 100644 --- a/.github/workflows/rust-ci.yaml +++ b/.github/workflows/rust-ci.yaml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: toolchain: [stable, beta, nightly] - workspace: [servify, servify_macro] + workspace: [servify, servify_macro, servify_build, servify_tests] env: CARGO_TERM_COLOR: always @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - workspace: [servify, servify_macro] + workspace: [servify, servify_macro, servify_build, servify_tests] steps: - uses: actions/checkout@v4 @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - workspace: [servify, servify_macro] + workspace: [servify, servify_macro, servify_build, servify_tests] steps: - uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index c41267f..ffd182f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,13 +128,17 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "servify" -version = "0.1.0" +version = "0.1.1" dependencies = [ "pretty_assertions", "servify_macro", "tokio", ] +[[package]] +name = "servify_build" +version = "0.0.1" + [[package]] name = "servify_macro" version = "0.1.0" @@ -146,6 +150,13 @@ dependencies = [ "syn", ] +[[package]] +name = "servify_tests" +version = "0.1.0" +dependencies = [ + "servify_build", +] + [[package]] name = "syn" version = "2.0.77" diff --git a/Cargo.toml b/Cargo.toml index b85c5fa..1275085 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,10 @@ resolver = "2" members = [ - "servify", "servify_macro", + "servify", + "servify_macro", + "servify_build", + "servify_tests", ] [workspace.package] diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1f13400..b7898ea 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,4 @@ packages: - - 'servify/' - - 'servify_macro' + - "servify/" + - "servify_macro/" + - "servify_build/" diff --git a/servify_build/Cargo.toml b/servify_build/Cargo.toml new file mode 100644 index 0000000..60e6673 --- /dev/null +++ b/servify_build/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "servify_build" +version = "0.0.1" +edition.workspace = true +authors.workspace = true +license.workspace = true +repository.workspace = true +description = """ +Build scripts for use with Servify +""" + +[lib] diff --git a/servify_build/LICENSE-APACHE b/servify_build/LICENSE-APACHE new file mode 100644 index 0000000..1b5ec8b --- /dev/null +++ b/servify_build/LICENSE-APACHE @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/servify_build/LICENSE-MIT b/servify_build/LICENSE-MIT new file mode 100644 index 0000000..67d9b94 --- /dev/null +++ b/servify_build/LICENSE-MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 ぱるすいーと - puls' uite + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/servify_build/README.md b/servify_build/README.md new file mode 100644 index 0000000..2ecc872 --- /dev/null +++ b/servify_build/README.md @@ -0,0 +1,21 @@ +# Servify Build + +Build scripts for use with Servify + +## License + +Licensed under either of + + - Apache License, Version 2.0 + ([LICENSE-APACHE](LICENSE-APACHE)) + + - MIT license + ([LICENSE-MIT](LICENSE-MIT)) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. diff --git a/servify_build/package.json b/servify_build/package.json new file mode 100644 index 0000000..45d739d --- /dev/null +++ b/servify_build/package.json @@ -0,0 +1,8 @@ +{ + "name": "servify_build", + "version": "0.0.1", + "description": "Build scripts for use with Servify", + "keywords": [], + "author": "AsPulse ", + "license": "MIT/Apache-2.0" +} diff --git a/servify_build/src/lib.rs b/servify_build/src/lib.rs new file mode 100644 index 0000000..353be42 --- /dev/null +++ b/servify_build/src/lib.rs @@ -0,0 +1 @@ +pub fn build() {} diff --git a/servify_tests/Cargo.toml b/servify_tests/Cargo.toml new file mode 100644 index 0000000..f21588f --- /dev/null +++ b/servify_tests/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "servify_tests" +version = "0.1.0" +edition.workspace = true +authors.workspace = true +license.workspace = true +repository.workspace = true +description = """ +Tests for servify_build +""" + +[lib] + +[build_dependencies] +servify_build = { path = "../servify_build" } diff --git a/servify_tests/build.rs b/servify_tests/build.rs new file mode 100644 index 0000000..bcc2f63 --- /dev/null +++ b/servify_tests/build.rs @@ -0,0 +1,3 @@ +fn main() { + servify_build::build(); +} diff --git a/servify_tests/src/lib.rs b/servify_tests/src/lib.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/servify_tests/src/lib.rs @@ -0,0 +1 @@ +