Split CLI into its own crate

.github/workflows/nightly_release.yml

@@ -31,7 +31,7 @@
 #      uses: actions-rs/cargo@v1
 #      with:
 #        command: test
-#        args: --release --verbose
+#        args: --release --verbose --workspace
 #
 #    - name: Get previous nightly Release info
 #      uses: octokit/[email protected]
@@ -73,7 +73,7 @@
 #      with:
 #        use-cross: true
 #        command: build
-#        args: --release --verbose --target=x86_64-pc-windows-gnu
+#        args: --release --verbose --package customasm-cli --target=x86_64-pc-windows-gnu
 #
 #    - name: Create remote nightly tag
 #      env:
@@ -114,4 +114,4 @@
 #        upload_url: ${{ steps.create_release.outputs.upload_url }}
 #        asset_path: ./pkg/pkg.zip
 #        asset_name: customasm_${{ env.RELEASE_TAG }}_win64.zip
-#        asset_content_type: application/zip
+#        asset_content_type: application/zip

.github/workflows/release.yml

@@ -25,14 +25,14 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --release --verbose
+        args: --release --verbose --workspace
 
     - name: Build
       uses: actions-rs/cargo@v1
       with:
         use-cross: true
         command: build
-        args: --release --verbose --target=x86_64-pc-windows-gnu
+        args: --release --verbose --package customasm-cli --target=x86_64-pc-windows-gnu
 
     - name: Create Release
       id: create_release
@@ -65,4 +65,4 @@ jobs:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ./pkg/pkg.zip
         asset_name: customasm_win64.zip
-        asset_content_type: application/zip
+        asset_content_type: application/zip

.github/workflows/test.yml

@@ -2,17 +2,7 @@ name: Test Build
 
 on:
   push:
-    branches:
-      - master
-      - dev
-      - 'dev-*'
-      - 'feature-*'
   pull_request:
-    branches:
-      - master
-      - dev
-      - 'dev-*'
-      - 'feature-*'
 
 jobs:
   build:
@@ -22,6 +12,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build
-      run: cargo build --verbose
+      run: cargo build --verbose --workspace
     - name: Run tests
-      run: cargo test --verbose
+      run: cargo test --verbose --workspace

Cargo.toml

@@ -9,7 +9,7 @@ repository = "https://github.com/hlorenzi/customasm"
 readme = "README.md"
 license = "Apache-2.0"
 keywords = ["asm", "assembler", "assembly", "custom"]
-categories = ["command-line-utilities", "hardware-support"]
+categories = ["hardware-support"]
 exclude = ["web/*"]
 build = "src/build.rs"
 
@@ -18,18 +18,15 @@ crate-type = ["lib", "cdylib"]
 name = "customasm"
 path = "src/lib.rs"
 
-[[bin]]
-name = "customasm"
-path = "src/main.rs"
-
 [dependencies]
-getopts = "0.2.17"
 num-bigint = { version = "0.1", default_features = false }
 num-traits = { version = "0.1", default_features = false }
 num-integer = { version = "0.1", default_features = false }
 
 [dev-dependencies]
 sha2 = "0.9.1"
 
-[build-dependencies]
-vergen = "3.1.0"
+[workspace]
+members = [
+    "customasm-cli",
+]

build_ghpages.ps1

@@ -7,7 +7,7 @@ Remove-Item -Path .gitignore
 Copy-Item -Path .gitignore.ghpages -Destination .gitignore
 
 # Build wasm binary
-cargo build --lib --target wasm32-unknown-unknown --release
+cargo build --lib --target wasm32-unknown-unknown --release --workspace
 
 # Reduce binary size
 wasm-gc "./target/wasm32-unknown-unknown/release/customasm.wasm" -o "./target/wasm32-unknown-unknown/release/customasm.gc.wasm"
@@ -21,4 +21,4 @@ git commit -m "build GitHub Pages"
 git push -f origin ghpages
 
 # Return to main branch
-git checkout main
+git checkout main

build_wasm.ps1

@@ -1,5 +1,5 @@
 # Build wasm binary
-cargo build --lib --target wasm32-unknown-unknown --release
+cargo build --lib --target wasm32-unknown-unknown --release --workspace
 
 # Reduce binary size
 wasm-gc "./target/wasm32-unknown-unknown/release/customasm.wasm" -o "./target/wasm32-unknown-unknown/release/customasm.gc.wasm"

customasm-cli/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "customasm-cli"
+version = "0.11.10"
+edition = "2018"
+authors = ["hlorenzi <https://hlorenzi.com>"]
+description = "An assembler for custom, user-defined instruction sets!"
+homepage = "https://github.com/hlorenzi/customasm"
+repository = "https://github.com/hlorenzi/customasm"
+license = "Apache-2.0"
+keywords = ["asm", "assembler", "assembly", "custom"]
+categories = ["command-line-utilities", "hardware-support"]
+
+[dependencies]
+customasm = { path = "../" }
+getopts = "0.2.17"
+
+[build-dependencies]
+vergen = "3.1.0"
+
+[[bin]]
+name = "customasm"
+path = "src/main.rs"

customasm-cli/build.rs

@@ -0,0 +1,16 @@
+extern crate vergen;
+
+
+use vergen::{generate_cargo_keys, ConstantsFlags};
+
+
+fn main()
+{
+    let mut flags = ConstantsFlags::empty();
+    flags.toggle(ConstantsFlags::REBUILD_ON_HEAD_CHANGE);
+    flags.toggle(ConstantsFlags::SEMVER_LIGHTWEIGHT);
+    flags.toggle(ConstantsFlags::COMMIT_DATE);
+    flags.toggle(ConstantsFlags::TARGET_TRIPLE);
+
+    generate_cargo_keys(flags).expect("Unable to generate the cargo keys!");
+}