Skip to content

Commit

Permalink
DRTVWR-578: promote actions branch to master
Browse files Browse the repository at this point in the history
  • Loading branch information
nat-goodspeed committed Oct 25, 2023
2 parents bd2d7b3 + 6b02a60 commit b47a2ad
Show file tree
Hide file tree
Showing 13 changed files with 195 additions and 182 deletions.
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

0 comments on commit b47a2ad

Please sign in to comment.