From ec334995a1fe11abe7237f4d783b96903060d4fe Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Tue, 14 Jul 2026 09:45:10 +0300 Subject: [PATCH] Revert "Add devtools scripts and views to Safari build" This reverts commit cf0c0f7f8258739ea013be63f55330a6f12d290c. WE2-967 Signed-off-by: Raul Metsma --- src/mac/CMakeLists.txt | 7 ++----- src/mac/js | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mac/CMakeLists.txt b/src/mac/CMakeLists.txt index 3ce67571..2b16c74c 100644 --- a/src/mac/CMakeLists.txt +++ b/src/mac/CMakeLists.txt @@ -9,7 +9,6 @@ find_program(NPM_EXECUTABLE NAMES npm REQUIRED) get_filename_component(BINPATH ${NPM_EXECUTABLE} PATH) set(JSPATH ${CMAKE_CURRENT_SOURCE_DIR}/js/dist/safari) set(EXTENSION ${JSPATH}/manifest.json ${JSPATH}/background.js ${JSPATH}/content.js ${JSPATH}/background.js.map ${JSPATH}/web-eid-icon-128.png) -file(GLOB_RECURSE EXTENSION_DEVTOOLS "${JSPATH}/views/*") add_custom_command(OUTPUT ${EXTENSION} COMMAND ${CMAKE_COMMAND} -E env PATH="$ENV{PATH}:${BINPATH}" ${NPM_EXECUTABLE} install COMMAND ${CMAKE_COMMAND} -E env PATH="$ENV{PATH}:${BINPATH}" TOKEN_SIGNING_BACKWARDS_COMPATIBILITY=true ${NPM_EXECUTABLE} run clean build package @@ -18,7 +17,7 @@ add_custom_command(OUTPUT ${EXTENSION} ) # Extension -add_executable(web-eid-safari-extension MACOSX_BUNDLE safari-extension.mm web-eid-safari-extension.entitlements ${EXTENSION} ${EXTENSION_DEVTOOLS}) +add_executable(web-eid-safari-extension MACOSX_BUNDLE safari-extension.mm web-eid-safari-extension.entitlements ${EXTENSION}) set_target_properties(web-eid-safari-extension PROPERTIES AUTOMOC OFF MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info-extension.plist.cmake @@ -30,10 +29,8 @@ set_target_properties(web-eid-safari-extension PROPERTIES target_link_libraries(web-eid-safari-extension SafariServices "-framework AppKit") target_link_options(web-eid-safari-extension PRIVATE -e _NSExtensionMain -fapplication-extension) add_custom_command(TARGET web-eid-safari-extension POST_BUILD - COMMAND mkdir -p $/Resources/views + COMMAND mkdir -p $/Resources COMMAND cp ${EXTENSION} $/Resources - COMMAND cp ${JSPATH}/views/options.html ${JSPATH}/views/options.js ${JSPATH}/views/browser-polyfill.min.js $/Resources/views - COMMAND ${CMAKE_COMMAND} -E copy_directory ${JSPATH}/views/devtools $/Resources/views/devtools ) # Application diff --git a/src/mac/js b/src/mac/js index 8f9260bc..fb6b7c70 160000 --- a/src/mac/js +++ b/src/mac/js @@ -1 +1 @@ -Subproject commit 8f9260bce52cb177730e468cb8642e8d0db9e02b +Subproject commit fb6b7c70b15c34dda066157250b7773f957e52c9