fix merge conflicts

kcl-lang · Jul 4, 2022 · c589e87 · c589e87
2 parents efe821a + 8d20c6a
commit c589e87
Show file tree

Hide file tree

Showing 36 changed files with 2,372 additions and 303 deletions.
diff --git a/internal/kclvm_py/scripts/release.sh b/internal/kclvm_py/scripts/release.sh
@@ -8,6 +8,9 @@ kclvm_install_dir="kclvm"
 rm $kclvm_release_file
 
 cd $kclvm_package_dir
+if [[ x"$os" == "xDarwin" ]]; then
+    xattr -rc $kclvm_install_dir
+fi
 tar -czvf $kclvm_release_file $kclvm_install_dir
 
 mv $kclvm_package_dir/$kclvm_release_file $kclvm_release_path/$kclvm_release_file

diff --git a/internal/kclvm_py/scripts/update-kclvm.sh b/internal/kclvm_py/scripts/update-kclvm.sh
@@ -57,22 +57,22 @@ cp ./target/release/kclvm_cli $kclvm_install_dir/bin/kclvm_cli
 # libkclvm_cli
 
 # Darwin dylib
-if [ -e target/release/libkclvm_cli_cdylib.dylib ]; then
+if [ -e $topdir/kclvm/target/release/libkclvm_cli_cdylib.dylib ]; then
     touch $kclvm_install_dir/bin/libkclvm_cli_cdylib.dylib
     rm $kclvm_install_dir/bin/libkclvm_cli_cdylib.dylib
-    cp target/release/libkclvm_cli_cdylib.dylib $kclvm_install_dir/bin/libkclvm_cli_cdylib.dylib
+    cp $topdir/kclvm/target/release/libkclvm_cli_cdylib.dylib $kclvm_install_dir/bin/libkclvm_cli_cdylib.dylib
 fi
 # Linux so
-if [ -e target/release/libkclvm_cli_cdylib.so ]; then
+if [ -e $topdir/kclvm/target/release/libkclvm_cli_cdylib.so ]; then
     touch $kclvm_install_dir/bin/libkclvm_cli_cdylib.so
     rm $kclvm_install_dir/bin/libkclvm_cli_cdylib.so
-    cp target/release/libkclvm_cli_cdylib.so $kclvm_install_dir/bin/libkclvm_cli_cdylib.so
+    cp $topdir/kclvm/target/release/libkclvm_cli_cdylib.so $kclvm_install_dir/bin/libkclvm_cli_cdylib.so
 fi
 # Windows dll
-if [ -e target/release/libkclvm_cli_cdylib.dll ]; then
+if [ -e $topdir/kclvm/target/release/libkclvm_cli_cdylib.dll ]; then
     touch $kclvm_install_dir/bin/libkclvm_cli_cdylib.dll
     rm $kclvm_install_dir/bin/libkclvm_cli_cdylib.dll
-    cp target/release/libkclvm_cli_cdylib.dll $kclvm_install_dir/bin/libkclvm_cli_cdylib.dll
+    cp $topdir/kclvm/target/release/libkclvm_cli_cdylib.dll $kclvm_install_dir/bin/libkclvm_cli_cdylib.dll
 fi
 
 
@@ -93,34 +93,35 @@ echo "$RUST_LIBSTD" > $kclvm_install_dir/lib/rust-libstd-name.txt
 cd $topdir/kclvm/runtime
 ## Native
 cargo build --release
-cp target/release/libkclvm.a                        $kclvm_install_dir/lib/libkclvm_native.a
+cp $topdir/kclvm/target/release/libkclvm.a                        $kclvm_install_dir/lib/libkclvm_native.a
 
 # Darwin dylib
-if [ -e target/release/libkclvm.dylib ]; then
+if [ -e $topdir/kclvm/target/release/libkclvm.dylib ]; then
     touch $kclvm_install_dir/lib/libkclvm.dylib
     rm $kclvm_install_dir/lib/libkclvm.dylib
-    cp target/release/libkclvm.dylib $kclvm_install_dir/lib/
-    cp target/release/libkclvm.dylib $kclvm_install_dir/lib/libkclvm_native_shared.dylib
+    cp $topdir/kclvm/target/release/libkclvm.dylib $kclvm_install_dir/lib/
+    cp $topdir/kclvm/target/release/libkclvm.dylib $kclvm_install_dir/lib/libkclvm_native_shared.dylib
 fi
 # Linux so
-if [ -e target/release/libkclvm.so ]; then
+if [ -e $topdir/kclvm/target/release/libkclvm.so ]; then
     touch $kclvm_install_dir/lib/libkclvm.so
     rm $kclvm_install_dir/lib/libkclvm.so
-    cp target/release/libkclvm.so $kclvm_install_dir/lib/
-    cp target/release/libkclvm.so $kclvm_install_dir/lib/libkclvm_native_shared.so
+    cp $topdir/kclvm/target/release/libkclvm.so $kclvm_install_dir/lib/
+    cp $topdir/kclvm/target/release/libkclvm.so $kclvm_install_dir/lib/libkclvm_native_shared.so
 fi
 # Windows dll
-if [ -e target/release/libkclvm.dll ]; then
+if [ -e $topdir/kclvm/target/release/libkclvm.dll ]; then
     touch $kclvm_install_dir/lib/libkclvm.dll
     rm $kclvm_install_dir/lib/libkclvm.dll
-    cp target/release/libkclvm.dll $kclvm_install_dir/lib/
-    cp target/release/libkclvm.dll $kclvm_install_dir/lib/libkclvm_native_shared.dll
+    cp $topdir/kclvm/target/release/libkclvm.dll $kclvm_install_dir/lib/
+    cp $topdir/kclvm/target/release/libkclvm.dll $kclvm_install_dir/lib/libkclvm_native_shared.dll
 fi
 
 # WASM
-# cargo build --release --target wasm32-unknown-unknown
-# cp target/wasm32-unknown-unknown/release/libkclvm.a $kclvm_install_dir/lib/libkclvm_wasm32.a
-# cp src/_kclvm_undefined_wasm.txt $kclvm_install_dir/lib/_kclvm_undefined_wasm.txt
+cargo build --release --target wasm32-unknown-unknown
+cp $topdir/kclvm/target/wasm32-unknown-unknown/release/libkclvm.a $kclvm_install_dir/lib/libkclvm_wasm32.a
+cp src/_kclvm_undefined_wasm.txt $kclvm_install_dir/lib/_kclvm_undefined_wasm.txt
+
 
 cp src/_kclvm.bc $kclvm_install_dir/include/_kclvm.bc
 cp src/_kclvm.h  $kclvm_install_dir/include/_kclvm.h