noun: fix pkg includes and platform specific header includes

urbit · Oct 3, 2024 · a9c1484 · a9c1484
1 parent 85862c5
commit a9c1484
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 28 deletions.
diff --git a/build.zig b/build.zig
@@ -712,15 +712,11 @@ fn build_single(
         .include_extensions = &.{".h"},
     });
 
-    pkg_noun.installHeadersDirectory(b.path(switch (t.os.tag) {
-        .macos => "pkg/noun/platform/darwin",
-        .linux => "pkg/noun/platform/linux",
+    pkg_noun.installHeader(b.path(switch (t.os.tag) {
+        .macos => "pkg/noun/platform/darwin/rsignal.h",
+        .linux => "pkg/noun/platform/linux/rsignal.h",
         else => "",
-    }), "", .{});
-
-    pkg_noun.installHeadersDirectory(b.path("pkg/noun/jets"), "", .{
-        .include_extensions = &.{".h"},
-    });
+    }), "platform/rsignal.h");
 
     // b.installArtifact(pkg_noun);
 

diff --git a/pkg/noun/events.h b/pkg/noun/events.h
@@ -3,7 +3,7 @@
 #ifndef U3_EVENTS_H
 #define U3_EVENTS_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "allocate.h"
 #include "version.h"
 

diff --git a/pkg/noun/hashtable.h b/pkg/noun/hashtable.h
@@ -1,7 +1,7 @@
 #ifndef U3_HASHTABLE_H
 #define U3_HASHTABLE_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "types.h"
 
   /**  Data structures.

diff --git a/pkg/noun/imprison.h b/pkg/noun/imprison.h
@@ -4,7 +4,7 @@
 #define U3_IMPRISON_H
 
 #include "allocate.h"
-#include "c3.h"
+#include "c3/c3.h"
 #include "gmp.h"
 #include "types.h"
 

diff --git a/pkg/noun/jets.h b/pkg/noun/jets.h
@@ -4,7 +4,7 @@
 #define U3_JETS_H
 
 #include "allocate.h"
-#include "c3.h"
+#include "c3/c3.h"
 #include "types.h"
 
   /** Noun semantics.

diff --git a/pkg/noun/jets/e/secp.c b/pkg/noun/jets/e/secp.c
@@ -5,7 +5,7 @@
 
 #include "noun.h"
 #include "urcrypt.h"
-#include <ent.h>
+#include "ent/ent.h"
 
 static urcrypt_secp_context* sec_u;
 

diff --git a/pkg/noun/jets/tree.c b/pkg/noun/jets/tree.c
@@ -17,7 +17,7 @@
   ```
 */
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "jets.h"
 #include "jets/w.h"
 

diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c
@@ -28,7 +28,7 @@
 #include "nock.h"
 #include "openssl/crypto.h"
 #include "options.h"
-#include "platform/rsignal.h"
+#include "rsignal.h"
 #include "retrieve.h"
 #include "trace.h"
 #include "urcrypt.h"

diff --git a/pkg/noun/manage.h b/pkg/noun/manage.h
@@ -6,7 +6,7 @@
 #include "v1/manage.h"
 #include "v2/manage.h"
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "types.h"
 #include "version.h"
 

diff --git a/pkg/noun/nock.h b/pkg/noun/nock.h
@@ -5,7 +5,7 @@
 
 #include <stdio.h>
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "jets.h"
 #include "types.h"
 #include "zave.h"

diff --git a/pkg/noun/options.h b/pkg/noun/options.h
@@ -3,7 +3,7 @@
 #ifndef U3_OPTIONS_H
 #define U3_OPTIONS_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "types.h"
 
   /** Data structures.

diff --git a/pkg/noun/retrieve.h b/pkg/noun/retrieve.h
@@ -3,7 +3,7 @@
 #ifndef U3_RETRIEVE_H
 #define U3_RETRIEVE_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "allocate.h"
 #include "error.h"
 #include "gmp.h"

diff --git a/pkg/noun/serial.c b/pkg/noun/serial.c
@@ -11,7 +11,7 @@
 #include "jets/q.h"
 #include "retrieve.h"
 #include "serial.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "vortex.h"
 #include "xtract.h"
 

diff --git a/pkg/noun/serial.h b/pkg/noun/serial.h
@@ -3,7 +3,7 @@
 #ifndef U3_SERIAL_H
 #define U3_SERIAL_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "imprison.h"
 #include "types.h"
     /*  constants

diff --git a/pkg/noun/types.h b/pkg/noun/types.h
@@ -5,7 +5,7 @@
 #ifndef U3_TYPES_H
 #define U3_TYPES_H
 
-#include "c3.h"
+#include "c3/c3.h"
 
 /// Sentinel value for u3_noun types that aren't actually nouns.
 #define u3_none (u3_noun)0xffffffff

diff --git a/pkg/noun/urth.c b/pkg/noun/urth.c
@@ -14,7 +14,7 @@
 #include "manage.h"
 #include "retrieve.h"
 #include "serial.h"
-#include "ur.h"
+#include "ur/ur.h"
 #include "vortex.h"
 
 /* _cu_atom_to_ref(): allocate indirect atom off-loom.

diff --git a/pkg/noun/urth.h b/pkg/noun/urth.h
@@ -3,7 +3,7 @@
 #ifndef U3_URTH_H
 #define U3_URTH_H
 
-#include "c3.h"
+#include "c3/c3.h"
 
     /**  Functions.
     **/

diff --git a/pkg/noun/v2/hashtable.h b/pkg/noun/v2/hashtable.h
@@ -15,7 +15,7 @@
 
 #include "../hashtable.h"
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "types.h"
 
   /**  Data structures.

diff --git a/pkg/noun/vortex.h b/pkg/noun/vortex.h
@@ -4,7 +4,7 @@
 #define U3_VORTEX_H
 
 #include "allocate.h"
-#include "c3.h"
+#include "c3/c3.h"
 #include "imprison.h"
 #include "version.h"
 

diff --git a/pkg/noun/xtract.h b/pkg/noun/xtract.h
@@ -3,7 +3,7 @@
 #ifndef U3_XTRACT_H
 #define U3_XTRACT_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "types.h"
 #include "allocate.h"
 #include "manage.h"

diff --git a/pkg/noun/zave.h b/pkg/noun/zave.h
@@ -3,7 +3,7 @@
 #ifndef U3_ZAVE_H
 #define U3_ZAVE_H
 
-#include "c3.h"
+#include "c3/c3.h"
 #include "types.h"
 
   /**  Memoization.