everything is a mess and broken

Author: aappleby

.github/copilot-instructions.md

@@ -58,6 +58,16 @@
       "justMyCode": false,
       "preLaunchTask": "Wipe build",
     },
+    {
+      "name": "Debug scratch/build.hancho",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/hancho.py",
+      "cwd": "${workspaceFolder}/scratch",
+      "console": "integratedTerminal",
+      "justMyCode": false,
+      "preLaunchTask": "Wipe build",
+    },
     {
       "name": "Debug hancho.py in scratch/",
       "type": "debugpy",

.vscode/launch.json

@@ -3,7 +3,7 @@ import os
 ####################################################################################################
 # C++
 
-default_toolchain = hancho.config(
+default_toolchain = hancho.Config(
     arch = "x86-64",
     compiler = "x86_64-linux-gnu-g++",
     linker = "x86_64-linux-gnu-g++",
@@ -82,17 +82,17 @@ link_cpp_bin = hancho.Tool(
 def cpp_lib(hancho, *, in_srcs=None, in_objs=None, in_libs=None, out_lib, **kwargs):
     in_objs = hancho.flatten(in_objs)
     for file in hancho.flatten(in_srcs):
-        obj = hancho.task(compile_cpp, in_src=file, **kwargs)
+        obj = hancho.Task(compile_cpp, in_src=file, **kwargs)
         in_objs.append(obj)
-    return hancho.task(link_cpp_lib, in_objs=[in_objs, in_libs], out_lib=out_lib, **kwargs)
+    return hancho.Task(link_cpp_lib, in_objs=[in_objs, in_libs], out_lib=out_lib, **kwargs)
 
 
 def cpp_bin(hancho, *, in_srcs=None, in_objs=None, in_libs=None, out_bin, **kwargs):
     in_objs = hancho.flatten(in_objs)
     for file in hancho.flatten(in_srcs):
-        obj = hancho.task(compile_cpp, in_src=file, **kwargs)
+        obj = hancho.Task(compile_cpp, in_src=file, **kwargs)
         in_objs.append(obj)
-    return hancho.task(
+    return hancho.Task(
         link_cpp_bin,
         in_objs=[in_objs, in_libs],
         out_bin=out_bin,
@@ -111,7 +111,7 @@ def make(hancho, *, in_makefile, **kwargs):
         make_file="{path.basename(in_makefile)}",
         flags="--quiet",
     )
-    return hancho.task(cmd, in_makefile=in_makefile, **kwargs)
+    return hancho.Task(cmd, in_makefile=in_makefile, **kwargs)
 
 
 ####################################################################################################
@@ -127,11 +127,11 @@ run_test = hancho.Tool(
 )
 
 def cpp_test(hancho, *, in_srcs=None, in_objs=None, in_libs=None, out_bin, **kwargs):
-    objs = [hancho.task(compile_cpp, in_src=src, **kwargs) for src in hancho.flatten(in_srcs)]
-    test_bin = hancho.task(
+    objs = [hancho.Task(compile_cpp, in_src=src, **kwargs) for src in hancho.flatten(in_srcs)]
+    test_bin = hancho.Task(
         link_cpp_bin,
         in_objs=[objs, in_objs, in_libs],
         out_bin=out_bin,
         **kwargs
     )
-    return hancho.task(run_test, in_test=test_bin, **kwargs)
+    return hancho.Task(run_test, in_test=test_bin, **kwargs)

AGENTS.md

@@ -1,4 +1,12 @@
+print("Hello World from hancho/build.hancho")
+
 #base_tools  = hancho.repo("{hancho_dir}/base_tools.hancho")
 #fpga_tools  = hancho.repo("{hancho_dir}/fpga_tools.hancho")
 #riscv_tools = hancho.repo("{hancho_dir}/riscv_tools.hancho")
 #wasm_tools  = hancho.repo("{hancho_dir}/wasm_tools.hancho")
+
+print(dir(hancho))
+
+task = hancho.Task(command = "ls")
+
+print(task)

base_tools.hancho

@@ -1,4 +1,4 @@
-hancho.task(
+hancho.Task(
     hancho.tools.cc_binary,
     in_srcs = "hello-world.cc",
     out_bin = "hello-world",

build.hancho

@@ -50,6 +50,6 @@ _link_cpp_bin = hancho.Tool(
 )
 
 def cc_binary(hancho, *, in_srcs, out_bin):
-    objs = [hancho.task(_compile_cpp, in_src=src) for src in hancho.flatten(in_srcs)]
-    bin  = hancho.task(_link_cpp_bin, in_objs=objs, out_bin=out_bin)
+    objs = [hancho.Task(_compile_cpp, in_src=src) for src in hancho.flatten(in_srcs)]
+    bin  = hancho.Task(_link_cpp_bin, in_objs=objs, out_bin=out_bin)
     return bin

examples/bazel-cpp-tutorial/stage1/main/build.hancho

@@ -1,11 +1,11 @@
-hello_greet = hancho.task(
+hello_greet = hancho.Task(
     hancho.tools.cc_library,
     in_srcs = ["hello-greet.cc"],
     in_hdrs = ["hello-greet.h"],
     out_lib = "hello-greet.a",
 )
 
-hancho.task(
+hancho.Task(
     hancho.tools.cc_binary,
     in_srcs = ["hello-world.cc"],
     in_libs = hello_greet,

examples/bazel-cpp-tutorial/stage1/stage1_tools.hancho

@@ -58,11 +58,11 @@ link_cpp_lib = hancho.Tool(
 )
 
 def cc_library(hancho, *args, in_srcs, out_lib, **kwargs):
-    objs = [hancho.task(compile_cpp, *args, in_src=src, **kwargs) for src in hancho.flatten(in_srcs)]
-    bin  = hancho.task(link_cpp_lib, *args, in_objs=objs, out_lib=out_lib, **kwargs)
+    objs = [hancho.Task(compile_cpp, *args, in_src=src, **kwargs) for src in hancho.flatten(in_srcs)]
+    bin  = hancho.Task(link_cpp_lib, *args, in_objs=objs, out_lib=out_lib, **kwargs)
     return bin
 
 def cc_binary(hancho, *args, in_srcs=[], in_objs=None, in_libs=None, out_bin, **kwargs):
-    objs = [hancho.task(compile_cpp, *args, in_src=src, **kwargs) for src in hancho.flatten(in_srcs)]
-    bin  = hancho.task(link_cpp_bin, *args, in_objs=[objs, in_objs], in_libs=in_libs, out_bin=out_bin, **kwargs)
+    objs = [hancho.Task(compile_cpp, *args, in_src=src, **kwargs) for src in hancho.flatten(in_srcs)]
+    bin  = hancho.Task(link_cpp_bin, *args, in_objs=[objs, in_objs], in_libs=in_libs, out_bin=out_bin, **kwargs)
     return bin

examples/bazel-cpp-tutorial/stage2/main/build.hancho

@@ -1,4 +1,4 @@
-hancho.config.includes = "-I{repo_dir}"
+hancho.repo_config.includes = "-I{repo_dir}"
 
 hancho.tools = hancho.load("stage3_tools.hancho")
 hancho.lib   = hancho.load("lib/build.hancho")