mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-20 15:06:14 -05:00
Align webview authentication features across client builds
This commit is contained in:
2 files changed
+7
-10
No files matched your search
@@ -34,8 +34,12 @@ PUBLISH ?= 0
|
|||||||
# Indicates whether to build the GUI components
|
# Indicates whether to build the GUI components
|
||||||
BUILD_GUI_HELPER ?= 1
|
BUILD_GUI_HELPER ?= 1
|
||||||
|
|
||||||
# Indicates whether to build embedded webview auth support into gpauth
|
# Build embedded webview authentication support into gpclient and gpauth
|
||||||
BUILD_WEBVIEW_AUTH ?= 1
|
BUILD_WEBVIEW_AUTH ?= 1
|
||||||
|
ifneq ($(BUILD_WEBVIEW_AUTH),1)
|
||||||
|
AUTH_FEATURE_ARGS = --no-default-features
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(shell uname -s),Linux)
|
ifeq ($(shell uname -s),Linux)
|
||||||
PREFIX ?= /usr
|
PREFIX ?= /usr
|
||||||
GPGUI_BINARY ?= .build/gpgui/gpgui_$(VERSION)/gpgui
|
GPGUI_BINARY ?= .build/gpgui/gpgui_$(VERSION)/gpgui
|
||||||
@@ -135,14 +139,7 @@ build-rs:
|
|||||||
rm -vf rust-toolchain.toml; \
|
rm -vf rust-toolchain.toml; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpservice
|
$(CARGO) build $(CARGO_BUILD_ARGS) $(AUTH_FEATURE_ARGS) -p gpclient -p gpservice -p gpauth
|
||||||
|
|
||||||
# Build gpauth with or without embedded webview auth support
|
|
||||||
if [ $(BUILD_WEBVIEW_AUTH) -eq 1 ]; then \
|
|
||||||
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpauth; \
|
|
||||||
else \
|
|
||||||
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpauth --no-default-features; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Only build the GUI components if BUILD_GUI_HELPER is set to 1
|
# Only build the GUI components if BUILD_GUI_HELPER is set to 1
|
||||||
if [ $(BUILD_GUI_HELPER) -eq 1 ]; then \
|
if [ $(BUILD_GUI_HELPER) -eq 1 ]; then \
|
||||||
|
|||||||
@@ -271,7 +271,7 @@ sudo make install
|
|||||||
**Build Options:**
|
**Build Options:**
|
||||||
|
|
||||||
- `INCLUDE_GUI=1` – Download and install the matching desktop application bundle.
|
- `INCLUDE_GUI=1` – Download and install the matching desktop application bundle.
|
||||||
- `BUILD_WEBVIEW_AUTH=0` – Build `gpauth` without embedded browser authentication (uses external browser or manual mode).
|
- `BUILD_WEBVIEW_AUTH=0` – Disable embedded browser authentication in both `gpclient` and `gpauth`. External-browser and manual sign-in remain available.
|
||||||
- `BUILD_GUI_HELPER=0` – Skip building the helper UI.
|
- `BUILD_GUI_HELPER=0` – Skip building the helper UI.
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|||||||
Reference in new issue
Block a user