Migrate console into a shared directory

Author: elliottt

.gitignore

@@ -21,3 +21,5 @@ wpt-runtime.wasm
 docs-app/bin/main.wasm
 docs-app/pkg/*.tar.gz
 c-dependencies/js-compute-runtime/xqd-world/xqd_world_component_type.o
+
+*.a

c-dependencies/js-compute-runtime/Makefile

@@ -44,6 +44,9 @@ WASI_CXX ?= $(WASI_SDK)/bin/clang++
 # The wasi-sdk provided c compiler wrapper.
 WASI_CC ?= $(WASI_SDK)/bin/clang
 
+# The wasi-sdk provided ar wrapper.
+WASI_AR ?= $(WASI_SDK)/bin/ar
+
 ifneq ($(DEBUG),false)
   MODE := debug
   CARGO_FLAG :=
@@ -142,6 +145,9 @@ $(OBJ_DIR)/xqd-world:
 $(OBJ_DIR)/builtins:
 	$(call cmd,mkdir,$@)
 
+$(OBJ_DIR)/builtins/shared:
+	$(call cmd,mkdir,$@)
+
 # Downloaded dependencies ######################################################
 
 $(BUILD)/openssl-$(OPENSSL_VERSION).tar.gz: URL=https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
@@ -237,6 +243,7 @@ endif
 
 FSM_CPP := $(wildcard $(FSM_SRC)/*.cpp)
 FSM_CPP += $(wildcard $(FSM_SRC)/builtins/*.cpp)
+FSM_CPP += $(wildcard $(FSM_SRC)/builtins/shared/*.cpp)
 FSM_OBJ := $(patsubst $(FSM_SRC)/%.cpp,$(OBJ_DIR)/%.o,$(FSM_CPP))
 
 # Build all the above object files
@@ -268,6 +275,13 @@ $(OBJ_DIR)/js-compute-runtime-component.wasm: $(OBJ_DIR)/xqd-world/xqd_world_ada
 	$(WASI_CXX) $(LD_FLAGS) $(OPENSSL_LIBS) -o $@ $^
 	$(call cmd_format,WASM_STRIP,$@) $(call WASM_STRIP,$@)
 
+# The subset of javascript builtins that are reusable across other runtimes.
+shared-builtins.a: $(OBJ_DIR)/shared-builtins.a
+	$(call cmd,cp,$@)
+
+$(OBJ_DIR)/shared-builtins.a: $(OBJ_DIR)/builtins/shared/console.o
+	$(call cmd,wasi_ar,$@)
+
 # These two rules copy the built artifacts into the $(FSM_SRC) directory, and
 # are both marked phony as we need to do the right thing when running the
 # following sequence:

c-dependencies/js-compute-runtime/builtins/console.cpp renamed to c-dependencies/js-compute-runtime/builtins/shared/console.cpp

@@ -38,6 +38,9 @@ cmd_rmdir = $(RM) -r $1
 cmd_wget_name := WGET
 cmd_wget = wget $(URL) $(call quiet_flag,--quiet) -O $1
 
+cmd_wasi_ar_name := WASI_AR
+cmd_wasi_ar = $(WASI_AR) rcs $@ $<
+
 cmd_wasi_cxx_name := WASI_CXX
 cmd_wasi_cxx = $(WASI_CXX) $(CXX_FLAGS) $(OPT_FLAGS) $(INCLUDES) $(DEFINES) -MMD -MP -c -o $1 $<
 

c-dependencies/js-compute-runtime/builtins/console.h renamed to c-dependencies/js-compute-runtime/builtins/shared/console.h

@@ -45,7 +45,6 @@
 #include "builtins/cache-override.h"
 #include "builtins/compression-stream.h"
 #include "builtins/config-store.h"
-#include "builtins/console.h"
 #include "builtins/crypto.h"
 #include "builtins/decompression-stream.h"
 #include "builtins/dictionary.h"
@@ -55,6 +54,7 @@
 #include "builtins/native-stream-sink.h"
 #include "builtins/native-stream-source.h"
 #include "builtins/object-store.h"
+#include "builtins/shared/console.h"
 #include "builtins/subtle-crypto.h"
 #include "builtins/transform-stream-default-controller.h"
 #include "builtins/transform-stream.h"