bare-gtk 0.1.0 → 0.2.0

package/CMakeLists.txt

@@ -7,7 +7,7 @@ find_package(PkgConfig REQUIRED)
 
 project(bare_gtk C)
 
-fetch_package("github:holepunchto/bare@1.24.5")
+fetch_package("github:holepunchto/bare@1.25.0")
 fetch_package("github:holepunchto/libpath")
 
 pkg_check_modules(GTK REQUIRED IMPORTED_TARGET GLOBAL gtk4)
@@ -52,13 +52,8 @@ target_link_libraries(
   PUBLIC
     $<LINK_LIBRARY:WHOLE_ARCHIVE,bare_static>
   PRIVATE
-    log_static
     rlimit_static
     path_static
-)
-
-target_link_libraries(
-  bare_runtime
   PRIVATE
     PkgConfig::GTK
 )

package/lib/runtime.c

@@ -1,7 +1,6 @@
 #include <assert.h>
 #include <bare.h>
 #include <js.h>
-#include <log.h>
 #include <path.h>
 #include <rlimit.h>
 #include <signal.h>
@@ -25,6 +24,8 @@ static guint bare__timer;
 
 GtkApplication *bare_gtk_app;
 
+extern char __bare_identifier[] __attribute__((weak));
+
 static void
 bare__on_shutdown(uv_async_t *handle) {
   uv_close((uv_handle_t *) handle, NULL);
@@ -101,7 +102,10 @@ bare__run(void) {
 }
 
 static void
-bare__on_activate(GtkApplication *app, gpointer data) {
+bare__on_activate(GtkApplication *app, gpointer data) {}
+
+static void
+bare__on_startup(GtkApplication *app, gpointer data) {
   int err;
 
   size_t len;
@@ -147,12 +151,11 @@ main(int argc, char *argv[]) {
   signal(SIGPIPE, SIG_IGN);
 #endif
 
-  err = log_open("bare", 0);
-  assert(err == 0);
-
   err = rlimit_set(rlimit_open_files, rlimit_infer);
   assert(err == 0);
 
+  uv_disable_stdio_inheritance();
+
   argv = uv_setup_args(argc, argv);
 
   err = uv_barrier_init(&bare__platform_ready, 2);
@@ -216,10 +219,12 @@ main(int argc, char *argv[]) {
   err = bare_setup(bare__loop, bare__platform, NULL, argc, (const char **) argv, NULL, &bare);
   assert(err == 0);
 
-  GtkApplication *app = bare_gtk_app = gtk_application_new(NULL, 0);
+  GtkApplication *app = bare_gtk_app = gtk_application_new(__bare_identifier, 0);
 
   g_signal_connect(app, "activate", G_CALLBACK(bare__on_activate), NULL);
 
+  g_signal_connect(app, "startup", G_CALLBACK(bare__on_startup), NULL);
+
   g_application_run(G_APPLICATION(app), argc, argv);
 
   g_source_remove(bare__poll);
@@ -249,8 +254,5 @@ main(int argc, char *argv[]) {
 
   uv_thread_join(&bare__platform_thread);
 
-  err = log_close();
-  assert(err == 0);
-
   return exit_code;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-gtk",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "GTK bindings and runtime for Bare",
   "exports": {
     "./package": "./package.json",
@@ -18,7 +18,9 @@
   ],
   "addon": true,
   "scripts": {
-    "test": "prettier . --check"
+    "format": "prettier --write . && lunte --fix",
+    "lint": "prettier --check . && lunte",
+    "test": "brittle-bare --coverage test.js"
   },
   "repository": {
     "type": "git",
@@ -33,10 +35,14 @@
   "dependencies": {
     "require-asset": "^1.1.0"
   },
+  "peerDependencies": {
+    "bare-build": "^1.0.0"
+  },
   "devDependencies": {
     "brittle": "^3.18.0",
     "cmake-bare": "^1.6.5",
     "cmake-fetch": "^1.4.0",
+    "lunte": "^1.8.0",
     "prettier": "^3.4.1",
     "prettier-config-holepunch": "^2.0.0"
   }

package/runtime.js

@@ -1,3 +1,7 @@
+const { type } = require('bare-build/constants')
+
+const { EXECUTABLE } = type
+
 require.asset = require('require-asset')
 
 const prebuilds = {}
@@ -5,9 +9,17 @@ const prebuilds = {}
 exports.prebuilds = prebuilds
 
 prebuilds['linux-x64'] = () => {
-  return require.asset('./prebuilds/linux-x64/bare', __filename)
+  return {
+    type: EXECUTABLE,
+    path: require.asset('./prebuilds/linux-x64/bare', __filename),
+    dependencies: []
+  }
 }
 
 prebuilds['linux-arm64'] = () => {
-  return require.asset('./prebuilds/linux-arm64/bare', __filename)
+  return {
+    type: EXECUTABLE,
+    path: require.asset('./prebuilds/linux-arm64/bare', __filename),
+    dependencies: []
+  }
 }