Page MenuHomeSoftware Heritage
Paste P1144

(An Untitled Masterwork)
ActivePublic
Actions

Authored by vlorentz on Aug 31 2021, 2:38 PM.
diff --git a/setup.py b/setup.py
index d72b153..a7100a1 100755
--- a/setup.py
+++ b/setup.py
@@ -74,8 +74,10 @@ def finalize_options(self):
def run(self):
ql_dir = os.path.join(self.build_lib, "swh/search/query_language")
+ copy_ql_tree(ql_dir)
if not os.path.exists(os.path.join(ql_dir, "src/parser.c")):
- generate_parser(ql_dir, copy_tree=True)
+ self.run_command("ts_install")
+ generate_parser(ql_dir)
static_dir = os.path.join(self.build_lib, "swh/search/static")
os.makedirs(static_dir, exist_ok=True)
@@ -112,7 +114,8 @@ def make_release_tree(self, base_dir, files):
if not self.dry_run:
self.run_command("ts_install")
- generate_parser(dist_ql_path, copy_tree=True)
+ copy_ql_tree(dist_ql_path)
+ generate_parser(dist_ql_path)
class custom_develop(develop):
@@ -120,17 +123,18 @@ def run(self):
super().run()
if not self.dry_run:
- generate_parser("swh/search/query_language", copy_tree=False)
+ generate_parser("swh/search/query_language")
+
+def copy_ql_tree(dest_path):
+ # FIXME: setuptools should copy this itself...
+ print("Copying parser files")
+ if os.path.exists(dest_path):
+ shutil.rmtree(dest_path)
+ shutil.copytree("swh/search/query_language", dest_path)
-def generate_parser(dest_path, copy_tree):
- if copy_tree:
- # FIXME: setuptools should copy this itself...
- print("Copying parser files")
- if os.path.exists(dest_path):
- shutil.rmtree(dest_path)
- shutil.copytree("swh/search/query_language", dest_path)
+def generate_parser(dest_path):
print("Getting path")
path = subprocess.check_output([yarn, "bin"]).decode().strip()
env = {**os.environ, "PATH": os.pathsep.join([path, os.environ["PATH"]])}
About · Developer information · Legal