Working on downloading and building our own deps

package.dds

@@ -2,7 +2,6 @@ Name: dds
 Version: 0.1.0
 
 Depends: neo-buffer 0.1.0
-Depends: taywee-args 0.0.0
 Depends: spdlog 1.4.2
 Depends: ms-wil 2019.11.10
 Depends: range-v3 0.9.1

remote.dds

@@ -0,0 +1,7 @@
+Remote-Package: nlohmann-json 3.7.1; git url=https://github.com/vector-of-bool/json.git ref=dds/3.7.1
+Remote-Package: range-v3 0.9.1; git url=https://github.com/vector-of-bool/range-v3.git ref=dds/0.9.1
+Remote-Package: ms-wil 2019.11.10; git url=https://github.com/vector-of-bool/wil.git ref=dds/2019.11.10
+Remote-Package: spdlog 1.4.2; git url=https://github.com/vector-of-bool/spdlog.git ref=dds/1.4.2
+
+# XXX: Don't depend on a moving revision!
+Remote-Package: neo-buffer 0.1.0; git url=https://github.com/vector-of-bool/neo-buffer.git ref=develop

tools/dds_ci/cli.py

@@ -1,5 +1,7 @@
 from argparse import ArgumentParser
 
+from dds_ci import paths
+
 
 def add_tc_arg(parser: ArgumentParser, *, required=True) -> None:
     parser.add_argument(
@@ -14,4 +16,4 @@ def add_dds_exe_arg(parser: ArgumentParser, *, required=True) -> None:
         '--exe',
         '-e',
         help='Path to a DDS executable to use',
-        require=required)
+        required=required)

tools/self_deps_build.py

@@ -0,0 +1,30 @@
+import argparse
+from pathlib import Path
+
+from dds_ci import cli, proc, paths
+
+
+def self_deps_build(exe: Path, toolchain: str, repo_dir: Path,
+                    remote_list: Path) -> None:
+    proc.check_run(
+        exe,
+        'deps',
+        'build',
+        ('--repo-dir', repo_dir),
+        ('-T', toolchain),
+    )
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    cli.add_dds_exe_arg(parser)
+    cli.add_tc_arg(parser)
+    parser.add_argument('--repo-dir', default=paths.SELF_TEST_REPO_DIR)
+    args = parser.parse_args()
+    self_deps_build(
+        Path(args.exe), args.toolchain, args.repo_dir,
+        paths.PROJECT_ROOT / 'remote.dds')
+
+
+if __name__ == "__main__":
+    main()

tools/self_deps_get.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from dds_ci import proc
+from dds_ci import proc, paths
 
 PROJECT_ROOT = Path(__file__).absolute().parent.parent
 
@@ -16,5 +16,4 @@ def self_deps_get(dds_exe: Path, repo_dir: Path) -> None:
 
 
 if __name__ == "__main__":
-    self_deps_get(PROJECT_ROOT / '_build/dds',
-                  PROJECT_ROOT / '_build/_self-repo')
+    self_deps_get(paths.CUR_BUILT_DDS, paths.SELF_TEST_REPO_DIR)