diff --git a/port/linux/update-compiler.sh b/port/linux/update-compiler.sh index e0bd561df..4d7ac231f 100644 --- a/port/linux/update-compiler.sh +++ b/port/linux/update-compiler.sh @@ -1,8 +1,6 @@ ROOT=$PWD cd ../../tools/pikaCompiler cargo clean -cargo build +sh build.sh cd $ROOT cp ../../tools/pikaCompiler/rust-msc-latest-linux package/pikascript/rust-msc-latest-linux -cp ../../tools/pikaCompiler/target/debug/rust-msc package/pikascript/rust-msc-latest-linux -# cp ../../tools/pikaCompiler/target/debug/rust-msc.exe package/pikascript/rust-msc-latest-win10.exe diff --git a/tools/pikaByteCodeGen/main.c b/tools/pikaByteCodeGen/main.c index 851d0361f..8d06c664d 100644 --- a/tools/pikaByteCodeGen/main.c +++ b/tools/pikaByteCodeGen/main.c @@ -9,9 +9,14 @@ PikaObj* __pikaMain; +void pikaCompileFileWithInfo(char* filename){ + __platform_printf(" compiling %s...\r\n", filename); + pikaCompileFile(filename); +} + void main() { /* run pika_binder to bind C modules */ pika_binder(); - pikaCompileFile("main.py"); + pikaCompileFileWithInfo("main.py"); return; } diff --git a/tools/pikaCompiler/cross-build.sh b/tools/pikaCompiler/cross-build.sh index 37af75244..452edb29b 100644 --- a/tools/pikaCompiler/cross-build.sh +++ b/tools/pikaCompiler/cross-build.sh @@ -17,4 +17,3 @@ sh cross-win.sh cp build-win/pikaByteCodeGen.exe $ROOT/rust-msc-latest-win10-dev.exe cd $ROOT -chmod +x rust-msc-latest-linux diff --git a/tools/pikaCompiler/src/compiler.rs b/tools/pikaCompiler/src/compiler.rs index 046e2df92..4623735d7 100644 --- a/tools/pikaCompiler/src/compiler.rs +++ b/tools/pikaCompiler/src/compiler.rs @@ -120,9 +120,9 @@ impl Compiler { /* check if compiled */ if self.compiled_list.contains(&file_name) { } else if file_name == "main" { - println!(" compiling {}{}.py...", self.source_path, file_name); + println!(" loading {}{}.py...", self.source_path, file_name); } else { - println!(" compiling {}{}.pyi...", self.source_path, file_name); + println!(" binding {}{}.pyi...", self.source_path, file_name); } self.compiled_list.push_back(String::clone(&file_name)); /* solve top package. diff --git a/tools/pikaCompiler/src/entry.rs b/tools/pikaCompiler/src/entry.rs index 15e264de0..1496bd804 100644 --- a/tools/pikaCompiler/src/entry.rs +++ b/tools/pikaCompiler/src/entry.rs @@ -32,7 +32,7 @@ pub fn pika_compiler_entry(){ compiler = Compiler::__do_analize_file(compiler, String::from("PikaStdData"), true); compiler = Compiler::__do_analize_file(compiler, String::from("PikaDebug"), true); - println!(); + // println!(); /* write the infomatrion to compiler-info */ let mut compiler_info_file =