4.10

Author: zhangzijie-pro

.github/workflows/rust.yml

@@ -10,11 +10,22 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build:
-
+  build_ubuntu:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Build
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Build on Linux
+      run: cargo build --release
+
+  build_windows:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Build on Windows
       run: cargo build --release

Cargo.lock

@@ -3,15 +3,15 @@
 欢迎使用 Tiks，一个简易的 Linux 终端命令行工具，类似于常见的 Linux 终端环境，提供了一系列常用的命令和功能。
 #### 供参考，若有错误改进地方可push到main
 
-![Project Logo](images/new.png)
-
 ## 环境变量
 
 如果想将其加入环境变量：
 
 ```bash
     Cargo build --release
     cp | copy  ./target/release/tiks  $HOME/.Tiks/bin
+    或者下载 tiks / tiks.exe
+    添加至.Tiks目录下的bin中
 ```
 
 - Windows:     执行./window/setup.bat    ->  setx PATH "%PATH%;%TIKS_DIR%\bin"
@@ -21,7 +21,7 @@
 
 如果想向其中添加其余函数:
 
-- C: [详见C添加方法](./command/c_build/README.md)
+- C\C++: [详见添加方法](./command/c_build/README.md)
 - rust: [详间rust添加方法](./command/src/commands/README.md)
 
 ## 功能特点

README.md

@@ -23,7 +23,6 @@ rpassword = "7.3.0"
 libc = "0.2.153"
 base64 = "0.22.0"
 
-
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 term_size = "0.3.0"
 termion = "3.0.0"
@@ -35,6 +34,9 @@ path = "bin/main.rs"
 [build]
 target_name = "tiks"
 
+[build-dependencies]
+cc = "1.0"
+
 [profile.dev]
 panic = "abort"
 

command/Cargo.toml

@@ -6,16 +6,14 @@
 // There is some error or other suggestions contact me : [email protected]
 // Cargo run
 
-
-
 use command::env::init_env;
 use command::run::init_shell;
 use command::start_logo::start_logo;
 use command::root::new_session;
 
 fn main() {
         start_logo();
-
+        
         // new user
         let mut session_context = new_session();
 

command/bin/main.rs

@@ -0,0 +1,6 @@
+fn main(){
+    // file: c_build/your.c\
+    // compile: your function name
+    cc::Build::new()
+        .file("");
+}

command/build.rs

@@ -3,31 +3,49 @@
 确保你的系统中存在C/C++环境与gcc工具链
 
 - 向文件夹c中加入你的c代码后
--  chmod +x ./build_c.sh
--  Usage: ./build_c.sh <source_file> <output_object_file(.c)> <output_shared_library_file(.so)>
+- 见一下代码    [详细的了解cc](https://docs.rs/cc/1.0.92/cc/)
 
 
 完成后，可在command.rs中声明方法，并在arg.rs中进行配置
 详见:[rust添加方法](../src/commands/README.md)
 
-```bash
-    ./build_c.sh vim vim.c vim.so
-```
-
-
 ```rust
-    extern {
-        fn vim_edit(filename: *const libc::c_char);
+    
+    //build.rs
+    // C
+    fn main() {
+        cc::Build::new()
+            .file("foo.c")
+            .file("bar.c")
+            .compile("foo");
     }
 
-    #[link(name = "vim")]
-    extern {}
+    // C++
+    fn main(){
+        cc::Build::new()
+            .cpp(true)
+            .file("foo.cpp")
+            .compile("foo")
+    }
+    
+    // cargo build 后会将以上.c文件编译为libfoo.a
+    // 如果你的方法中包含有
+    void foo_function(void) { ... }  和  int32_t bar_function(int32_t x) { ... }
 
-    fn main() {
-        let filename = "example.txt";
+
+    extern "C" {
+        fn foo_function();
+        fn bar_function(x: i32) -> i32;
+    }
+
+    pub fn call() {
         unsafe {
-            let filename_c = std::ffi::CString::new(filename).expect("CString::new failed");
-            vim_edit(filename_c.as_ptr());
+            foo_function();
+            bar_function(42);
         }
     }
+
+    fn main() {
+        call();
+    }
 ```

command/c_build/README.md

@@ -16,6 +16,9 @@ pub struct Package{
 }
 
 // apt install 
+
+
+// upload soon
 impl Package{
     pub  fn new(name: String, version: String, download_link: String) -> Package{
         Package{
@@ -58,6 +61,8 @@ async fn download(link: &str, filename: &str) -> Result<(),Box<dyn std::error::E
 
 
 // apt update new
+
+// upload soon
 pub fn update(version: &str) -> std::io::Result<()>{
     let mut version = version;
     let home = dirs::home_dir().unwrap();

command/src/commands/download.rs

@@ -1,5 +1,5 @@
 #[cfg(target_os="linux")]
-fn set_env_l() -> (usize,String){
+fn set_env() -> (usize,String){
     use std::{env, path::PathBuf};
 
     use crate::state_code::env;
@@ -26,7 +26,7 @@ fn set_env_l() -> (usize,String){
 }
 
 #[cfg(target_os="windows")]
-fn set_env_w() -> (usize,String){
+fn set_env() -> (usize,String){
     use std::env;
     use std::path::PathBuf;
 
@@ -48,7 +48,7 @@ fn set_env_w() -> (usize,String){
 
 pub fn init_env(){
     #[cfg(target_os="windows")]
-    set_env_w();
+    set_env();
     #[cfg(target_os="linux")]
-    set_env_l();
+    set_env();
 }

command/src/env/mod.rs

@@ -132,6 +132,7 @@ impl SessionContext{
                 }
             },
             Err(_) =>{
+                println!("Tiks::welcome-to-try\r\nplease add your account");
                 #[cfg(target_os="linux")]
                 init_setup_linux();
                 #[cfg(target_os="mac")]
@@ -247,9 +248,7 @@ fn init_setup_mac() {
 
 #[cfg(target_os="windows")]
 fn init_setup_windows() {
-    Command::new("cmd")
-        .arg("/C")
-        .arg("./window/setup.bat")
+    Command::new("./window/setup.bat")
         .spawn()
         .expect("Error: Can't setup on Windows");
 }