cj-tauri 0.8.0 → 1.1.0

package/native/build_linux.sh

@@ -38,10 +38,38 @@ if ! pkg-config --exists $PKGS; then
   exit 1
 fi
 
+# 全局快捷键的可选编译（RFC-002 §6.3）：有 X11 dev 就带上（CJ_HAVE_X11 + -lX11），
+# 没有也能编——能力位如实不置位，运行期调用打一行说明。Debian/Ubuntu: libx11-dev
+X11_FLAGS=""
+X11_LIBS=""
+if pkg-config --exists x11; then
+  X11_FLAGS="-DCJ_HAVE_X11"
+  X11_LIBS="$(pkg-config --libs x11)"
+  echo "[ok] X11 found - global hotkeys enabled (CJ_HAVE_X11)"
+else
+  echo "[warn] X11 dev not found - global hotkeys disabled (apt install libx11-dev to enable)" >&2
+fi
+
+# 托盘的可选编译（RFC-002 §6.3）：有 libayatana-appindicator3 就带上（CJ_HAVE_TRAY），
+# 没有也能编——能力位如实不置位。Debian/Ubuntu: libayatana-appindicator3-dev
+TRAY_FLAGS=""
+TRAY_LIBS=""
+TRAY_CFLAGS=""
+if pkg-config --exists ayatana-appindicator3-0.1; then
+  TRAY_FLAGS="-DCJ_HAVE_TRAY"
+  TRAY_CFLAGS="$(pkg-config --cflags ayatana-appindicator3-0.1)"
+  TRAY_LIBS="$(pkg-config --libs ayatana-appindicator3-0.1)"
+  echo "[ok] ayatana-appindicator3 found - tray enabled (CJ_HAVE_TRAY)"
+else
+  echo "[warn] ayatana-appindicator3 not found - tray disabled (apt install libayatana-appindicator3-dev to enable)" >&2
+fi
+
 # shellcheck disable=SC2086
-"$CC" -shared -fPIC -O2 -fstack-protector-all bridge_core.c bridge_linux.c \
+# core/ = 跨平台共享层；platforms/linux/ = GTK/WebKit 平台实现（目录契约见 AGENTS §2）
+"$CC" -shared -fPIC -O2 -fstack-protector-all \
+    -Icore $X11_FLAGS $TRAY_FLAGS $TRAY_CFLAGS core/bridge_core.c platforms/linux/bridge_linux.c \
     -o libcjtbridge.so \
-    $(pkg-config --cflags --libs $PKGS)
+    $(pkg-config --cflags --libs $PKGS) $X11_LIBS $TRAY_LIBS
 
 if [ ! -f libcjtbridge.so ]; then
   echo "[ERROR] build libcjtbridge.so failed" >&2

package/native/build_win.bat

@@ -1,61 +1,62 @@
-@echo off
-REM ============================================================
-REM cj-tauri Windows backend: build the WebView2 C bridge (libcjtbridge.dll)
-REM
-REM Requirements:
-REM   - mingw-w64 / llvm-mingw gcc on PATH
-REM   - WebView2 SDK (NuGet package Microsoft.Web.WebView2, unzipped = SDK root)
-REM     Default SDK root: D:\webview2sdk\sdk-1.0.2365.46
-REM     Override with the WEBVIEW2_SDK_ROOT environment variable.
-REM
-REM Version rule (important): the SDK must NOT be newer than the WebView2
-REM   Runtime installed on this machine. This machine has runtime 122.0.2365.106,
-REM   so use SDK 1.0.2365.46.
-REM   Check runtime version:
-REM     reg query "HKLM\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" /v pv
-REM
-REM Output: native\libcjtbridge.dll + native\libcjtbridge.dll.a (import lib)
-REM         native\webview2\WebView2Loader.dll (synced to the SDK version)
-REM ============================================================
-setlocal
-
-set SCRIPT_DIR=%~dp0
-if "%WEBVIEW2_SDK_ROOT%"=="" set WEBVIEW2_SDK_ROOT=D:\webview2sdk\sdk-1.0.2365.46
-set WEBVIEW2_SDK_INCLUDE=%WEBVIEW2_SDK_ROOT%\build\native\include
-
-if not exist "%WEBVIEW2_SDK_INCLUDE%\WebView2.h" (
-    echo [ERROR] WebView2.h not found in %WEBVIEW2_SDK_INCLUDE%
-    echo         Download Microsoft.Web.WebView2 from nuget.org and unzip,
-    echo         or set WEBVIEW2_SDK_ROOT.
-    exit /b 1
-)
-
-cd /d "%SCRIPT_DIR%"
-
-REM bridge_core.c holds the platform-independent half (JS queue, dialog state
-REM machine, init scripts, lifecycle flags) and exports every cj_bridge_* entry
-REM point; bridge_win.c only implements the WebView2/COM primitives it calls.
-REM Both must be linked, or the cj_core_* symbols bridge_win.c references go
-REM undefined (that is what happens if you build bridge_win.c alone).
-gcc -shared -O2 -fstack-protector-all bridge_core.c bridge_win.c -o libcjtbridge.dll ^
-    -Wl,--out-implib,libcjtbridge.dll.a ^
-    -I"%WEBVIEW2_SDK_INCLUDE%" ^
-    -lole32 -loleaut32 -luuid -luser32 -lgdi32 -ladvapi32 -lcomdlg32
-
-if errorlevel 1 (
-    echo [ERROR] build libcjtbridge.dll failed
-    exit /b 1
-)
-
-REM Sync the x64 loader matching the headers, so the WebView never puts an
-REM SDK newer than the installed runtime on the wire.
-if not exist webview2 mkdir webview2
-copy /y "%WEBVIEW2_SDK_ROOT%\build\native\x64\WebView2Loader.dll" webview2\ >nul
-if errorlevel 1 (
-    echo [WARN] WebView2Loader.dll copy failed, check %WEBVIEW2_SDK_ROOT%\build\native\x64
-) else (
-    echo [OK] WebView2Loader.dll synced
-)
-
-echo [OK] libcjtbridge.dll built
-endlocal
+@echo off
+REM ============================================================
+REM cj-tauri Windows backend: build the WebView2 C bridge (libcjtbridge.dll)
+REM
+REM Requirements:
+REM   - mingw-w64 / llvm-mingw gcc on PATH
+REM   - WebView2 SDK (NuGet package Microsoft.Web.WebView2, unzipped = SDK root)
+REM     Default SDK root: D:\webview2sdk\sdk-1.0.2365.46
+REM     Override with the WEBVIEW2_SDK_ROOT environment variable.
+REM
+REM Version rule (important): the SDK must NOT be newer than the WebView2
+REM   Runtime installed on this machine. This machine has runtime 122.0.2365.106,
+REM   so use SDK 1.0.2365.46.
+REM   Check runtime version:
+REM     reg query "HKLM\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" /v pv
+REM
+REM Output: native\libcjtbridge.dll + native\libcjtbridge.dll.a (import lib)
+REM         native\webview2\WebView2Loader.dll (synced to the SDK version)
+REM ============================================================
+setlocal
+
+set SCRIPT_DIR=%~dp0
+if "%WEBVIEW2_SDK_ROOT%"=="" set WEBVIEW2_SDK_ROOT=D:\webview2sdk\sdk-1.0.2365.46
+set WEBVIEW2_SDK_INCLUDE=%WEBVIEW2_SDK_ROOT%\build\native\include
+
+if not exist "%WEBVIEW2_SDK_INCLUDE%\WebView2.h" (
+    echo [ERROR] WebView2.h not found in %WEBVIEW2_SDK_INCLUDE%
+    echo         Download Microsoft.Web.WebView2 from nuget.org and unzip,
+    echo         or set WEBVIEW2_SDK_ROOT.
+    exit /b 1
+)
+
+cd /d "%SCRIPT_DIR%"
+
+REM bridge_core.c holds the platform-independent half (JS queue, dialog state
+REM machine, init scripts, lifecycle flags) and exports every cj_bridge_* entry
+REM point; bridge_win.c only implements the WebView2/COM primitives it calls.
+REM Both must be linked, or the cj_core_* symbols bridge_win.c references go
+REM undefined (that is what happens if you build bridge_win.c alone).
+REM core\ = cross-platform shared layer; platforms\windows\ = WebView2 implementation
+gcc -shared -O2 -fstack-protector-all -Icore core\bridge_core.c platforms\windows\bridge_win.c -o libcjtbridge.dll ^
+    -Wl,--out-implib,libcjtbridge.dll.a ^
+    -I"%WEBVIEW2_SDK_INCLUDE%" ^
+    -lole32 -loleaut32 -luuid -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lshell32
+
+if errorlevel 1 (
+    echo [ERROR] build libcjtbridge.dll failed
+    exit /b 1
+)
+
+REM Sync the x64 loader matching the headers, so the WebView never puts an
+REM SDK newer than the installed runtime on the wire.
+if not exist webview2 mkdir webview2
+copy /y "%WEBVIEW2_SDK_ROOT%\build\native\x64\WebView2Loader.dll" webview2\ >nul
+if errorlevel 1 (
+    echo [WARN] WebView2Loader.dll copy failed, check %WEBVIEW2_SDK_ROOT%\build\native\x64
+) else (
+    echo [OK] WebView2Loader.dll synced
+)
+
+echo [OK] libcjtbridge.dll built
+endlocal