Skip to content
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.

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

v1.13.0.202305180006_113.1.5_ge452d82_chromium-113.0.5672.93-actions #1

Merged
merged 28 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
aff5b0a
Add github action build
bennettgoble Oct 1, 2022
ebd458c
SL-18837: Tweak build.yaml to current canonical form
nat-goodspeed Mar 31, 2023
f83f2e1
SL-18837: Disable Dullahan on Linux64: no viable CEF build
nat-goodspeed Mar 31, 2023
6a42472
SL-18837: Defend Mac build against absence of build_secrets_checkout
nat-goodspeed Mar 31, 2023
67d7c52
SL-18837: Use msbuild.exe instead of devenv.com
nat-goodspeed Mar 31, 2023
23a52d2
SL-18837: Specify cmake -A switch for Windows 32 builds.
nat-goodspeed Mar 31, 2023
f8631e0
SL-18837: re-enable build error recognition, try C++17
nat-goodspeed Apr 17, 2023
b70841d
SL-18837: Set CMAKE_CXX_FLAGS consistently.
nat-goodspeed Apr 18, 2023
02a8fc5
SL-18837: Don't let CMake infer CMAKE_C_FLAGS from CMAKE_CXX_FLAGS.
nat-goodspeed Apr 19, 2023
621d2a1
SL-19410: Update macOS runner to point to new, self hosted instance
callumlinden Apr 27, 2023
0384685
SL-19410: indent at ion is important
callumlinden Apr 27, 2023
3b4dca7
SL-19410: whitespace change to kick off a new workflow build
callumlinden Apr 27, 2023
7e97409
SL-19410: whitespace change to kick off another new workflow build af…
callumlinden Apr 27, 2023
61fded0
SL-19410: add more debugging/logging
callumlinden Apr 27, 2023
dac171f
ci: add addrsize to macos runner in matrix
jjlinden Apr 27, 2023
42f5447
Updates so we can build this package against CEF 112. As well as the …
callumlinden May 11, 2023
8155710
Merge branch 'actions' of https://github.com/secondlife/dullahan into…
callumlinden May 11, 2023
283e016
SL-18837: Merge branch 'actions-c++17' into actions
nat-goodspeed May 12, 2023
e794c36
SL-18837: Revert to default build-variables-ref
nat-goodspeed May 12, 2023
94f84d8
SL-18837: Also pass CMake -DCMAKE_CXX_STANDARD from -std=c++17.
nat-goodspeed May 12, 2023
1758b1b
SL-18837: Update cef-bin to release v113.1.5_ge452d82_chromium-113.0.…
nat-goodspeed May 18, 2023
27d1667
SL-20359: Remove Windows 32bit build from the Actions YAML file - no …
callumlinden Oct 4, 2023
da427b5
SL-20359: Pull in the GHA Build of CEF 117.0.598.132 (the one with fi…
callumlinden Oct 4, 2023
516a696
SL-20359: Bump the version of Dullahan to 1.15.0 after the update of …
callumlinden Oct 4, 2023
f4c7861
SL-20359: Bump the version of Dullahan to 1.15.1 to test GHA Release …
callumlinden Oct 4, 2023
4626baa
Incorporate CEF 117.0.5938.132 and call is version v1.15.3 (AND REMEM…
callumlinden Oct 4, 2023
bb8417d
Incorporate CEF 117.0.5938.132 and call it version v1.14.0
callumlinden Oct 4, 2023
6b02a60
SL-20359: Incorporate v118.0.5993.54 of CEF/Chromium - no changes to …
callumlinden Oct 13, 2023
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
7 changes: 7 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:

- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
18 changes: 18 additions & 0 deletions .github/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
changelog:
exclude:
labels:
- ignore-for-release
authors:
- dependabot
categories:
- title: Breaking Changes 🛠
labels:
- semver-major
- breaking-change
- title: New Features 🎉
labels:
- semver-minor
- enhancement
- title: Other Changes
labels:
- '*'
21 changes: 21 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Build
on: [push]
jobs:
build:
strategy:
matrix:
os: [windows-2022, macos-13]
addrsize: ["64"]
runs-on: ${{ matrix.os }}
steps:
- uses: secondlife/action-autobuild@v3
with:
addrsize: ${{ matrix.addrsize }}
release:
needs: build
runs-on: [ubuntu-latest]
if: startsWith(github.ref, 'refs/tags/v')
steps:
- uses: secondlife/action-autobuild-release@v2
with:
public: true
42 changes: 2 additions & 40 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@ endfunction()
# The user must pass in CEF_WRAPPER_DIR and CEF_WRAPPER_BUILD_DIR then we
# derrive all the other ones we need based on those
set(CEF_INCLUDE_DIR ${CEF_WRAPPER_DIR}/include)
set(CEF_DEBUG_LIB_DIR ${CEF_WRAPPER_DIR}/Debug)
set(CEF_DEBUG_DLL_LIB_DIR ${CEF_WRAPPER_BUILD_DIR}/libcef_dll_wrapper/Debug)
set(CEF_RELEASE_LIB_DIR ${CEF_WRAPPER_DIR}/Release)
set(CEF_RELEASE_DLL_LIB_DIR ${CEF_WRAPPER_BUILD_DIR}/libcef_dll_wrapper/Release)
set(CEF_DEBUG_BIN_DIR ${CEF_WRAPPER_DIR}/Debug)
set(CEF_RELEASE_BIN_DIR ${CEF_WRAPPER_DIR}/Release)
set(CEF_RESOURCES_DIR ${CEF_WRAPPER_DIR}/Resources)

Expand All @@ -35,33 +32,14 @@ set(CEF_RESOURCES_DIR ${CEF_WRAPPER_DIR}/Resources)
check_exists(CEF_WRAPPER_DIR)
check_exists(CEF_WRAPPER_BUILD_DIR)
check_exists(CEF_INCLUDE_DIR)
check_exists(CEF_DEBUG_LIB_DIR)
check_exists(CEF_DEBUG_DLL_LIB_DIR)
check_exists(CEF_RELEASE_LIB_DIR)
check_exists(CEF_RELEASE_DLL_LIB_DIR)
check_exists(CEF_DEBUG_BIN_DIR)
check_exists(CEF_RELEASE_BIN_DIR)
check_exists(CEF_RESOURCES_DIR)

###############################################################################
# location of CEF libraries we link against
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

# Find both link libraries we need for Debug/Release
find_library(
CEF_LIBRARY_DEBUG
NAMES libcef.lib
PATHS ${CEF_DEBUG_LIB_DIR}
NO_DEFAULT_PATH
)

find_library(
CEF_DLL_LIBRARY_DEBUG
NAMES libcef_dll_wrapper.lib
PATHS ${CEF_DEBUG_DLL_LIB_DIR}
NO_DEFAULT_PATH
)

find_library(
CEF_LIBRARY_RELEASE
NAMES libcef.lib
Expand All @@ -77,32 +55,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
)

# Confirm that we were able to find our link libs
check_exists(CEF_LIBRARY_DEBUG)
check_exists(CEF_DLL_LIBRARY_DEBUG)
check_exists(CEF_LIBRARY_RELEASE)
check_exists(CEF_DLL_LIBRARY_RELEASE)

elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
find_library(
CEF_DLL_LIBRARY_DEBUG
NAMES libcef_dll_wrapper.a
PATHS ${CEF_DEBUG_DLL_LIB_DIR}
)

find_library(
CEF_DLL_LIBRARY_RELEASE
NAMES libcef_dll_wrapper.a
PATHS ${CEF_RELEASE_DLL_LIB_DIR}
)


set(CEF_FRAMEWORK "'${CEF_RELEASE_BIN_DIR}/Chromium Embedded Framework.framework'")

find_library(OPENGL_FRAMEWORK OpenGL)
find_library(COCOA_FRAMEWORK Cocoa)

# Check that we were able to find our build components
check_exists(CEF_DLL_LIBRARY_DEBUG)
check_exists(CEF_DLL_LIBRARY_RELEASE)
check_exists(CEF_FRAMEWORK)
check_exists(OPENGL_FRAMEWORK)
Expand Down Expand Up @@ -131,11 +99,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CEF_DLL_LIBRARY ${CEF_DLL_LIBRARY_RELEASE} )
else()
set(CEF_LIBRARY
debug ${CEF_LIBRARY_DEBUG}
optimized ${CEF_LIBRARY_RELEASE}
)
set(CEF_DLL_LIBRARY
debug ${CEF_DLL_LIBRARY_DEBUG}
optimized ${CEF_DLL_LIBRARY_RELEASE}
)
endif()
Expand All @@ -150,10 +116,8 @@ check_exists(CEF_DLL_LIBRARY)
# 4127 "conditional is constant" - I use an explicity var to turn code on and off which triggers this
# 4505 "unreferenced local function has been removed" - supress meaningless freeglut warning
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -W4 -wd4100 -wd4127 -wd4505")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -W4 -wd4100 -wd4127 -wd4505")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 -xobjective-c++")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 -xobjective-c++")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
Expand Down Expand Up @@ -301,7 +265,6 @@ endif()

# we are building Windows executable, not a console app (default) and turn off spurious linker warnings
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set_target_properties(dullahan_host PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
set_target_properties(dullahan_host PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
set_target_properties(dullahan_host PROPERTIES LINK_FLAGS "/ignore:4099")

Expand All @@ -318,7 +281,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_custom_command(
TARGET dullahan_host POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory
"$<$<CONFIG:debug>:${CEF_DEBUG_BIN_DIR}>$<$<CONFIG:release>:${CEF_RELEASE_BIN_DIR}>"
"$<$<CONFIG:release>:${CEF_RELEASE_BIN_DIR}>"
"$<TARGET_FILE_DIR:dullahan_host>"
COMMENT "Copying runtime files to executable directory")

Expand Down Expand Up @@ -367,7 +330,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

# we are building Windows executable, not a console app (default) and turn off spurious linker warnings
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set_target_properties(webcube PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
set_target_properties(webcube PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
set_target_properties(webcube PROPERTIES LINK_FLAGS "/ignore:4099")
endif()
Expand Down Expand Up @@ -560,5 +522,5 @@ endif()
# generic commands that have to go after everything else

if(CMAKE_CONFIGURATION_TYPES)
set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
set(CMAKE_CONFIGURATION_TYPES "Release")
endif()
26 changes: 15 additions & 11 deletions autobuild.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" ?>
<llsd>
<map>
<llsd><map>
<key>installables</key>
<map>
<key>cef-bin</key>
Expand All @@ -20,9 +19,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>857f5531a30f1f956bcbea637e665c1f</string>
<string>fe25699d025bac8925a80e43564608e15d6811c9</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83391/779820/cef_bin-91.1.21_g9dd45fe_chromium-91.0.4472.114-darwin64-560735.tar.bz2</string>
<string>https://github.com/secondlife/cef/releases/download/v118.0.5993.54b/cef_bin-118.4.1_g3dd6078_chromium-118.0.5993.54-darwin64-9522e46.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -44,9 +45,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>3164a2ebaadc473ddac3cedf39a7c0f3</string>
<string>ecf47ff69172987dc246f06688dbbbfd4e79483a</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83393/779738/cef_bin-91.1.21_g9dd45fe_chromium-91.0.4472.114-windows-560735.tar.bz2</string>
<string>https://github.com/secondlife/cef/releases/download/v113.1.5_ge452d82_chromium-113.0.5672.93-9175570/cef_bin-113.1.5_ge452d82_chromium-113.0.5672.93-windows-9175570.tar.zst</string>
</map>
<key>name</key>
<string>windows</string>
Expand All @@ -56,16 +59,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5ab7616c3b013b0bf771146f740092fb</string>
<string>b0a3386821d9e15715733e64cd4b83beef67b311</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83392/779744/cef_bin-91.1.21_g9dd45fe_chromium-91.0.4472.114-windows64-560735.tar.bz2</string>
<string>https://github.com/secondlife/cef/releases/download/v118.0.5993.54b/cef_bin-118.4.1_g3dd6078_chromium-118.0.5993.54-windows64-9522e46.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>91.1.21_g9dd45fe_chromium-91.0.4472.114</string>
<string>118.4.1_g3dd6078_chromium-118.0.5993.54</string>
</map>
</map>
<key>package_description</key>
Expand Down Expand Up @@ -196,5 +201,4 @@
<string>autobuild</string>
<key>version</key>
<string>1.3</string>
</map>
</llsd>
</map></llsd>
Loading
Loading