wip

.github/workflows/test.yaml

@@ -13,7 +13,6 @@ defaults:
   run:
     shell: bash
 
-
 jobs:
   run-test:
     permissions:
@@ -27,5 +26,12 @@ jobs:
         toolchain: stable
     - uses: Swatinem/rust-cache@v1
     - run: cargo install just
-    # - run: just test
+    - name: Install checkexec
+      shell: bash
+      run: |
+        which checkexec && exit 0
+        curl -LO https://github.com/kurtbuilds/checkexec/releases/download/v0.2.0/checkexec-v0.2.0-x86_64-unknown-linux-musl.tar.gz
+        tar xvzf checkexec-v0.2.0-x86_64-unknown-linux-musl.tar.gz checkexec
+        chmod +x checkexec
+        sudo mv checkexec /usr/local/bin
     - run: cargo test

.gitignore

@@ -1,14 +1,4 @@
 target/
-
-.env*
-!.env.example
-
-.env*
-!.env.example
-
-.env*
-!.env.example
-
 .env*
 !.env.example
 gen

Justfile

@@ -96,6 +96,7 @@ generate:
     cargo run -- gen --name $SERVICE --output-dir $REPO_DIR --generator $SOURCEGEN --github $REPO --version $VERSION $LIBRARY $SPEC
 
 test *ARGS:
+    checkexec commercial -- just dummy_commercial
     cd core && cargo test -- "$@"
     cd libninja && cargo test -- "$@"
 alias t := test
@@ -129,4 +130,10 @@ push:
     bash ocg/script/push.sh
 
 commercial:
+    rm -rf commercial
     git clone https://github.com/kurtbuilds/libninja-commercial commercial
+
+# Create a dummy commercial repo that lets the workspace work
+# without the commericial code
+dummy_commercial:
+    cargo new --lib commercial --name libninja_commercial

README.md

@@ -29,3 +29,10 @@ cargo install --git https://github.com/kurtbuilds/libninja
 Use the command line help to see required arguments & options when generating libraries.
 
 The open source version builds client libraries for Rust. Libninja also supports other languages with a commercial license. Reach out at the email in author Github profile.
+
+
+# Development
+
+If you run into errors about a missing `commericial` package, run the command `just dummy_commericial` to create a dummy
+package.
+

libninja/src/rust.rs

@@ -93,6 +93,9 @@ pub fn calculate_extras(spec: &HirSpec) -> Extras {
 
 pub fn copy_from_target_templates(opts: &OutputOptions) -> Result<()> {
     let template_path = opts.dest_path.join("template");
+    if !template_path.exists() {
+        return Ok(());
+    }
     for path in ignore::Walk::new(&template_path) {
         let path: ignore::DirEntry = path?;
         let rel_path = path.path().strip_prefix(&template_path)?;