Improved generation

kunitoki · kunitoki · commit 3b026fd9bd79 · 2024-12-04T10:18:01.000+01:00
diff --git a/cmake/platforms/emscripten/mini-coi.js b/cmake/platforms/emscripten/mini-coi.js
@@ -0,0 +1,28 @@
+/*! coi-serviceworker v0.1.7 - Guido Zuidhof and contributors, licensed under MIT */
+/*! mini-coi - Andrea Giammarchi and contributors, licensed under MIT */
+(({ document: d, navigator: { serviceWorker: s } }) => {
+    if (d) {
+      const { currentScript: c } = d;
+      s.register(c.src, { scope: c.getAttribute('scope') || '.' }).then(r => {
+        r.addEventListener('updatefound', () => location.reload());
+        if (r.active && !s.controller) location.reload();
+      });
+    }
+    else {
+      addEventListener('install', () => skipWaiting());
+      addEventListener('activate', e => e.waitUntil(clients.claim()));
+      addEventListener('fetch', e => {
+        const { request: r } = e;
+        if (r.cache === 'only-if-cached' && r.mode !== 'same-origin') return;
+        e.respondWith(fetch(r).then(r => {
+          const { body, status, statusText } = r;
+          if (!status || status > 399) return r;
+          const h = new Headers(r.headers);
+          h.set('Cross-Origin-Opener-Policy', 'same-origin');
+          h.set('Cross-Origin-Embedder-Policy', 'require-corp');
+          h.set('Cross-Origin-Resource-Policy', 'cross-origin');
+          return new Response(body, { status, statusText, headers: h });
+        }));
+      });
+    }
+  })(self);
diff --git a/cmake/platforms/emscripten/shell.html b/cmake/platforms/emscripten/shell.html
@@ -2,9 +2,8 @@
 <html lang="en-us">
   <head>
     <meta charset="utf-8">
+    <script src="mini-coi.js"></script>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta http-equiv="Cross-Origin-Embedder-Policy" content="require-corp">
-    <meta http-equiv="Cross-Origin-Opener-Policy" content="same-origin">
     <title>YUP! On Emscripten</title>
     <style>
       *, *::before, *::after {
diff --git a/cmake/yup.cmake b/cmake/yup.cmake
@@ -28,10 +28,10 @@ include (FetchContent)
 #==============================================================================
 
 macro (_yup_setup_platform)
-    if (IOS OR CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_TOOLCHAIN_FILE MATCHES ".*ios\.cmake$")
+    if (IOS OR CMAKE_SYSTEM_NAME MATCHES "iOS" OR CMAKE_TOOLCHAIN_FILE MATCHES ".*ios\.cmake$")
         set (yup_platform "ios")
 
-    elseif (ANDROID)
+    elseif (ANDROID OR YUP_TARGET_ANDROID)
         set (yup_platform "android")
 
     elseif (EMSCRIPTEN OR CMAKE_TOOLCHAIN_FILE MATCHES ".*Emscripten\.cmake$")
@@ -44,7 +44,7 @@ macro (_yup_setup_platform)
         set (yup_platform "linux")
 
     elseif (WIN32)
-        if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        if (CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
             set (yup_platform "uwp")
         else()
             set (yup_platform "win32")
@@ -745,6 +745,13 @@ function (yup_standalone_app)
             -sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE='$dynCall'
             --shell-file "${CMAKE_SOURCE_DIR}/cmake/platforms/${yup_platform}/shell.html")
 
+        set (target_copy_dest "$<TARGET_FILE_DIR:${target_name}>")
+        add_custom_command(
+            TARGET ${target_name} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+                "${CMAKE_SOURCE_DIR}/cmake/platforms/${yup_platform}/mini-coi.js"
+                "${target_copy_dest}/mini-coi.js")
+
     endif()
 
     if (YUP_ARG_TARGET_IDE_GROUP)
diff --git a/justfile b/justfile
@@ -32,7 +32,8 @@ emscripten:
   emcc -v
   emcmake cmake -G "Ninja Multi-Config" -B build
   cmake --build build
-  python3 serve.py -p 8000 -d .
+  python3 -m http.server -d .
+  #python3 serve.py -p 8000 -d .
 
 #run:
 #  @just make
