feat: compile and running on macos works.

openwebf · Feb 16, 2024 · e385f7c · e385f7c
1 parent 3cb9923
commit e385f7c
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 16 deletions.
diff --git a/bridge/core_rs/src/dom.rs b/bridge/core_rs/src/dom.rs
@@ -6,30 +6,21 @@ use std::ffi::{CString};
 use webf_sys::executing_context::ExecutingContext;
 use webf_sys::node::NodeMethods;
 
-pub fn init_webf_dom(context: &ExecutingContext) {
+pub fn init_webf_dom(context: &ExecutingContext){
   let document = context.document();
   let exception_state = context.create_exception_state();
 
   let html_tag_name = CString::new("html");
-  let html_element = document.create_element(&html_tag_name.unwrap(), &exception_state).unwrap();
+  let html_element = document.create_element(&html_tag_name.unwrap(), &exception_state)?;
 
-  let _ = document.append_child(&html_element, &exception_state);
+  document.append_child(&html_element, &exception_state).unwrap();
 
   let head_tag_name = CString::new("head");
   let head_element = document.create_element(&head_tag_name.unwrap(), &exception_state).unwrap();
-  let _ = document.document_element().append_child(&head_element, &exception_state);
+  document.document_element().append_child(&head_element, &exception_state).unwrap();
 
   let body_tag_name = CString::new("body");
   let body_element = document.create_element(&body_tag_name.unwrap(), &exception_state).unwrap();
-  let _ = document.document_element().append_child(&body_element, &exception_state);
-
-  // let exception_state = unsafe {
-  //   ExceptionState {
-  //     ptr: webf__create_exception_state()
-  //   }
-  // };
-  // document.createElement("1234", &exception_state);
-
-  // return document;
+  document.document_element().append_child(&body_element, &exception_state).unwrap();
 }
 
diff --git a/bridge/rusty_webf_sys/src/element.rs b/bridge/rusty_webf_sys/src/element.rs
@@ -19,13 +19,31 @@ pub struct ElementRustMethods {
 
 impl RustMethods for ElementRustMethods {}
 
+enum ElementType {
+  kHTMLDIVElement,
+  kHTMLAnchorElement,
+  kHTMLHeadElement,
+  kHTMLBodyElement,
+  kHTMLHTMLElement,
+  kHTMLImageElement,
+  kHTMLLinkElement,
+  kHTMLScriptElement,
+  kHTMLTemplateElement,
+  kHTMLUnknownElement,
+  kHTMLCanvasElement,
+  kHTMLWidgetElement,
+  kHTMLButtonElement,
+  kHTMLFormElement,
+  kHTMLInputElement,
+  kHTMLTextAreaElement
+}
+
 pub struct Element {
   container_node: ContainerNode,
   method_pointer: *const ElementRustMethods,
 }
 
-impl Element {
-}
+impl Element {}
 
 pub trait ElementMethods: ContainerNodeMethods {}
 

diff --git a/scripts/build_darwin_dylib.js b/scripts/build_darwin_dylib.js
@@ -9,6 +9,7 @@ require('./tasks');
 // Run tasks
 series(
   'compile-polyfill',
+  'compile-webf-core',
   'generate-bindings-code',
   'build-darwin-webf-lib',
 )((err) => {

diff --git a/scripts/tasks.js b/scripts/tasks.js
@@ -39,6 +39,7 @@ const paths = {
   webf: resolveWebF('webf'),
   bridge: resolveWebF('bridge'),
   polyfill: resolveWebF('bridge/polyfill'),
+  rs_core: resolveWebF('bridge/core_rs'),
   codeGen: resolveWebF('bridge/scripts/code_generator'),
   thirdParty: resolveWebF('third_party'),
   tests: resolveWebF('integration_tests'),
@@ -83,6 +84,21 @@ task('clean', () => {
 
 const libOutputPath = join(TARGET_PATH, platform, 'lib');
 
+task('compile-webf-core', done => {
+  let buildType = 'Debug';
+  if (process.env.WEBF_BUILD === 'Release') {
+    buildType = 'RelWithDebInfo';
+  }
+
+  execSync(`cargo build ${buildType == 'RelWithDebInfo' ? '--release' : ''}`, {
+    cwd: paths.rs_core,
+    env: process.env,
+    stdio: 'inherit'
+  });
+
+  done();
+});
+
 task('build-darwin-webf-lib', done => {
   let externCmakeArgs = [];
   let buildType = 'Debug';