Browse Source

bump version to 0.1.4 (#17)

LoGin 1 year ago
parent
commit
bc00399460
3 changed files with 8 additions and 8 deletions
  1. 2 2
      Cargo.toml
  2. 6 5
      src/executor/mod.rs
  3. 0 1
      src/scheduler/mod.rs

+ 2 - 2
Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dadk"
 authors = ["longjin <longjin@DragonOS.org>", "chikejian <chikejian@DragonOS.org>"]
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 description = "DragonOS Application Development Kit\nDragonOS应用开发工具"
 license = "GPL-2.0-only"
@@ -23,5 +23,5 @@ regex = "1.9.1"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
 serde = { version = "1.0.160", features = ["serde_derive"] }
 serde_json = "1.0.96"
-simple_logger = "4.1.0"
+simple_logger = { version = "4.1.0", features = ["stderr"] }
 zip = "0.6"

+ 6 - 5
src/executor/mod.rs

@@ -348,6 +348,12 @@ impl Executor {
                 .add(EnvVar::new(tv.key().to_string(), tv.value().to_string()));
         }
 
+        // 添加`DADK_CURRENT_BUILD_DIR`环境变量,便于构建脚本把构建结果拷贝到这里
+        self.local_envs.add(EnvVar::new(
+            "DADK_CURRENT_BUILD_DIR".to_string(),
+            self.build_dir.path.to_str().unwrap().to_string(),
+        ));
+
         return Ok(());
     }
 
@@ -548,11 +554,6 @@ pub fn prepare_env(sched_entities: &SchedEntities) -> Result<(), ExecutorError>
             build_dir_key,
             build_dir.to_str().unwrap().to_string(),
         ));
-        // 添加`DADK_CURRENT_BUILD_DIR`环境变量,便于构建脚本把构建结果拷贝到这里
-        env_list.add(EnvVar::new(
-            "DADK_CURRENT_BUILD_DIR".to_string(),
-            build_dir.to_str().unwrap().to_string(),
-        ));
 
         // 如果需要源码缓存目录,则导出
         if CacheDir::need_source_cache(entity) {

+ 0 - 1
src/scheduler/mod.rs

@@ -509,7 +509,6 @@ impl Scheduler {
         mut count: usize,
         r: &Vec<Arc<SchedEntity>>,
     ) {
-        log::warn!("daemon");
         let mut guard = TASK_DEQUE.lock().unwrap();
         // 初始化0入度的任务实体
         let mut zero_entity: Vec<Arc<SchedEntity>> = Vec::new();