From 4dcd4d78938f2398367e38f85c7d1d8bd3440d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Wed, 18 May 2022 16:58:04 +0300 Subject: [PATCH] Do not rename paths in rust projects anymore, after build (already done by the meta crate). --- erdpy/projects/project_base.py | 1 - erdpy/projects/project_clang.py | 6 ++++-- erdpy/projects/project_cpp.py | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/erdpy/projects/project_base.py b/erdpy/projects/project_base.py index 17638998..c1d23488 100644 --- a/erdpy/projects/project_base.py +++ b/erdpy/projects/project_base.py @@ -26,7 +26,6 @@ def build(self, options: Union[Dict[str, Any], None] = None) -> List[Path]: self._ensure_dependencies_installed() self.perform_build() contract_paths = self._do_after_build_custom() - contract_paths = rename_wasm_files(contract_paths, self.options.get("wasm_name")) self._do_after_build_core() return contract_paths diff --git a/erdpy/projects/project_clang.py b/erdpy/projects/project_clang.py index 60603002..af89c6ab 100644 --- a/erdpy/projects/project_clang.py +++ b/erdpy/projects/project_clang.py @@ -6,7 +6,7 @@ from typing import List from erdpy import dependencies, errors, myprocess, utils -from erdpy.projects.project_base import Project +from erdpy.projects.project_base import Project, rename_wasm_files logger = logging.getLogger('ProjectClang') @@ -109,7 +109,9 @@ def _do_after_build_custom(self) -> List[Path]: ll_file.unlink() except FileNotFoundError: pass - return [output_wasm_file] + + paths = rename_wasm_files([output_wasm_file], self.options.get("wasm_name")) + return paths def _get_llvm_path(self): return dependencies.get_module_directory('llvm') diff --git a/erdpy/projects/project_cpp.py b/erdpy/projects/project_cpp.py index db78bbb1..60ff98c7 100644 --- a/erdpy/projects/project_cpp.py +++ b/erdpy/projects/project_cpp.py @@ -6,7 +6,7 @@ from typing import List from erdpy import dependencies, errors, myprocess, utils -from erdpy.projects.project_base import Project +from erdpy.projects.project_base import Project, rename_wasm_files logger = logging.getLogger("ProjectCpp") @@ -87,7 +87,9 @@ def _do_after_build_custom(self) -> List[Path]: os.remove(source_file.with_suffix(".wasm")) os.remove(source_file.with_suffix(".ll")) os.remove(source_file.with_suffix(".o")) - return [output_wasm_file] + + paths = rename_wasm_files([output_wasm_file], self.options.get("wasm_name")) + return paths def _get_llvm_path(self): return dependencies.get_module_directory("llvm")