Skip to content

Fix Linux and macOS SDK Resource/Data Logic #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovsky merged 9 commits into from
Dec 5, 2025
Merged

Fix Linux and macOS SDK Resource/Data Logic #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
87f119a
Update .gitignore to exclude VS Code config
ovsky Dec 5, 2025
d413189
Add General Codebase Refactor summary documentation
ovsky Dec 5, 2025
f07e1ac
Inject DNT and third-party cookie blocking scripts
ovsky Dec 5, 2025
1d4e0ce
Document privacy settings implementation in UI
ovsky Dec 5, 2025
bdaa895
Add session restore and crash recovery features
ovsky Dec 5, 2025
f972686
Add session restore bar UI and logic
ovsky Dec 5, 2025
e13931a
Add session restore and crash recovery settings
ovsky Dec 5, 2025
515ffbd
Add documentation for session restore feature
ovsky Dec 5, 2025
55b3e89
Add Linux and macOS SDK library/resource install logic
ovsky Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ CMakeUserPresets.json
/_CPack_Packages
debug_log*
debug_*
.vscode/tasks.json
/.vscode
data/session.json
.vscode/
166 changes: 166 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,70 @@ if(WIN32)
endif()
endif()

# Linux: include SDK shared libraries (.so) and resources
if(UNIX AND NOT APPLE)
file(GLOB ULTRALIGHT_SOS "${ULTRALIGHT_SDK_ROOT}/lib/*.so*")
list(LENGTH ULTRALIGHT_SOS _so_count)
if(_so_count GREATER 0)
install(FILES ${ULTRALIGHT_SOS} DESTINATION ${INSTALL_DIR_NAME})
endif()

# Also check for libraries in bin directory (some SDK layouts)
file(GLOB ULTRALIGHT_BIN_SOS "${ULTRALIGHT_SDK_ROOT}/bin/*.so*")
list(LENGTH ULTRALIGHT_BIN_SOS _bin_so_count)
if(_bin_so_count GREATER 0)
install(FILES ${ULTRALIGHT_BIN_SOS} DESTINATION ${INSTALL_DIR_NAME})
endif()

# ICU data files (check multiple possible locations)
file(GLOB ICU_FILES_LIB "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
file(GLOB ICU_FILES_BIN "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
file(GLOB ICU_FILES_RES "${ULTRALIGHT_SDK_ROOT}/resources/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
set(ICU_FILES ${ICU_FILES_LIB} ${ICU_FILES_BIN} ${ICU_FILES_RES})
list(LENGTH ICU_FILES _icu_count)
if(_icu_count GREATER 0)
install(FILES ${ICU_FILES} DESTINATION ${INSTALL_DIR_NAME}/assets/resources)
endif()

# Include resources directory if it exists
if(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources")
install(DIRECTORY "${ULTRALIGHT_SDK_ROOT}/resources/" DESTINATION ${INSTALL_DIR_NAME}/assets/resources
FILES_MATCHING PATTERN "*" PATTERN "*.dat" PATTERN "*.pem" PATTERN "*.bin")
endif()
endif()

# macOS: include SDK dynamic libraries (.dylib) and resources
if(APPLE)
file(GLOB ULTRALIGHT_DYLIBS "${ULTRALIGHT_SDK_ROOT}/lib/*.dylib*")
list(LENGTH ULTRALIGHT_DYLIBS _dylib_count)
if(_dylib_count GREATER 0)
install(FILES ${ULTRALIGHT_DYLIBS} DESTINATION ${INSTALL_DIR_NAME})
endif()

# Also check for libraries in bin directory (some SDK layouts)
file(GLOB ULTRALIGHT_BIN_DYLIBS "${ULTRALIGHT_SDK_ROOT}/bin/*.dylib*")
list(LENGTH ULTRALIGHT_BIN_DYLIBS _bin_dylib_count)
if(_bin_dylib_count GREATER 0)
install(FILES ${ULTRALIGHT_BIN_DYLIBS} DESTINATION ${INSTALL_DIR_NAME})
endif()

# ICU data files (check multiple possible locations)
file(GLOB ICU_FILES_LIB "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
file(GLOB ICU_FILES_BIN "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
file(GLOB ICU_FILES_RES "${ULTRALIGHT_SDK_ROOT}/resources/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
set(ICU_FILES ${ICU_FILES_LIB} ${ICU_FILES_BIN} ${ICU_FILES_RES})
list(LENGTH ICU_FILES _icu_count)
if(_icu_count GREATER 0)
install(FILES ${ICU_FILES} DESTINATION ${INSTALL_DIR_NAME}/assets/resources)
endif()

# Include resources directory if it exists
if(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources")
install(DIRECTORY "${ULTRALIGHT_SDK_ROOT}/resources/" DESTINATION ${INSTALL_DIR_NAME}/assets/resources
FILES_MATCHING PATTERN "*" PATTERN "*.dat" PATTERN "*.pem" PATTERN "*.bin")
endif()
endif()

# Post-build: copy assets and runtime files next to the exe for running from build dir
if(WIN32)
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
Expand All @@ -262,6 +326,108 @@ if(WIN32)
)
endif()

# Post-build: copy assets and runtime files for Linux
if(UNIX AND NOT APPLE)
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets"
)
# Copy shared libraries from lib directory
file(GLOB _linux_sos "${ULTRALIGHT_SDK_ROOT}/lib/*.so*")
foreach(_so ${_linux_sos})
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_so}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
)
endforeach()
# Also check bin directory
file(GLOB _linux_bin_sos "${ULTRALIGHT_SDK_ROOT}/bin/*.so*")
foreach(_so ${_linux_bin_sos})
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_so}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
)
endforeach()
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources"
)
# Copy ICU files from various possible locations
if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
)
endif()
if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
)
endif()
endif()

# Post-build: copy assets and runtime files for macOS
if(APPLE)
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets"
)
# Copy dynamic libraries from lib directory
file(GLOB _macos_dylibs "${ULTRALIGHT_SDK_ROOT}/lib/*.dylib*")
foreach(_dylib ${_macos_dylibs})
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_dylib}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
)
endforeach()
# Also check bin directory
file(GLOB _macos_bin_dylibs "${ULTRALIGHT_SDK_ROOT}/bin/*.dylib*")
foreach(_dylib ${_macos_bin_dylibs})
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_dylib}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
)
endforeach()
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources"
)
# Copy ICU files from various possible locations
if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
)
endif()
if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
)
elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
)
endif()
endif()

# CPack (global scope)
set(WEBBROWSER_VERSION "dev" CACHE STRING "WebBrowser version to use in package names (defaults to 'dev')")
set(CPACK_PACKAGE_NAME "Ultralight-WebBrowser")
Expand Down
16 changes: 16 additions & 0 deletions assets/settings_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,5 +223,21 @@
"category": "developer",
"note": null,
"default": false
},
{
"key": "restore_session_on_startup",
"name": "Restore previous session",
"description": "Reopen tabs from your last browsing session when starting the browser.",
"category": "general",
"note": null,
"default": true
},
{
"key": "save_session_continuously",
"name": "Enable crash recovery",
"description": "Continuously save session state so tabs can be restored after crashes or unexpected closures (ALT+F4).",
"category": "general",
"note": null,
"default": true
}
]
106 changes: 106 additions & 0 deletions assets/ui.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,4 +300,110 @@ body.compact-tabs .icon {

body.compact-tabs #toggle-downloads .downloads-badge {
top: 0;
}

/* Session Restore Bar */
#session-restore-bar {
display: none;
position: fixed;
top: 0;
left: 0;
right: 0;
background: linear-gradient(180deg, #2d4a6f 0%, #1e3a5f 100%);
border-bottom: 1px solid #3d6a9f;
padding: 8px 16px;
z-index: 9999;
align-items: center;
justify-content: space-between;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
animation: slideDown 0.3s ease-out;
}

@keyframes slideDown {
from {
transform: translateY(-100%);
opacity: 0;
}
to {
transform: translateY(0);
opacity: 1;
}
}

#session-restore-bar.visible {
display: flex;
}

#session-restore-bar .restore-message {
display: flex;
align-items: center;
gap: 10px;
color: #e0e8f0;
font-size: 13px;
}

#session-restore-bar .restore-icon {
width: 20px;
height: 20px;
fill: #7cb3e0;
}

#session-restore-bar .restore-actions {
display: flex;
gap: 8px;
}

#session-restore-bar .restore-btn {
padding: 6px 14px;
border-radius: 4px;
border: none;
font-size: 12px;
font-weight: 500;
cursor: pointer;
transition: background-color 0.2s, transform 0.1s;
}

#session-restore-bar .restore-btn:hover {
transform: translateY(-1px);
}

#session-restore-bar .restore-btn:active {
transform: translateY(0);
}

#session-restore-bar .restore-btn.primary {
background: #4a9eff;
color: white;
}

#session-restore-bar .restore-btn.primary:hover {
background: #5aadff;
}

#session-restore-bar .restore-btn.secondary {
background: rgba(255, 255, 255, 0.1);
color: #c0d0e0;
border: 1px solid rgba(255, 255, 255, 0.2);
}

#session-restore-bar .restore-btn.secondary:hover {
background: rgba(255, 255, 255, 0.15);
}

#session-restore-bar .dismiss-btn {
background: none;
border: none;
color: #8090a0;
cursor: pointer;
padding: 4px;
margin-left: 8px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
}

#session-restore-bar .dismiss-btn:hover {
background: rgba(255, 255, 255, 0.1);
color: #c0d0e0;
}
Loading
Loading